January 2015 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (34daab3 -> c9adf89)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 34daab3 still deliver .bat scripts, .exe does not work sometimes new 4aa9c54 ajout de la propriete code sur une categorie new b9e932b changement de la propriete de la categorie dans l'export generique new c9adf89 fixes #6373 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c9adf8971b349f40bb49eb4e8c549ecd91fbffa5 Merge: 34daab3 b9e932b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 19:19:38 2015 +0100 fixes #6373 commit b9e932b1009d7855d2681f0b3f8f21d1cf8840fd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jan 2 11:20:03 2015 +0100 changement de la propriete de la categorie dans l'export generique commit 4aa9c547864cbee28526dfc186e7a55c62e9f9ea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jan 2 11:18:30 2015 +0100 ajout de la propriete code sur une categorie Summary of changes: .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../entities/data/SampleCategoryModelConverter.java | 13 +++++++------ .../entities/data/SampleCategoryModelEntry.java | 20 ++++++++++++++------ .../config/TuttiPersistenceConfigTest.java | 8 ++++++++ .../service/export/generic/CatchExportModel.java | 2 +- 5 files changed, 31 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (06037f2 -> 34daab3)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 06037f2 merge 6376 to develop new 34daab3 still deliver .bat scripts, .exe does not work sometimes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 34daab3db37e1d582dc85d4418f007e1709c1a3b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 19:18:16 2015 +0100 still deliver .bat scripts, .exe does not work sometimes Summary of changes: .../src/main/assembly/full-windows-component.xml | 17 +++++++---------- tutti-ui-swing/src/main/assembly/full/README.txt | 4 ++++ .../src/main/assembly/full/windows/tutti-sanity.bat | 12 +++++++++++- tutti-ui-swing/src/main/assembly/full/windows/tutti.bat | 12 ++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 tutti-ui-swing/src/main/assembly/full/windows/tutti.bat -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (410b9db -> 06037f2)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 410b9db refactor new 709bf74 utilisation d'alias dans les configurations (cela simplifie l'ecriture des scripts de lancement) new 2d95c75 ajout du module de lancement new c5e667d ajout du module de mise à jour new fe6e892 mise en place des nouveaux modules et du packaging new 70df547 nettoyage scripts new df7ada6 lors de la suppression d'une base, nettoyage aussi des pieces jointes associées new b1e3b89 be able to change distro url new c1a7d2f launcher does not have the same version (and even should not be part of main build) new 6c1600f at release time ask for version of each module new cdf020f suppression du module launcher (c'est un proet à part) new 84d4aaf amelioration de la definition de distrourl new 818d7b6 utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui) new c4735b6 copie du launcher au bon endroit new 1b67b84 fix application directory new c6126b5 amelioration du code de mise à jour new 008931c do not use bin classifier on launcher + fix updater dependency scope new 7f0238d improve code new e80e9eb add report null module + fix assembly new aec898a fix report path new 9ea20f1 fix readme new 35cd499 Do not delete i18n component when updates tutti new e2a97c5 improve updater code new 06fc14d remove code new 02e8bf4 improve assembly files new 416435e use tutti-launcher 1.0 new 06037f2 merge 6376 to develop The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 06037f2be6a1944baf87856b903058a4cf64ba58 Merge: 410b9db 416435e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 18:22:53 2015 +0100 merge 6376 to develop commit 416435ef854088c50585f8bb805b24d056e30d08 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 17:49:53 2015 +0100 use tutti-launcher 1.0 commit 02e8bf4f74ecceed42e9c018832494cbdc4af2e4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 17:11:58 2015 +0100 improve assembly files commit 06fc14d17a5cd48f16a74fe553e872ec0a2fa8cb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 17:11:31 2015 +0100 remove code commit e2a97c583e1b0d778deca578fc84b63596dc1b24 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 17:11:06 2015 +0100 improve updater code commit 35cd49942498ee8fdbd61dc33fdc802a02860c18 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 17:10:25 2015 +0100 Do not delete i18n component when updates tutti commit 9ea20f1e8b983a051ee3775714e8a2d31a10cc10 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 13:34:00 2015 +0100 fix readme commit aec898aa651fc14f379b42cf94fe3487c24341c2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 13:33:44 2015 +0100 fix report path commit e80e9eb2525cf314e423de84562c2b311386df85 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 12:17:26 2015 +0100 add report null module + fix assembly commit 7f0238dad854d4eb80843c7d0cf07c8f2f86eb33 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 12:17:02 2015 +0100 improve code commit 008931c31b70b1a2795e32a83179941b4365d6e4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 11:48:48 2015 +0100 do not use bin classifier on launcher + fix updater dependency scope commit c6126b531306711070d0f5812fe4b7a9b5bb008e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 11:35:43 2015 +0100 amelioration du code de mise à jour commit 1b67b843efa202f7ffaf6fd4f4217c7d49442346 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 26 09:57:46 2015 +0100 fix application directory commit c4735b6eb39a3a8b3583b465a4507ed58c0b37f0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 17:09:10 2015 +0100 copie du launcher au bon endroit commit 818d7b6b36d4d64bf3f60006b433fc7906010f7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:21:20 2015 +0100 utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui) commit 84d4aaf9f1ad027bbbb3c9f61726ac4a962cbb69 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:20:03 2015 +0100 amelioration de la definition de distrourl commit cdf020f1f31fd063d2266fbcf02fec7c63840ca9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:19:21 2015 +0100 suppression du module launcher (c'est un proet à part) commit 6c1600fdd74903e4cb0adfbf796a6f7ffde59d82 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:54:55 2015 +0100 at release time ask for version of each module commit c1a7d2f030dda697073b9385d7dc718bd795638b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:40:17 2015 +0100 launcher does not have the same version (and even should not be part of main build) commit b1e3b896c565a9829eb819344d1b1ba132bda907 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:36:48 2015 +0100 be able to change distro url commit df7ada6b2d109d8acde4e5fbaa187c37b8b4affc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 14:12:10 2015 +0100 lors de la suppression d'une base, nettoyage aussi des pieces jointes associées commit 70df5471167efefa58c423695a70f1a73335b6b0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 14:11:44 2015 +0100 nettoyage scripts commit fe6e892e3fdd24aaaca9268c97f4fbb028712e9c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 13:45:20 2015 +0100 mise en place des nouveaux modules et du packaging commit c5e667d194ae4b7e54e4951d703eb329d912279b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 13:39:42 2015 +0100 ajout du module de mise à jour commit 2d95c75698a260aa35e818b56796ff3b092116e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 13:39:20 2015 +0100 ajout du module de lancement commit 709bf74105b48842dbff3374de10258163dcafb2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 11:09:07 2015 +0100 utilisation d'alias dans les configurations (cela simplifie l'ecriture des scripts de lancement) Summary of changes: pom.xml | 22 ++ src/update/tutti-application.properties | 15 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 + .../LICENSE.txt | 0 .../README.txt | 0 tutti-ui-swing-updater/pom.xml | 70 +++++ .../tutti/ui/swing/updater/DeleteHelper.java | 143 +++++++++ .../fr/ifremer/tutti/ui/swing/updater/Module.java | 34 ++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 344 +++++++++++++++++++++ .../src/main/resources/update_runtime.bat | 31 ++ .../src/main/resources/update_runtime.sh | 36 +++ tutti-ui-swing/pom.xml | 76 +++++ .../{help.xml => full-linux-component.xml} | 43 +-- .../src/main/assembly/full-linux-i586.xml | 5 +- .../src/main/assembly/full-linux-x64.xml | 5 +- ...ull-component.xml => full-shared-component.xml} | 86 ++++-- .../src/main/assembly/full-windows-component.xml | 64 ++-- .../src/main/assembly/full-windows-i586.xml | 5 +- .../src/main/assembly/full-windows-x64.xml | 5 +- tutti-ui-swing/src/main/assembly/full/README.txt | 4 +- .../src/main/assembly/full/linux/tutti-sanity.sh | 10 + .../src/main/assembly/full/linux/tutti.sh | 10 + .../src/main/assembly/full/tutti-sanity.bat | 44 --- .../src/main/assembly/full/tutti-sanity.sh | 41 --- tutti-ui-swing/src/main/assembly/full/tutti.bat | 44 --- tutti-ui-swing/src/main/assembly/full/tutti.sh | 41 --- .../main/assembly/full/windows/tutti-sanity.bat | 3 + .../src/main/assembly/launcher/version.appup | 1 + tutti-ui-swing/src/main/assembly/min/launch.bat | 10 - tutti-ui-swing/src/main/assembly/min/launch.sh | 15 - .../min/launcher.properties} | 17 +- tutti-ui-swing/src/main/assembly/min/update.bat | 84 ----- tutti-ui-swing/src/main/assembly/min/update.sh | 74 ----- .../main/assembly/{full => }/report/version.appup | 0 tutti-ui-swing/src/main/assembly/standalone.xml | 6 +- .../ui/swing/TuttiApplicationUpdaterCallBack.java | 8 - 36 files changed, 929 insertions(+), 473 deletions(-) copy tutti-ichtyometer/README.txt => tutti-ui-swing-updater/LICENSE.txt (100%) copy {tutti-ichtyometer => tutti-ui-swing-updater}/README.txt (100%) create mode 100644 tutti-ui-swing-updater/pom.xml create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/DeleteHelper.java create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java create mode 100644 tutti-ui-swing-updater/src/main/resources/update_runtime.bat create mode 100644 tutti-ui-swing-updater/src/main/resources/update_runtime.sh copy tutti-ui-swing/src/main/assembly/{help.xml => full-linux-component.xml} (59%) rename tutti-ui-swing/src/main/assembly/{tutti-full-component.xml => full-shared-component.xml} (69%) copy tutti-ichtyometer/src/main/assembly/tools.xml => tutti-ui-swing/src/main/assembly/full-windows-component.xml (52%) create mode 100644 tutti-ui-swing/src/main/assembly/full/linux/tutti-sanity.sh create mode 100644 tutti-ui-swing/src/main/assembly/full/linux/tutti.sh delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti.bat delete mode 100644 tutti-ui-swing/src/main/assembly/full/tutti.sh create mode 100644 tutti-ui-swing/src/main/assembly/full/windows/tutti-sanity.bat create mode 100644 tutti-ui-swing/src/main/assembly/launcher/version.appup delete mode 100644 tutti-ui-swing/src/main/assembly/min/launch.bat delete mode 100755 tutti-ui-swing/src/main/assembly/min/launch.sh copy tutti-ui-swing/src/main/{filtered-resources/tutti.config => assembly/min/launcher.properties} (67%) delete mode 100644 tutti-ui-swing/src/main/assembly/min/update.bat delete mode 100644 tutti-ui-swing/src/main/assembly/min/update.sh rename tutti-ui-swing/src/main/assembly/{full => }/report/version.appup (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 14

12/26: utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 818d7b6b36d4d64bf3f60006b433fc7906010f7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:21:20 2015 +0100 utilisation de tutti-launcher (mais pas inclut comme dépendance du module ui) --- tutti-ui-swing/pom.xml | 77 ++++++++++++++++++++-- .../src/main/assembly/full-linux-component.xml | 16 ++--- .../src/main/assembly/full-windows-component.xml | 16 ++--- 3 files changed, 88 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f7fc9cc..9dff5a6 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -112,11 +112,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>tutti-ui-swing-launcher</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>tutti-ui-swing-updater</artifactId> <version>${project.version}</version> </dependency> @@ -544,6 +539,23 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-linux-x64-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -610,6 +622,23 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-linux-586-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -676,6 +705,25 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-windows-i586-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + <type>exe</type> + <classifier>bin</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -742,6 +790,25 @@ </artifactItems> </configuration> </execution> + <execution> + <id>get-windows-x64-launcher</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-launcher</artifactId> + <version>${launcherVersion}</version> + <type>exe</type> + <classifier>bin</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-component.xml b/tutti-ui-swing/src/main/assembly/full-linux-component.xml index 4f8bfd3..9039a7a 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -7,13 +7,6 @@ <dependencySets> <dependencySet> - <outputDirectory/> - <outputFileNameMapping>launcher.jar</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-launcher:jar:${project.version}</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>tutti</outputDirectory> <outputFileNameMapping>updater.jar</outputFileNameMapping> <includes> @@ -22,6 +15,14 @@ </dependencySet> </dependencySets> + <files> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}.jar</source> + <outputDirectory>tutti</outputDirectory> + <destName>launcher.jar</destName> + </file> + </files> + <fileSets> <fileSet> @@ -58,7 +59,6 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-launcher-*.jar</exclude> <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-component.xml b/tutti-ui-swing/src/main/assembly/full-windows-component.xml index b2452d0..8e228b8 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -7,13 +7,6 @@ <dependencySets> <dependencySet> - <outputDirectory/> - <outputFileNameMapping>tutti.exe</outputFileNameMapping> - <includes> - <include>fr.ifremer.tutti:tutti-ui-swing-launcher:exe:bin:${project.version}</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>tutti</outputDirectory> <outputFileNameMapping>updater.jar</outputFileNameMapping> <includes> @@ -22,6 +15,14 @@ </dependencySet> </dependencySets> + <files> + <file> + <source>${project.build.directory}/tutti-launcher-${launcherVersion}-bin.exe</source> + <outputDirectory/> + <destName>tutti.exe</destName> + </file> + </files> + <fileSets> <fileSet> @@ -57,7 +58,6 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> - <exclude>tutti-ui-swing-launcher-*.jar</exclude> <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

11/26: amelioration de la definition de distrourl
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 84d4aaf9f1ad027bbbb3c9f61726ac4a962cbb69 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:20:03 2015 +0100 amelioration de la definition de distrourl --- pom.xml | 13 +++---------- src/update/tutti-application.properties | 10 +++++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index de499fe..3bedd44 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,6 @@ <module>tutti-persistence</module> <module>tutti-ichtyometer</module> <module>tutti-service</module> - <module>tutti-ui-swing-launcher</module> <module>tutti-ui-swing-updater</module> <module>tutti-ui-swing</module> </modules> @@ -158,10 +157,10 @@ <jreVersion>1.7.72</jreVersion>  - <launcherVersion>1.0</launcherVersion> + <launcherVersion>1.0-SNAPSHOT</launcherVersion>  - <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifreme…</distroUrl> + <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> <autoVersionSubmodules>false</autoVersionSubmodules> @@ -631,12 +630,6 @@ </plugin> <plugin> - <groupId>com.akathist.maven.plugins.launch4j</groupId> - <artifactId>launch4j-maven-plugin</artifactId> - <version>1.5.2</version> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.9.1</version> @@ -955,7 +948,7 @@ <id>deploy-to-snapshot</id> <properties> <release.repository>${snapshot.repository}</release.repository> - <distroUrl>${snapshot.repository}/fr/ifremer/tutti</distroUrl> + <distroUrl>${snapshot.repository}</distroUrl> </properties> </profile> diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index bded225..0cbadf0 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -38,32 +38,32 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/… ################################################################################ launcher.version=@launcherVersion@ -launcher.url=zip:@distroUrl@/tutti-ui-swing-launcher/@launcherVersion@/tutti-ui-swing-launcher-@launcherVersion@.zip +launcher.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-launcher/@launcherVersion@/tutti-launcher-@launcherVersion@-bin.zip ################################################################################ ### Tutti Updates ############################################################## ################################################################################ tutti.version=@projectVersion@ -tutti.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip +tutti.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip ################################################################################ ### I18n Updates ############################################################### ################################################################################ i18n.version=@projectVersion@ -i18n.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip +i18n.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip ################################################################################ ### Help Updates ############################################################### ################################################################################ help.version=@projectVersion@ -help.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip +help.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip ################################################################################ ### Ichtyometer Updates ######################################################## ################################################################################ ichtyometer.version=@projectVersion@ -ichtyometer.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip +ichtyometer.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

10/26: suppression du module launcher (c'est un proet à part)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit cdf020f1f31fd063d2266fbcf02fec7c63840ca9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 16:19:21 2015 +0100 suppression du module launcher (c'est un proet à part) --- tutti-ui-swing-launcher/LICENSE.txt | 0 tutti-ui-swing-launcher/README.txt | 0 tutti-ui-swing-launcher/pom.xml | 180 ---------------- .../src/main/assembly/launcher.xml | 24 --- .../tutti/ui/swing/launcher/JavaCommand.java | 163 -------------- .../ifremer/tutti/ui/swing/launcher/Launcher.java | 236 --------------------- .../ui/swing/launcher/LauncherProperties.java | 93 -------- .../src/main/resources/splash.bmp | Bin 539082 -> 0 bytes .../src/main/resources/tutti.ico | Bin 32038 -> 0 bytes 9 files changed, 696 deletions(-) diff --git a/tutti-ui-swing-launcher/LICENSE.txt b/tutti-ui-swing-launcher/LICENSE.txt deleted file mode 100644 index e69de29..0000000 diff --git a/tutti-ui-swing-launcher/README.txt b/tutti-ui-swing-launcher/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/tutti-ui-swing-launcher/pom.xml b/tutti-ui-swing-launcher/pom.xml deleted file mode 100644 index 3b5457b..0000000 --- a/tutti-ui-swing-launcher/pom.xml +++ /dev/null @@ -1,180 +0,0 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>tutti</artifactId> - <version>3.12-SNAPSHOT</version> - </parent> - - <groupId>fr.ifremer.tutti</groupId> - <artifactId>tutti-ui-swing-launcher</artifactId> - <version>1.0-SNAPSHOT</version> - - <name>Tutti :: UI Launcher</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <target.fileName>tutti.exe</target.fileName> - -  - <license.generateBundle>true</license.generateBundle> - <license.bundleThirdPartyPath>META-INF/tutti-THIRD-PARTY.txt</license.bundleThirdPartyPath> - <license.bundleLicensePath>META-INF/tutti-LICENSE.txt</license.bundleLicensePath> - - </properties> - - <dependencies> -  - </dependencies> - - <build> - - <plugins> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>fr.ifremer.tutti.ui.swing.launcher.Launcher</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>com.akathist.maven.plugins.launch4j</groupId> - <artifactId>launch4j-maven-plugin</artifactId> - <executions> - <execution> - <id>create-launcher</id> - <phase>package</phase> - <goals> - <goal>launch4j</goal> - </goals> - <configuration> - <headerType>gui</headerType> - <jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</jar> - <outfile>${project.build.directory}/${target.fileName}</outfile> - <downloadUrl>http://java.com/download</downloadUrl> - <chdir>.</chdir> - <classPath> - <mainClass>fr.ifremer.tutti.ui.swing.launcher.Launcher</mainClass> - <preCp>anything</preCp> - </classPath> - <splash> - <file>src/main/resources/splash.bmp</file> - <timeout>3</timeout> - <waitForWindow>false</waitForWindow> - </splash> - <icon>src/main/resources/tutti.ico</icon> - <customProcName>true</customProcName> - <jre> - <path>jre</path> - <jdkPreference>preferJre</jdkPreference> - <maxHeapSize>20</maxHeapSize> - </jre> - <versionInfo> - <fileVersion>0.0.0.0</fileVersion> - <txtFileVersion>${project.version}</txtFileVersion> - <fileDescription>${project.name}</fileDescription> - <copyright>${project.inceptionYear} - ${project.organization.name}</copyright> - <productVersion>0.0.0.0</productVersion> - <txtProductVersion>${project.version}</txtProductVersion> - <productName>${project.parent.name}</productName> - <companyName>${project.organization.name}</companyName> - <internalName>Tutti Launcher</internalName> - <originalFilename>${target.fileName}</originalFilename> - </versionInfo> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${target.fileName}</file> - <type>zip</type> - <classifier>bin</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - - <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>package</defaultGoal> - <plugins> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>true</attach> - <descriptors> - <descriptor>src/main/assembly/launcher.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> - diff --git a/tutti-ui-swing-launcher/src/main/assembly/launcher.xml b/tutti-ui-swing-launcher/src/main/assembly/launcher.xml deleted file mode 100644 index acfabc7..0000000 --- a/tutti-ui-swing-launcher/src/main/assembly/launcher.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>bin</id> - - <formats> - <format>zip</format> - </formats> - - <fileSets> - - <fileSet> - <directory>target</directory> - <outputDirectory/> - <includes> - <include>${target.fileName}</include> - </includes> - </fileSet> - - </fileSets> -</assembly> diff --git a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/JavaCommand.java b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/JavaCommand.java deleted file mode 100644 index 267ba3d..0000000 --- a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/JavaCommand.java +++ /dev/null @@ -1,163 +0,0 @@ -package fr.ifremer.tutti.ui.swing.launcher; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * Created on 1/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 3.12 - */ -public class JavaCommand { - - private static final String DEBUG_JAVA_OPTS = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%s"; - - static JavaCommand create(Path basedir, int debugPort) { - return new JavaCommand(basedir, debugPort); - } - - static JavaCommand create(Path basedir) { - return new JavaCommand(basedir, 8000); - } - - protected JavaCommand(Path javaCommand, int debugPort) { - this.javaCommand = javaCommand; - this.debugPort = debugPort; - this.preJarArguments = new ArrayList<>(); - this.postJarArguments = new ArrayList<>(); - } - - private final int debugPort; - - private final Path javaCommand; - - private final List<String> preJarArguments; - - private final List<String> postJarArguments; - - private Path jarPath; - - private boolean inheritIO; - - private boolean debug; - - private Path logFile; - - public JavaCommand setInheritIO(boolean inheritIO) { - this.inheritIO = inheritIO; - return this; - } - - public JavaCommand setDebug(boolean debug) { - this.debug = debug; - return this; - } - - public JavaCommand setJarPath(Path jarPath) { - this.jarPath = jarPath; - return this; - } - - public JavaCommand setLogFile(Path logFile) { - this.logFile = logFile; - return this; - } - - public JavaCommand addArgument(Object argument) { - - List<String> whereToAdd; - if (jarPath == null) { - whereToAdd = preJarArguments; - - } else { - whereToAdd = postJarArguments; - } - - whereToAdd.add(argument.toString()); - - return this; - } - - public JavaCommand addArguments(Object argument, Object... arguments) { - - List<String> whereToAdd; - if (jarPath == null) { - whereToAdd = preJarArguments; - - } else { - whereToAdd = postJarArguments; - } - - whereToAdd.add(argument.toString()); - - for (Object argument1 : arguments) { - whereToAdd.add(argument1.toString()); - } - - return this; - } - - public JavaCommand addArguments(Collection<?> arguments) { - - List<String> whereToAdd; - if (jarPath == null) { - whereToAdd = preJarArguments; - - } else { - whereToAdd = postJarArguments; - } - - for (Object argument : arguments) { - whereToAdd.add(argument.toString()); - } - - return this; - } - - public Launcher.ExitCode execute() throws IOException, InterruptedException { - - if (jarPath == null) { - - throw new IllegalStateException("No jarPath given, can't execute."); - - } - - List<String> command = new ArrayList<>(); - - command.add(javaCommand.toString()); - command.addAll(preJarArguments); - if (debug) { - command.add(String.format(DEBUG_JAVA_OPTS, debugPort)); - } - command.add("-jar"); - command.add(jarPath.toString()); - command.addAll(postJarArguments); - - ProcessBuilder pb = new ProcessBuilder(command); - - if (inheritIO) { - - pb.inheritIO(); - - } - - if (logFile != null) { - - File updaterLogFile = logFile.toFile(); - pb.redirectOutput(ProcessBuilder.Redirect.to(updaterLogFile)); - pb.redirectError(ProcessBuilder.Redirect.appendTo(updaterLogFile)); - - } - - System.out.println("Starts java command: " + command); - - int exitCode = pb.start().waitFor(); - return Launcher.ExitCode.valueOf(exitCode); - - } -} diff --git a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java deleted file mode 100644 index eea7a0c..0000000 --- a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java +++ /dev/null @@ -1,236 +0,0 @@ -package fr.ifremer.tutti.ui.swing.launcher; - -import javax.swing.JOptionPane; -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -/** - * Launcher application that do post-update logic, launch application and listen to exit code. - * - * @author Tony Chemit (chemit(a)codelutin.com) - * @since 3.12 - */ -public class Launcher { - - public static final String APPLICATION_LANCHER_TITLE = "Tutti UI Launcher"; - - public static final String APPLICATION_DIR = "tutti"; - - public static final String DATA_DIR = "data"; - - public static final String UPDATER_JAR = "updater.jar"; - - public static final String UPDATER_LOGFILE = "updater.log"; - - public static final String FULL_LAUNCH_MODE = "full"; - - public static final String DEBUG_ARG = "--debug"; - - private final Path basedir; - - private final List<String> arguments; - - private final Path javaCommand; - - private final boolean debugMode; - - public static void main(String... args) { - - boolean windowsOs = System.getProperty("os.name").startsWith("Windows"); - - String javaCommandFilename = windowsOs ? "java.exe" : "java"; - - Launcher launcher = new Launcher(javaCommandFilename, args); - launcher.execute(); - - } - - public Launcher(String javaCommandFilename, String... args) { - - this.basedir = Paths.get(System.getProperty("user.dir")); - - this.javaCommand = basedir.resolve("jre").resolve("bin").resolve(javaCommandFilename); - - List<String> fullArguments = Arrays.asList(args); - - this.debugMode = fullArguments.remove(DEBUG_ARG); - - this.arguments = Collections.unmodifiableList(fullArguments); - - } - - public void execute() { - - try { - - ExitCode exitCode; - - do { - - // call update process - exitCode = executeUpdate(); - - if (exitCode == ExitCode.RUNTIME_UPDATE) { - - // if updater has detected runtime update, stop now - System.exit(exitCode.getExitCode()); - - } - - if (exitCode != ExitCode.NORMAL) { - - // update fails - throw new RuntimeException("Tutti Updater has encountered a problem, program stopped.\nPlease check " + UPDATER_LOGFILE); - - } - - // launch application - exitCode = executeApplication(); - - if (exitCode == ExitCode.DELETE_DB) { - deleteDb(); - } - - } while (exitCode.isRelaunch()); - - if (exitCode != ExitCode.NORMAL) { - - // show exit code - throw new RuntimeException("exit code = " + exitCode); - - } - - } catch (Exception ex) { - JOptionPane.showMessageDialog(null, ex.toString(), APPLICATION_LANCHER_TITLE, JOptionPane.ERROR_MESSAGE); - } - - } - - protected ExitCode executeUpdate() throws Exception { - - Path updatePath = basedir.resolve(APPLICATION_DIR).resolve(UPDATER_JAR); - Path updateExecPath = basedir.resolve(UPDATER_JAR); - Files.copy(updatePath, updateExecPath, StandardCopyOption.REPLACE_EXISTING); - - Path logfile = basedir.resolve(UPDATER_LOGFILE); - - try { - - JavaCommand program = JavaCommand - .create(javaCommand) - .setJarPath(updateExecPath) - .setLogFile(logfile); - - ExitCode exitCode = program.execute(); - return exitCode; - - } finally { - - Files.delete(updateExecPath); - - } - - } - - protected ExitCode executeApplication() throws Exception { - - LauncherProperties launcherProperties = new LauncherProperties(basedir); - launcherProperties.load(); - - JavaCommand program = JavaCommand - .create(javaCommand) - .setDebug(debugMode) - .setInheritIO(true) - .addArguments(launcherProperties.getJavaOptions()) - .addArgument("-Dtutti.log.file=" + launcherProperties.getLogFile().toString()) - .setJarPath(launcherProperties.getJarFile()) - .addArguments("--launch-mode", FULL_LAUNCH_MODE) - .addArguments("--basedir", basedir.toString()) -// .addArgument("--config.path", basedir.toString()) - .addArgument(arguments); - - ExitCode exitCode = program.execute(); - return exitCode; - - } - - protected void deleteDb() throws Exception { - - Path dataPath = basedir.resolve(DATA_DIR); - Files.walkFileTree(dataPath.resolve("db"), new RecursiveDeleteFileVisitor()); - Files.walkFileTree(dataPath.resolve("dbcache"), new RecursiveDeleteFileVisitor()); - Files.walkFileTree(dataPath.resolve("meas_files"), new RecursiveDeleteFileVisitor()); - - } - - private class RecursiveDeleteFileVisitor extends SimpleFileVisitor<Path> { - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Files.deleteIfExists(file); - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - Files.deleteIfExists(dir); - return FileVisitResult.CONTINUE; - } - - } - - /** - * Created on 1/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 3.12 - */ - public static enum ExitCode { - - NORMAL(0, false), // Normal exist code, always quit program - UPDATE(88, true), // When an update was found, will relaunch application - DELETE_DB(89, true), // When a db deletion is required, will relaunch application - RUNTIME_UPDATE(90, false), // When a runtime update found, quit program to update runtime - UNKNOWN(-1, false); // For any other exit code, will always quit program - - private final int exitCode; - - private final boolean relaunch; - - ExitCode(int exitCode, boolean relaunch) { - this.exitCode = exitCode; - this.relaunch = relaunch; - } - - public int getExitCode() { - return exitCode; - } - - public boolean isRelaunch() { - return relaunch; - } - - public static ExitCode valueOf(int code) { - - ExitCode result = UNKNOWN; - - for (ExitCode exitCode : ExitCode.values()) { - if (code == exitCode.getExitCode()) { - result = exitCode; - } - } - - return result; - - } - } -} diff --git a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/LauncherProperties.java b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/LauncherProperties.java deleted file mode 100644 index e0a3a88..0000000 --- a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/LauncherProperties.java +++ /dev/null @@ -1,93 +0,0 @@ -package fr.ifremer.tutti.ui.swing.launcher; - -import java.io.FileReader; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -/** - * Created on 1/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 3.12 - */ -public class LauncherProperties { - - public static final String LAUNCHER_PROPERTIES = "launcher.properties"; - - public static final String LAUNCHER_PROPERTIES_JAR = "JAR"; - - public static final String LAUNCHER_PROPERTIES_LOGFILE = "LOGFILE"; - - public static final String LAUNCHER_PROPERTIES_JAVA_OPTS = "JAVA_OPTS"; - - private final Path basedir; - - Properties launcherProperties; - - public LauncherProperties(Path basedir) { - this.basedir = basedir; - } - - public void load() throws IOException { - - // application launcher properties - Path applicationFile = basedir.resolve(Launcher.APPLICATION_DIR).resolve(LAUNCHER_PROPERTIES); - // local launcher properties - Path localFile = basedir.resolve(LAUNCHER_PROPERTIES); - - if (!(Files.exists(localFile) || Files.exists(applicationFile))) { - - throw new IOException("Could not find " + LAUNCHER_PROPERTIES); - - } - - Properties p1 = new Properties(); - if (Files.isReadable(applicationFile)) { - p1.load(new FileReader(applicationFile.toFile())); - } - - launcherProperties = new Properties(p1); - if (Files.isReadable(localFile)) { - launcherProperties.load(new FileReader(localFile.toFile())); - } - } - - public Path getJarFile() { - - String jarFileName = launcherProperties.getProperty(LAUNCHER_PROPERTIES_JAR); - Path jarFile = basedir.resolve(jarFileName); - return jarFile; - - } - - public Path getLogFile() { - - String logFileName = launcherProperties.getProperty(LAUNCHER_PROPERTIES_LOGFILE); - Path logFile = basedir.resolve(logFileName); - return logFile; - - } - - public List<String> getJavaOptions() { - - List<String> javaOptions = new ArrayList<>(); - String javaOpts = launcherProperties.getProperty(LAUNCHER_PROPERTIES_JAVA_OPTS); - if (!(javaOpts == null || javaOpts.trim().isEmpty())) { - String[] javaOptsArray = javaOpts.replaceAll("\"", "").split(" "); - for (String opt : javaOptsArray) { - if (!(opt == null || opt.trim().isEmpty())) { - javaOptions.add(opt); - } - } - } - - return javaOptions; - - } - - -} diff --git a/tutti-ui-swing-launcher/src/main/resources/splash.bmp b/tutti-ui-swing-launcher/src/main/resources/splash.bmp deleted file mode 100644 index 3d197f4..0000000 Binary files a/tutti-ui-swing-launcher/src/main/resources/splash.bmp and /dev/null differ diff --git a/tutti-ui-swing-launcher/src/main/resources/tutti.ico b/tutti-ui-swing-launcher/src/main/resources/tutti.ico deleted file mode 100644 index 3b36647..0000000 Binary files a/tutti-ui-swing-launcher/src/main/resources/tutti.ico and /dev/null differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

09/26: at release time ask for version of each module
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6c1600fdd74903e4cb0adfbf796a6f7ffde59d82 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:54:55 2015 +0100 at release time ask for version of each module --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index a925633..de499fe 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,8 @@  <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifreme…</distroUrl> + <autoVersionSubmodules>false</autoVersionSubmodules> + </properties> <repositories> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

08/26: launcher does not have the same version (and even should not be part of main build)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c1a7d2f030dda697073b9385d7dc718bd795638b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:40:17 2015 +0100 launcher does not have the same version (and even should not be part of main build) --- tutti-ui-swing-launcher/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tutti-ui-swing-launcher/pom.xml b/tutti-ui-swing-launcher/pom.xml index b9195e9..3b5457b 100644 --- a/tutti-ui-swing-launcher/pom.xml +++ b/tutti-ui-swing-launcher/pom.xml @@ -30,6 +30,7 @@ <groupId>fr.ifremer.tutti</groupId> <artifactId>tutti-ui-swing-launcher</artifactId> + <version>1.0-SNAPSHOT</version> <name>Tutti :: UI Launcher</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

07/26: be able to change distro url
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b1e3b896c565a9829eb819344d1b1ba132bda907 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 22 14:36:48 2015 +0100 be able to change distro url --- pom.xml | 17 +++++++++++++---- src/update/tutti-application.properties | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 278545a..a925633 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.6</version> + <version>1.8.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -158,10 +158,10 @@ <jreVersion>1.7.72</jreVersion>  - <launcherVersion>3.12-SNAPSHOT</launcherVersion> + <launcherVersion>1.0</launcherVersion> -  - <redmine.statusIds>3,4,5,8</redmine.statusIds> +  + <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifreme…</distroUrl> </properties> @@ -780,6 +780,7 @@ <filterset> <filter value="${project.version}" token="projectVersion" /> <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${distroUrl}" token="distroUrl" /> <filter value="${launcherVersion}" token="launcherVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> @@ -948,5 +949,13 @@ </build> </profile> + <profile> + <id>deploy-to-snapshot</id> + <properties> + <release.repository>${snapshot.repository}</release.repository> + <distroUrl>${snapshot.repository}/fr/ifremer/tutti</distroUrl> + </properties> + </profile> + </profiles> </project> diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index b82b1ae..bded225 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -38,32 +38,32 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/… ################################################################################ launcher.version=@launcherVersion@ -launcher.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing-launcher/@launcherVersion@/tutti-ui-swing-launcher-@launcherVersion@.zip +launcher.url=zip:@distroUrl@/tutti-ui-swing-launcher/@launcherVersion@/tutti-ui-swing-launcher-@launcherVersion@.zip ################################################################################ ### Tutti Updates ############################################################## ################################################################################ tutti.version=@projectVersion@ -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip +tutti.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip ################################################################################ ### I18n Updates ############################################################### ################################################################################ i18n.version=@projectVersion@ -i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip +i18n.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip ################################################################################ ### Help Updates ############################################################### ################################################################################ help.version=@projectVersion@ -help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip +help.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip ################################################################################ ### Ichtyometer Updates ######################################################## ################################################################################ ichtyometer.version=@projectVersion@ -ichtyometer.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip +ichtyometer.url=zip:@distroUrl@/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

06/26: lors de la suppression d'une base, nettoyage aussi des pieces jointes associées
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit df7ada6b2d109d8acde4e5fbaa187c37b8b4affc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 14:12:10 2015 +0100 lors de la suppression d'une base, nettoyage aussi des pieces jointes associées --- .../src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java index 7d57934..eea7a0c 100644 --- a/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java +++ b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java @@ -168,7 +168,7 @@ public class Launcher { Path dataPath = basedir.resolve(DATA_DIR); Files.walkFileTree(dataPath.resolve("db"), new RecursiveDeleteFileVisitor()); Files.walkFileTree(dataPath.resolve("dbcache"), new RecursiveDeleteFileVisitor()); - Files.walkFileTree(dataPath.resolve("dbconf"), new RecursiveDeleteFileVisitor()); + Files.walkFileTree(dataPath.resolve("meas_files"), new RecursiveDeleteFileVisitor()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0