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

05/26: nettoyage scripts
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 70df5471167efefa58c423695a70f1a73335b6b0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 14:11:44 2015 +0100 nettoyage scripts --- tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh | 10 ++++------ tutti-ui-swing/src/main/assembly/full/tutti.sh | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh index 5c451dc..4af586a 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh @@ -1,12 +1,10 @@ #!/bin/bash -export TUTTI_BASEDIR=$(pwd) -export TUTTI_HOME=$TUTTI_BASEDIR/tutti -export JAVA_HOME=$TUTTI_BASEDIR/jre -export JAVA_COMMAND=$JAVA_HOME/bin/java +TUTTI_BASEDIR=$(pwd) +TUTTI_HOME=$TUTTI_BASEDIR/tutti +JAVA_HOME=$TUTTI_BASEDIR/jre +JAVA_COMMAND=$JAVA_HOME/bin/java echo "Allegro Campaign basedir: $TUTTI_BASEDIR" -echo "Allegro Campaign app home: $TUTTI_HOME" -echo "Allegro Campaign jre home: $JAVA_HOME" $JAVA_COMMAND -jar launcher.jar --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.sh b/tutti-ui-swing/src/main/assembly/full/tutti.sh index 0cde9bd..05a4409 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti.sh @@ -1,12 +1,10 @@ #!/bin/bash -export TUTTI_BASEDIR=$(pwd) -export TUTTI_HOME=$TUTTI_BASEDIR/tutti -export JAVA_HOME=$TUTTI_BASEDIR/jre -export JAVA_COMMAND=$JAVA_HOME/bin/java +TUTTI_BASEDIR=$(pwd) +TUTTI_HOME=$TUTTI_BASEDIR/tutti +JAVA_HOME=$TUTTI_BASEDIR/jre +JAVA_COMMAND=$JAVA_HOME/bin/java echo "Allegro Campaign basedir: $TUTTI_BASEDIR" -echo "Allegro Campaign app home: $TUTTI_HOME" -echo "Allegro Campaign jre home: $JAVA_HOME" $JAVA_COMMAND -jar launcher.jar -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

04/26: mise en place des nouveaux modules et du packaging
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 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 --- pom.xml | 24 +++++- src/update/tutti-application.properties | 7 ++ tutti-ui-swing/pom.xml | 10 +++ ...full-component.xml => full-linux-component.xml} | 59 +++++++------- .../src/main/assembly/full-linux-i586.xml | 2 +- .../src/main/assembly/full-linux-x64.xml | 2 +- ...ll-component.xml => full-windows-component.xml} | 60 +++++++------- .../src/main/assembly/full-windows-i586.xml | 2 +- .../src/main/assembly/full-windows-x64.xml | 2 +- .../src/main/assembly/full/tutti-sanity.bat | 43 +--------- .../src/main/assembly/full/tutti-sanity.sh | 31 +------ tutti-ui-swing/src/main/assembly/full/tutti.bat | 44 ---------- tutti-ui-swing/src/main/assembly/full/tutti.sh | 31 +------ .../src/main/assembly/launcher/version.appup | 1 + tutti-ui-swing/src/main/assembly/min/launch.bat | 13 ++- tutti-ui-swing/src/main/assembly/min/launch.sh | 18 ++--- .../src/main/assembly/min/launcher.properties | 3 + tutti-ui-swing/src/main/assembly/min/update.bat | 94 +++------------------- tutti-ui-swing/src/main/assembly/min/update.sh | 84 +++---------------- tutti-ui-swing/src/main/assembly/standalone.xml | 11 +++ 20 files changed, 157 insertions(+), 384 deletions(-) diff --git a/pom.xml b/pom.xml index 4919805..278545a 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,8 @@ <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> @@ -155,6 +157,9 @@  <jreVersion>1.7.72</jreVersion> +  + <launcherVersion>3.12-SNAPSHOT</launcherVersion> +  <redmine.statusIds>3,4,5,8</redmine.statusIds> @@ -623,6 +628,18 @@ </configuration> </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> + </plugin> + </plugins> </pluginManagement> <extensions> @@ -681,6 +698,10 @@ <property>jreVersion</property> <message>You must set a jreVersion property!</message> </requireProperty> + <requireProperty> + <property>launcherVersion</property> + <message>You must set a launcherVersion property!</message> + </requireProperty> </rules> <ignoreCache>true</ignoreCache> <failFast>true</failFast> @@ -759,6 +780,7 @@ <filterset> <filter value="${project.version}" token="projectVersion" /> <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${launcherVersion}" token="launcherVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> <include name="tutti-application.properties" /> @@ -776,7 +798,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> + <version>1.0</version> <executions> <execution> <id>deploy tutti-application.properties</id> diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index b3385c2..b82b1ae 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -34,6 +34,13 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/… #windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip ################################################################################ +### Launcher Updates ########################################################### +################################################################################ + +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 + +################################################################################ ### Tutti Updates ############################################################## ################################################################################ diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b9df966..f7fc9cc 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -110,6 +110,16 @@ <artifactId>tutti-ichtyometer</artifactId> <version>${project.version}</version> </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>  <dependency> diff --git a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml b/tutti-ui-swing/src/main/assembly/full-linux-component.xml similarity index 72% copy from tutti-ui-swing/src/main/assembly/tutti-full-component.xml copy to tutti-ui-swing/src/main/assembly/full-linux-component.xml index 605110f..4f8bfd3 100644 --- a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-component.xml @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> - <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> + <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> + <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> @@ -34,11 +30,8 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> - <include>*.bat</include> + <include>tutti.sh</include> <include>README*</include> - <include>report/**</include> - <include>ichtyometre/**</include> </includes> </fileSet> @@ -49,7 +42,6 @@ </fileSet>  - <fileSet> <directory>target</directory> <outputDirectory>tutti</outputDirectory> @@ -66,6 +58,8 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> + <exclude>tutti-ui-swing-launcher-*.jar</exclude> + <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> @@ -76,7 +70,6 @@ <fileMode>0755</fileMode> <includes> <include>*.sh</include> - <include>*.bat</include> </includes> </fileSet> @@ -90,10 +83,20 @@ <excludes> <exclude>*.sh</exclude> <exclude>*.bat</exclude> - <exclude>tutti.config</exclude> + <exclude>obsdeb.config</exclude> </excludes> </fileSet> +  + <fileSet> + <directory>src/main/assembly/launcher</directory> + <outputDirectory>launcher</outputDirectory> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> +  <fileSet> <directory>target/classes/META-INF</directory> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-i586.xml b/tutti-ui-swing/src/main/assembly/full-linux-i586.xml index 3448f5c..2cb2d4b 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-i586.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-linux-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/full-linux-x64.xml b/tutti-ui-swing/src/main/assembly/full-linux-x64.xml index 0d23033..7f12a20 100644 --- a/tutti-ui-swing/src/main/assembly/full-linux-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-linux-x64.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-linux-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml b/tutti-ui-swing/src/main/assembly/full-windows-component.xml similarity index 73% rename from tutti-ui-swing/src/main/assembly/tutti-full-component.xml rename to tutti-ui-swing/src/main/assembly/full-windows-component.xml index 605110f..b2452d0 100644 --- a/tutti-ui-swing/src/main/assembly/tutti-full-component.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-component.xml @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> - <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> + <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> + <include>fr.ifremer.tutti:tutti-ui-swing-updater:jar:${project.version}</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> @@ -34,11 +30,7 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> - <include>*.bat</include> <include>README*</include> - <include>report/**</include> - <include>ichtyometre/**</include> </includes> </fileSet> @@ -48,11 +40,10 @@ </includes> </fileSet> -  - +  <fileSet> <directory>target</directory> - <outputDirectory>tutti</outputDirectory> + <outputDirectory>obsdeb</outputDirectory> <includes> <include>${project.build.finalName}.${project.packaging}</include> </includes> @@ -66,6 +57,8 @@ </includes> <excludes> <exclude>junit-*.jar</exclude> + <exclude>tutti-ui-swing-launcher-*.jar</exclude> + <exclude>tutti-ui-swing-updater-*.jar</exclude> </excludes> </fileSet> @@ -75,7 +68,6 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>*.sh</include> <include>*.bat</include> </includes> </fileSet> @@ -94,6 +86,16 @@ </excludes> </fileSet> +  + <fileSet> + <directory>src/main/assembly/launcher</directory> + <outputDirectory>launcher</outputDirectory> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> +  <fileSet> <directory>target/classes/META-INF</directory> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-i586.xml b/tutti-ui-swing/src/main/assembly/full-windows-i586.xml index f36760f..f3592db 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-i586.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-i586.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-windows-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/full-windows-x64.xml b/tutti-ui-swing/src/main/assembly/full-windows-x64.xml index 4fa8107..5ccdb55 100644 --- a/tutti-ui-swing/src/main/assembly/full-windows-x64.xml +++ b/tutti-ui-swing/src/main/assembly/full-windows-x64.xml @@ -33,7 +33,7 @@ <componentDescriptors> <componentDescriptor> - src/main/assembly/tutti-full-component.xml + src/main/assembly/full-windows-component.xml </componentDescriptor> </componentDescriptors> diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat index 7b1347d..fa2166c 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat @@ -1,44 +1,3 @@ @echo off -set OLDDIR=%CD% -cd /d %~dp0% - -set TUTTI_BASEDIR="%CD%" -set JAVA_HOME=%TUTTI_BASEDIR%\jre -set JAVA_COMMAND=%JAVA_HOME%\bin\java -set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log - -echo Allegro Campaign basedir: %TUTTI_BASEDIR% -echo Allegro Campaign app home: %TUTTI_HOME% -echo Allegro Campaign jre home: %JAVA_HOME% -echo Allegro Campaign log file: %TUTTI_LOG_FILE% - -:start - -copy tutti\update.bat . -echo Searching for updates... -call update.bat -del update.bat -if exist "tutti.config" copy tutti.config tutti -echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% --db-sanity true -if errorlevel 89 goto deletedb -if errorlevel 88 goto start - -goto quit - -:deletedb - -echo "Clean database and restart" - -del /S/Q data\db -del /S/Q data\dbcache -del /S/Q data\dbconf -rmdir data\db -rmdir data\dbcache -rmdir data\dbconf - -goto start - -:quit -cd %OLDDIR% +start tutti.exe --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh index b1f164d..5c451dc 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh @@ -4,38 +4,9 @@ export TUTTI_BASEDIR=$(pwd) export TUTTI_HOME=$TUTTI_BASEDIR/tutti export JAVA_HOME=$TUTTI_BASEDIR/jre export JAVA_COMMAND=$JAVA_HOME/bin/java -export TUTTI_LOG_FILE=$TUTTI_BASEDIR/data/tutti-${project.version}.log - -cd $TUTTI_BASEDIR echo "Allegro Campaign basedir: $TUTTI_BASEDIR" echo "Allegro Campaign app home: $TUTTI_HOME" echo "Allegro Campaign jre home: $JAVA_HOME" -echo "Allegro Campaign log file: $TUTTI_LOG_FILE" - -while true; do - - cp $TUTTI_HOME/update.sh . - echo "Searching for updates..." - ./update.sh - rm -f update.sh - if [ -f $TUTTI_BASEDIR/tutti.config ]; then - cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME - fi - echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR --db-sanity true - exitcode=$? - - if [ "$exitcode" -eq "89" ]; then - # delete db directory and restart - rm -rfv data/db - rm -rfv data/dbcache - rm -rfv data/dbconf - exitcode=88 - fi - if [ ! "$exitcode" -eq "88" ]; then - # quit now! - exit $exitcode - fi -done \ No newline at end of file +$JAVA_COMMAND -jar launcher.jar --db-sanity true diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.bat b/tutti-ui-swing/src/main/assembly/full/tutti.bat deleted file mode 100644 index cb9396f..0000000 --- a/tutti-ui-swing/src/main/assembly/full/tutti.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off - -set OLDDIR=%CD% -cd /d %~dp0% - -set TUTTI_BASEDIR="%CD%" -set JAVA_HOME=%TUTTI_BASEDIR%\jre -set JAVA_COMMAND=%JAVA_HOME%\bin\java -set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log - -echo Allegro Campaign basedir: %TUTTI_BASEDIR% -echo Allegro Campaign app home: %TUTTI_HOME% -echo Allegro Campaign jre home: %JAVA_HOME% -echo Allegro Campaign log file: %TUTTI_LOG_FILE% - -:start - -copy tutti\update.bat . -echo Searching for updates... -call update.bat -del update.bat -if exist "tutti.config" copy tutti.config tutti -echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% -if errorlevel 89 goto deletedb -if errorlevel 88 goto start - -goto quit - -:deletedb - -echo "Clean database and restart" - -del /S/Q data\db -del /S/Q data\dbcache -del /S/Q data\dbconf -rmdir data\db -rmdir data\dbcache -rmdir data\dbconf - -goto start - -:quit -cd %OLDDIR% diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.sh b/tutti-ui-swing/src/main/assembly/full/tutti.sh index 1d29184..0cde9bd 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti.sh @@ -4,38 +4,9 @@ export TUTTI_BASEDIR=$(pwd) export TUTTI_HOME=$TUTTI_BASEDIR/tutti export JAVA_HOME=$TUTTI_BASEDIR/jre export JAVA_COMMAND=$JAVA_HOME/bin/java -export TUTTI_LOG_FILE=$TUTTI_BASEDIR/data/tutti-${project.version}.log - -cd $TUTTI_BASEDIR echo "Allegro Campaign basedir: $TUTTI_BASEDIR" echo "Allegro Campaign app home: $TUTTI_HOME" echo "Allegro Campaign jre home: $JAVA_HOME" -echo "Allegro Campaign log file: $TUTTI_LOG_FILE" - -while true; do - - cp $TUTTI_HOME/update.sh . - echo "Searching for updates..." - ./update.sh - rm -f update.sh - if [ -f $TUTTI_BASEDIR/tutti.config ]; then - cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME - fi - echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR - exitcode=$? - - if [ "$exitcode" -eq "89" ]; then - # delete db directory and restart - rm -rfv data/db - rm -rfv data/dbcache - rm -rfv data/dbconf - exitcode=88 - fi - if [ ! "$exitcode" -eq "88" ]; then - # quit now! - exit $exitcode - fi -done \ No newline at end of file +$JAVA_COMMAND -jar launcher.jar diff --git a/tutti-ui-swing/src/main/assembly/launcher/version.appup b/tutti-ui-swing/src/main/assembly/launcher/version.appup new file mode 100644 index 0000000..462d2b3 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/launcher/version.appup @@ -0,0 +1 @@ +${launcherVersion} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/min/launch.bat b/tutti-ui-swing/src/main/assembly/min/launch.bat index 9550fab..fbdb84c 100644 --- a/tutti-ui-swing/src/main/assembly/min/launch.bat +++ b/tutti-ui-swing/src/main/assembly/min/launch.bat @@ -1,10 +1,7 @@ @echo off -set OLDDIR=%CD% -cd /d %~dp0% - -%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=128M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 -set exitcode=%ERRORLEVEL% -echo Stop Allegro Campaign with exitcode: %exitcode% -cd %OLDDIR% -exit /b %exitcode% +rem move embedded launcher file to tutti root +verify on +move /Y tutti\launcher launcher +move /Y tutti\tutti.exe tutti.exe +start tutti.exe diff --git a/tutti-ui-swing/src/main/assembly/min/launch.sh b/tutti-ui-swing/src/main/assembly/min/launch.sh index c268710..be75bd5 100755 --- a/tutti-ui-swing/src/main/assembly/min/launch.sh +++ b/tutti-ui-swing/src/main/assembly/min/launch.sh @@ -1,15 +1,7 @@ #!/bin/bash -MEMORY="-Xmx1024M -XX:MaxPermSize=128M" -#TUTTI_JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - -REP=$(dirname $0) - -cd $REP - -#echo "java command: $JAVA_COMMAND" - -$JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -Dtutti.log.file=$TUTTI_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* -exitcode=$? -echo "Stop Allegro Campaign with exitcode: $exitcode" -exit $exitcode +echo "Move embedded script file to tutti root" +mv -f tutti/launcher . +mv tutti/tutti.sh . +chmod +x tutti.sh +./tutti.sh diff --git a/tutti-ui-swing/src/main/assembly/min/launcher.properties b/tutti-ui-swing/src/main/assembly/min/launcher.properties new file mode 100644 index 0000000..9048ef8 --- /dev/null +++ b/tutti-ui-swing/src/main/assembly/min/launcher.properties @@ -0,0 +1,3 @@ +JAR=tutti/${project.build.finalName}.${project.packaging} +LOGFILE=data/tutti.log +JAVA_OPTS="-XX:MaxPermSize=128M -XX:PermSize=64M -XX:MaxNewSize=32M -XX:NewSize=32M -Xms256m -Xmx1024m" diff --git a/tutti-ui-swing/src/main/assembly/min/update.bat b/tutti-ui-swing/src/main/assembly/min/update.bat index 4765843..7fbfba8 100644 --- a/tutti-ui-swing/src/main/assembly/min/update.bat +++ b/tutti-ui-swing/src/main/assembly/min/update.bat @@ -1,84 +1,14 @@ @echo off -set t=%time::=% -set BACKUP_DATE=%date:~6,4%%date:~3,2%%date:~0,2%%t:~0,6% - -if not exist "NEW\jre" goto tutti - -rem deplacement de l'ancienne jre -set /p oldVersion=<jre\version.appup -set /p newVersion=<NEW\jre\version.appup -set backupdir=OLD\jre-%oldVersion: =%-%BACKUP_DATE: =% -echo Update jre version %oldVersion: =% to %newVersion: =% old jre keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move jre "%backupdir%" -move NEW\jre jre - -:tutti - -if not exist "NEW\tutti" goto i18n - -rem deplacement de l'ancien tutti -set /p oldVersion=<tutti\version.appup -set /p newVersion=<NEW\tutti\version.appup -set backupdir=OLD\tutti-%oldVersion: =%-%BACKUP_DATE: =% -echo Update tutti version %oldVersion: =% to %newVersion: =% old tutti keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move tutti "%backupdir%" -move NEW\tutti tutti - -:i18n - -if not exist "NEW\i18n" goto help - -rem deplacement de l'ancien i18n -set /p oldVersion=<i18n\version.appup -set /p newVersion=<NEW\i18n\version.appup -set backupdir=OLD\i18n-%oldVersion: =%-%BACKUP_DATE: =% -echo Update i18n version %oldVersion: =% to %newVersion: =% old i18n keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move i18n "%backupdir%" -move NEW\i18n i18n - -:help - -if not exist "NEW\help" goto ichtyometer - -rem deplacement de l'ancien help -set /p oldVersion=<help\version.appup -set /p newVersion=<NEW\help\version.appup -set backupdir=OLD\help-%oldVersion: =%-%BACKUP_DATE: =% -echo Update help version %oldVersion: =% to %newVersion: =% old help keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move help "%backupdir%" -move NEW\help help - -:ichtyometer - -if not exist "NEW\ichtyometer" goto report - -rem deplacement de l'ancien ichtyometer -set /p oldVersion=<ichtyometer\version.appup -set /p newVersion=<NEW\ichtyometer\version.appup -set backupdir=OLD\ichtyometer-%oldVersion: =%-%BACKUP_DATE: =% -echo Update ichtyometer version %oldVersion: =% to %newVersion: =% old ichtyometer keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move ichtyometer "%backupdir%" -move NEW\ichtyometer ichtyometer - -:report - -if not exist "NEW\report" goto end - -rem deplacement de l'ancien report -set /p oldVersion=<report\version.appup -set /p newVersion=<NEW\report\version.appup -set backupdir=OLD\report-%oldVersion: =%-%BACKUP_DATE: =% -echo Update report version %oldVersion: =% to %newVersion: =% old report keep in "%backupdir%" -if not exist "OLD" mkdir OLD -move report "%backupdir%" -move NEW\report report - -:end - -if exist "NEW" rmdir /Q NEW \ No newline at end of file +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +echo ! ! +echo ! THE LAUNCH AND UPDATE PROCESSES HAVE BEEN CHANGED ! +echo ! PLEASE EXECUTE 'tutti.exe' ! +echo ! ! +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +echo ! ! +echo ! LES PROCESSUS DE DEMARRAGE ET MISE A JOUR ONT CHANGES ! +echo ! VEUILLEZ EXECUTER 'tutti.exe' ! +echo ! ! +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +pause \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/min/update.sh b/tutti-ui-swing/src/main/assembly/min/update.sh index 986842e..9adea09 100644 --- a/tutti-ui-swing/src/main/assembly/min/update.sh +++ b/tutti-ui-swing/src/main/assembly/min/update.sh @@ -1,74 +1,12 @@ #!/bin/bash - -BACKUP_DATE=$(date +%Y%m%d%H%M%S) - -if [ -d NEW/jre ]; then - oldVersion=`cat jre/version.appup` - newVersion=`cat NEW/jre/version.appup` - echo "Update jre version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/jre-$oldVersion-$BACKUP_DATE - echo "Backup jre old version to $backupdir" - mv jre $backupdir - mv NEW/jre . - chmod +x jre/bin/java -fi - -if [ -d NEW/tutti ]; then - oldVersion=`cat tutti/version.appup` - newVersion=`cat NEW/tutti/version.appup` - echo "Update tutti version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/tutti-$oldVersion-$BACKUP_DATE - echo "Backup tutti old version to $backupdir" - mv tutti $backupdir - mv NEW/tutti . - chmod +x tutti/update.sh - chmod +x tutti/launch.sh -fi - -if [ -d NEW/i18n ]; then - oldVersion=`cat i18n/version.appup` - newVersion=`cat NEW/i18n/version.appup` - echo "Update i18n version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/i18n-$oldVersion-$BACKUP_DATE - echo "Backup i18n old version to $backupdir" - mv i18n $backupdir - mv NEW/i18n . -fi - -if [ -d NEW/help ]; then - oldVersion=`cat help/version.appup` - newVersion=`cat NEW/help/version.appup` - echo "Update help version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/help-$oldVersion-$BACKUP_DATE - echo "Backup help old version to $backupdir" - mv help $backupdir - mv NEW/help . -fi - -if [ -d NEW/ichtyometer ]; then - oldVersion=`cat ichtyometer/version.appup` - newVersion=`cat NEW/ichtyometer/version.appup` - echo "Update ichtyometer version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/ichtyometer-$oldVersion-$BACKUP_DATE - echo "Backup ichtyometer old version to $backupdir" - mv ichtyometer $backupdir - mv NEW/ichtyometer . -fi - -if [ -d NEW/report ]; then - oldVersion=`cat report/version.appup` - newVersion=`cat NEW/report/version.appup` - echo "Update report version $oldVersion to $newVersion" - mkdir -p OLD - backupdir=OLD/report-$oldVersion-$BACKUP_DATE - echo "Backup report old version to $backupdir" - mv report $backupdir - mv NEW/report . -fi - -rm -rf NEW +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +echo ! ! +echo ! THE LAUNCH AND UPDATE PROCESSES HAVE BEEN CHANGED ! +echo ! PLEASE EXECUTE './tutti.sh' ! +echo ! ! +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +echo ! ! +echo ! LES PROCESSUS DE DEMARRAGE ET MISE A JOUR ONT CHANGES ! +echo ! VEUILLEZ EXECUTER './tutti.sh' ! +echo ! ! +echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! \ No newline at end of file diff --git a/tutti-ui-swing/src/main/assembly/standalone.xml b/tutti-ui-swing/src/main/assembly/standalone.xml index 39e9cad..efb16d7 100644 --- a/tutti-ui-swing/src/main/assembly/standalone.xml +++ b/tutti-ui-swing/src/main/assembly/standalone.xml @@ -57,6 +57,7 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> + <include>launcher.properties</include> <include>launch.sh</include> <include>launch.bat</include> <include>update.sh</include> @@ -65,6 +66,16 @@ </includes> </fileSet> +  + <fileSet> + <directory>src/main/assembly/launcher</directory> + <outputDirectory>launcher</outputDirectory> + <filtered>true</filtered> + <includes> + <include>*</include> + </includes> + </fileSet> + <fileSet> <includes> <include>README*</include> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

03/26: ajout du module de mise à jour
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 c5e667d194ae4b7e54e4951d703eb329d912279b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 13:39:42 2015 +0100 ajout du module de mise à jour --- tutti-ui-swing-updater/LICENSE.txt | 0 tutti-ui-swing-updater/README.txt | 0 tutti-ui-swing-updater/pom.xml | 70 +++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 293 +++++++++++++++++++++ .../src/main/resources/update_runtime.bat | 31 +++ .../src/main/resources/update_runtime.sh | 36 +++ 6 files changed, 430 insertions(+) diff --git a/tutti-ui-swing-updater/LICENSE.txt b/tutti-ui-swing-updater/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/tutti-ui-swing-updater/README.txt b/tutti-ui-swing-updater/README.txt new file mode 100644 index 0000000..e69de29 diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml new file mode 100644 index 0000000..4d503b7 --- /dev/null +++ b/tutti-ui-swing-updater/pom.xml @@ -0,0 +1,70 @@ + +<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-updater</artifactId> + + <name>Tutti :: UI Updater</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <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.updater.Updater</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + + </plugins> + + </build> + +</project> + diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java new file mode 100644 index 0000000..54b05b4 --- /dev/null +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java @@ -0,0 +1,293 @@ +package fr.ifremer.tutti.ui.swing.updater; + +import javax.swing.JOptionPane; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.PathMatcher; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardCopyOption; +import java.nio.file.attribute.BasicFileAttributes; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * @author Ludovic Pecquot <ludovic.pecquot(a)e-is.pro> + */ +public class Updater { + + public static final String APPLICATION_UPDATER_TITLE = "Allegro Campagne UI Updater"; + + public static final String NEW_DIR = "NEW"; + + public static final String OLD_DIR = "OLD"; + + public static final String JRE_DIR = "jre"; + + public static final String LAUNCHER_DIR = "launcher"; + + public static final String APPLICATION_DIR = "tutti"; + + public static final String I18N_DIR = "i18n"; + + public static final String HELP_DIR = "help"; + + public static final String REPORT_DIR = "report"; + + public static final String ICHTYOMETER_DIR = "report"; + + public static final String UPDATE_RUNTIME_CMD = "update_runtime"; + + public static final String BATCH_WINDOWS_EXT = ".bat"; + + public static final String BATCH_UNIX_EXT = ".sh"; + + public static final String VERSION_FILE = "version.appup"; + + public static final int NORMAL_EXIT_CODE = 0; + + public static final int ERROR_EXIT_CODE = 1; + + public static final int RUNTIME_UPDATE_EXIT_CODE = 90; + + private final Path baseDir; + + private final String backupDate; + + private final boolean windowsOS; + + public static void main(String... args) { + + // Instantiate the launcher + Updater updater = new Updater(); + int exitCode = updater.execute(); + + // exit + System.exit(exitCode); + + } + + public Updater() { + + // Get the current directory where application has been launched + baseDir = Paths.get(System.getProperty("user.dir")); + + // Compute the date to create backup directories + Date now = new Date(); + DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss"); + backupDate = df.format(now); + + windowsOS = System.getProperty("os.name").startsWith("Windows"); + + } + + public int execute() { + + int exitCode; + + try { + + // Check runtime update (jre or launcher) + boolean runtimeUpdate = checkRuntimeUpdate(); + + if (runtimeUpdate) { + + exitCode = RUNTIME_UPDATE_EXIT_CODE; + + } else { + + // Launch update + launchUpdate(); + + exitCode = NORMAL_EXIT_CODE; + + } + + } catch (Exception ex) { + + ex.printStackTrace(); + exitCode = ERROR_EXIT_CODE; + + } + + return exitCode; + + } + + protected boolean checkRuntimeUpdate() throws Exception { + + String scriptFilename = UPDATE_RUNTIME_CMD + (windowsOS ? BATCH_WINDOWS_EXT : BATCH_UNIX_EXT); + + Path runtimeUpdater = baseDir.resolve(scriptFilename); + + Files.deleteIfExists(runtimeUpdater); + + boolean mustUpdateRuntime = false; + + if (Files.isDirectory(baseDir.resolve(NEW_DIR).resolve(JRE_DIR)) + || Files.isDirectory(baseDir.resolve(NEW_DIR).resolve(LAUNCHER_DIR))) { + + // A new jre or/and a new launcher is available, so generate the script + URL resource = getClass().getResource("/" + scriptFilename); + + try (InputStream stream = resource.openStream()) { + + Files.copy(stream, runtimeUpdater, StandardCopyOption.REPLACE_EXISTING); + + } + + String message = String.format("Runtime updates available.\nYou must execute '%s' manually to apply new runtime.", runtimeUpdater.getFileName()); + System.out.println(message); + JOptionPane.showMessageDialog(null, message); + mustUpdateRuntime = true; + + } + + return mustUpdateRuntime; + + } + + protected void launchUpdate() throws IOException { + + // Compute the date to create backup directories + Date now = new Date(); + + System.out.println("updater started at " + now.toString()); + + updateModule(baseDir, APPLICATION_DIR); + updateModule(baseDir, I18N_DIR); + updateModule(baseDir, HELP_DIR); + updateModule(baseDir, REPORT_DIR); + updateModule(baseDir, ICHTYOMETER_DIR); + + // Cleaning process + cleanObsoleteFiles(); + cleanPath(baseDir.resolve(NEW_DIR)); + + System.out.println("updater ended at " + new Date().toString()); + + } + + private void updateModule(Path basePath, String moduleName) throws IOException { + + // Update a single module. moduleName corresponds to the name of the directory inside the basePath + Path modulePath = basePath.resolve(moduleName); + Path moduleNewPath = basePath.resolve(NEW_DIR).resolve(moduleName); + + if (Files.isDirectory(moduleNewPath)) { + String newVersion = getVersion(moduleNewPath); + + // Backup existing module + if (Files.isDirectory(modulePath)) { + String oldVersion = getVersion(modulePath); + Path moduleOldPath = basePath.resolve(OLD_DIR).resolve(String.format("%s-%s-%s", moduleName, oldVersion, backupDate)); + System.out.println(String.format("backup %s %s to %s", moduleName, oldVersion, moduleOldPath.toString())); + if (!Files.isDirectory(basePath.resolve(OLD_DIR))) { + Files.createDirectory(basePath.resolve(OLD_DIR)); + } + Files.move(modulePath, moduleOldPath); + } + + // Installing new module + System.out.println(String.format("install %s %s", moduleName, newVersion)); + Files.move(moduleNewPath, modulePath, StandardCopyOption.REPLACE_EXISTING); + } + } + + private String getVersion(Path path) throws IOException { + + // Return the version of a module from version.appup file + Path versionFile = path.resolve(VERSION_FILE); + List<String> lines = Files.readAllLines(versionFile, StandardCharsets.UTF_8); + if (lines == null || lines.isEmpty()) { + throw new IOException(versionFile.toString() + " is empty"); + } + return lines.get(0); + } + + private void cleanPath(Path path) throws IOException { + if (Files.isDirectory(path)) { + Files.walkFileTree(path, new RecursiveDeleteFileVisitor()); + } + } + + private void cleanPath(Path path, String glob) throws IOException { + if (Files.isDirectory(path)) { + Files.walkFileTree(path, new RecursiveDeleteFileVisitor(glob)); + } + } + + private void cleanObsoleteFiles() throws IOException { + + if (windowsOS) { + + // Delete obsolete batch files + Files.deleteIfExists(baseDir.resolve("tutti.bat")); + Files.deleteIfExists(baseDir.resolve(APPLICATION_DIR).resolve("launch.bat")); + + // Delete non Windows files + cleanPath(baseDir, "*" + BATCH_UNIX_EXT); + } else { + + // Delete obsolete script files + Files.deleteIfExists(baseDir.resolve(APPLICATION_DIR).resolve("launch.sh")); + + // Delete Windows files + cleanPath(baseDir, "*" + BATCH_WINDOWS_EXT); + cleanPath(baseDir, "*.exe"); + } + + // Delete embedded files + Files.deleteIfExists(baseDir.resolve(APPLICATION_DIR).resolve("tutti.exe")); + Files.deleteIfExists(baseDir.resolve(APPLICATION_DIR).resolve("tutti.sh")); + cleanPath(baseDir.resolve(APPLICATION_DIR).resolve("launcher")); + + } + + + private class RecursiveDeleteFileVisitor extends SimpleFileVisitor<Path> { + + PathMatcher matcher; + + public RecursiveDeleteFileVisitor() { + // no matcher == delete all + } + + public RecursiveDeleteFileVisitor(String glob) { + super(); + + // Create a matcher according the glob parameter + matcher = baseDir.getFileSystem().getPathMatcher("glob:" + glob); + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + + // If the file name matches the glob or if no matcher, delete the file + if (matcher == null || matcher.matches(file.getFileName())) { + Files.deleteIfExists(file); + } + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + + // if no matcher, delete the directory + if (matcher == null) { + Files.deleteIfExists(dir); + } + + return FileVisitResult.CONTINUE; + } + + } + +} diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.bat b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat new file mode 100644 index 0000000..e398c2b --- /dev/null +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat @@ -0,0 +1,31 @@ +@echo off +verify on +cd /d %~dp0% +set t=%time::=% +set BACKUP_DATE=%date:~6,4%%date:~3,2%%date:~0,2%%t:~0,6% +if not exist \"NEW\\jre\" goto launcher + set /p oldVersion=<jre\\version.appup + set /p newVersion=<NEW\\jre\\version.appup + set backupdir=OLD\\jre-%oldVersion%-%BACKUP_DATE% + echo Update jre version %oldVersion% to %newVersion% old jre keep in \"%backupdir%\" + if not exist \"OLD\" mkdir OLD + move /Y jre \"%backupdir%\" + move /Y NEW\\jre jre + +:launcher +if not exist \"NEW\\launcher\" goto end + set /p oldVersion=<launcher\\version.appup + set /p newVersion=<NEW\\launcher\\version.appup + set backupdir=OLD\\launcher-%oldVersion%-%BACKUP_DATE% + echo Update launcher version %oldVersion% to %newVersion% old launcher keep in \"%backupdir%\" + if not exist \"OLD\" mkdir OLD + move /Y tutti.exe launcher\\tutti.exe + move /Y launcher \"%backupdir%\" + move /Y NEW\\launcher launcher + del /F /Q launcher\\*.sh + move /Y launcher\\tutti.exe tutti.exe + +:end +if exist NEW\\jre rmdir /S /Q NEW\\jre +if exist NEW\\launcher rmdir /S /Q NEW\\launcher +start tutti.exe \ No newline at end of file diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.sh b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh new file mode 100644 index 0000000..a5f39e4 --- /dev/null +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +BACKUP_DATE=$(date +%Y%m%d%H%M%S) +if [ -d NEW/jre ]; then + oldVersion=`cat jre/version.appup` + newVersion=`cat NEW/jre/version.appup` + echo \"Update jre version $oldVersion to $newVersion\" + mkdir -p OLD + backupdir=OLD/jre-$oldVersion-$BACKUP_DATE + echo \"Backup jre old version to $backupdir\" + mv jre $backupdir + mv NEW/jre . +fi + +chmod +x jre/bin/java +if [ ! -h java ]; then + ln -sr jre/bin/java java +fi + +if [ -d NEW/launcher ]; then + oldVersion=`cat launcher/version.appup` + newVersion=`cat NEW/launcher/version.appup` + echo \"Update launcher version $oldVersion to $newVersion\" + mkdir -p OLD + backupdir=OLD/launcher-$oldVersion-$BACKUP_DATE + echo \"Backup launcher old version to $backupdir\" + mv tutti.sh launcher/ + mv launcher $backupdir + mv NEW/launcher . + rm launcher/*.exe + rm launcher/*.bat + mv launcher/tutti.sh . + chmod +x tutti.sh +fi + +./tutti.sh \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

02/26: ajout du module de lancement
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 2d95c75698a260aa35e818b56796ff3b092116e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 3 13:39:20 2015 +0100 ajout du module de lancement --- tutti-ui-swing-launcher/LICENSE.txt | 0 tutti-ui-swing-launcher/README.txt | 0 tutti-ui-swing-launcher/pom.xml | 179 ++++++++++++++++ .../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 0 -> 539082 bytes .../src/main/resources/tutti.ico | Bin 0 -> 32038 bytes 9 files changed, 695 insertions(+) diff --git a/tutti-ui-swing-launcher/LICENSE.txt b/tutti-ui-swing-launcher/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/tutti-ui-swing-launcher/README.txt b/tutti-ui-swing-launcher/README.txt new file mode 100644 index 0000000..e69de29 diff --git a/tutti-ui-swing-launcher/pom.xml b/tutti-ui-swing-launcher/pom.xml new file mode 100644 index 0000000..b9195e9 --- /dev/null +++ b/tutti-ui-swing-launcher/pom.xml @@ -0,0 +1,179 @@ + +<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> + + <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 new file mode 100644 index 0000000..acfabc7 --- /dev/null +++ b/tutti-ui-swing-launcher/src/main/assembly/launcher.xml @@ -0,0 +1,24 @@ +<?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 new file mode 100644 index 0000000..267ba3d --- /dev/null +++ b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/JavaCommand.java @@ -0,0 +1,163 @@ +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 new file mode 100644 index 0000000..7d57934 --- /dev/null +++ b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/Launcher.java @@ -0,0 +1,236 @@ +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("dbconf"), 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 new file mode 100644 index 0000000..e0a3a88 --- /dev/null +++ b/tutti-ui-swing-launcher/src/main/java/fr/ifremer/tutti/ui/swing/launcher/LauncherProperties.java @@ -0,0 +1,93 @@ +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 new file mode 100644 index 0000000..3d197f4 Binary files /dev/null and b/tutti-ui-swing-launcher/src/main/resources/splash.bmp differ diff --git a/tutti-ui-swing-launcher/src/main/resources/tutti.ico b/tutti-ui-swing-launcher/src/main/resources/tutti.ico new file mode 100644 index 0000000..3b36647 Binary files /dev/null and b/tutti-ui-swing-launcher/src/main/resources/tutti.ico differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

01/26: utilisation d'alias dans les configurations (cela simplifie l'ecriture des scripts de lancement)
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 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) --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 6 ++++++ tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat | 2 +- tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh | 2 +- tutti-ui-swing/src/main/assembly/full/tutti.bat | 2 +- tutti-ui-swing/src/main/assembly/full/tutti.sh | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index d042a24..f376f14 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -139,6 +139,12 @@ public class TuttiConfiguration extends ApplicationConfiguration { applicationConfig.setConfigFileName(file); + applicationConfig.addAlias("--launch-mode", "--option", TuttiConfigurationOption.LAUNCH_MODE.getKey()); + applicationConfig.addAlias("--basedir", "--option", TuttiConfigurationOption.BASEDIR.getKey()); + applicationConfig.addAlias("--config-path", "--option", "config.path"); + applicationConfig.addAlias("--db-sanity", "--option", TuttiConfigurationOption.DB_SANITY.getKey()); + + try { applicationConfig.parse(args); diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat index 33a3567..7b1347d 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.bat @@ -21,7 +21,7 @@ call update.bat del update.bat if exist "tutti.config" copy tutti.config tutti echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% --option tutti.persistence.db.sanity true +call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% --db-sanity true if errorlevel 89 goto deletedb if errorlevel 88 goto start diff --git a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh index 8c2f3bb..b1f164d 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti-sanity.sh @@ -23,7 +23,7 @@ while true; do cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME fi echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --option tutti.launch.mode full --option tutti.basedir $TUTTI_BASEDIR --option tutti.persistence.db.sanity true + ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR --db-sanity true exitcode=$? if [ "$exitcode" -eq "89" ]; then diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.bat b/tutti-ui-swing/src/main/assembly/full/tutti.bat index 5e6c460..cb9396f 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti.bat +++ b/tutti-ui-swing/src/main/assembly/full/tutti.bat @@ -21,7 +21,7 @@ call update.bat del update.bat if exist "tutti.config" copy tutti.config tutti echo Allegro Campaign ${project.version} is starting... -call tutti\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% +call tutti\launch.bat --launch-mode full --basedir %TUTTI_BASEDIR% if errorlevel 89 goto deletedb if errorlevel 88 goto start diff --git a/tutti-ui-swing/src/main/assembly/full/tutti.sh b/tutti-ui-swing/src/main/assembly/full/tutti.sh index cf8a578..1d29184 100644 --- a/tutti-ui-swing/src/main/assembly/full/tutti.sh +++ b/tutti-ui-swing/src/main/assembly/full/tutti.sh @@ -23,7 +23,7 @@ while true; do cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME fi echo "Allegro Campaign ${project.version} is starting..." - ./tutti/launch.sh --option tutti.launch.mode full --option tutti.basedir $TUTTI_BASEDIR + ./tutti/launch.sh --launch-mode full --basedir $TUTTI_BASEDIR exitcode=$? if [ "$exitcode" -eq "89" ]; then -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (e13dc4b -> 410b9db)
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 e13dc4b refs #6453 ajout du nombre d'espèces new 410b9db refactor 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 410b9db0d7f7c0b10375ceb0e3037367c7023e9d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 26 17:51:30 2015 +0100 refactor Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 24 ++--------------- .../operation/catches/EditCatchesUIModel.java | 31 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (5022287 -> e13dc4b)
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 5022287 refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions new e13dc4b refs #6453 ajout du nombre d'espèces 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 e13dc4b19fc4d19cf8c4de25f40b7f7e03183629 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 26 17:43:20 2015 +0100 refs #6453 ajout du nombre d'espèces Summary of changes: .../src/main/xmi/tutti-persistence.zargo | Bin 58066 -> 58181 bytes .../operation/catches/EditCatchesUIHandler.java | 87 ++++++++++++++------- .../operation/catches/EditCatchesUIModel.java | 26 ++++++ .../catches/benthos/BenthosBatchUIHandler.java | 19 +++-- .../catches/benthos/BenthosBatchUIModel.java | 23 ++++++ .../catches/species/SpeciesBatchUIHandler.java | 21 +++-- .../catches/species/SpeciesBatchUIModel.java | 23 ++++++ tutti-ui-swing/src/main/resources/EcranResume.svg | 14 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 10 files changed, 169 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (dfcc32b -> 5022287)
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 dfcc32b refs #6453 resize the svg dinacally new 5022287 refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions 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 5022287a6e0456de1d786a0786553221e109a31d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 26 15:30:08 2015 +0100 refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions Summary of changes: tutti-ui-swing/pom.xml | 4 + .../operation/catches/EditCatchesUIHandler.java | 295 +++++-- tutti-ui-swing/src/main/resources/EcranResume.svg | 901 +++++---------------- 3 files changed, 450 insertions(+), 750 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (43ef7e4 -> dfcc32b)
by codelutin.com scm 23 Jan '15

23 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 43ef7e4 refs #6453 [CAPTURE] compléter l'écran résumé avec un poids label non modifiables en italique new dfcc32b refs #6453 resize the svg dinacally 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 dfcc32bece205f2ece91017a710824027416c366 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 23 15:37:22 2015 +0100 refs #6453 resize the svg dinacally Summary of changes: .../content/operation/catches/EditCatchesUI.jaxx | 13 +- .../operation/catches/EditCatchesUIHandler.java | 150 +++++++++++---------- tutti-ui-swing/src/main/resources/EcranResume.svg | 15 ++- 3 files changed, 89 insertions(+), 89 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (5748d32 -> 43ef7e4)
by codelutin.com scm 20 Jan '15

20 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 5748d32 center panel + add FIXME on validator new 43ef7e4 refs #6453 [CAPTURE] compléter l'écran résumé avec un poids label non modifiables en italique 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 43ef7e470b63fabe16bf3b7e0c25289ee43bf73a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 20 16:25:19 2015 +0100 refs #6453 [CAPTURE] compléter l'écran résumé avec un poids label non modifiables en italique Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 106 ++++++++++++++------- tutti-ui-swing/src/main/resources/EcranResume.svg | 2 +- 2 files changed, 71 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1