Author: tchemit Date: 2013-01-28 18:50:07 +0100 (Mon, 28 Jan 2013) New Revision: 252 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/252 Log: refs #1893: [TECH] - Mise ?\195?\160 jour automatique de l'outil (am?\195?\169lioration des scripts + ajout de TODO ?\195?\160 finir) Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh trunk/tutti-ui-swing/src/main/assembly/min/launch.sh trunk/tutti-ui-swing/src/main/assembly/min/update.sh trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDatabaseUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiJreUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-01-28 17:50:07 UTC (rev 252) @@ -1,12 +1,19 @@ #!/bin/bash -export JAVA_COMMAND=`pwd`/jre/bin/java +REP=$(dirname $0) +export JAVA_HOME=$REP/jre +export JAVA_COMMAND=$JAVA_HOME/bin/java +cd $REP + +echo "$REP" +echo "$JAVA_HOME" + while true; do cp tutti-app/update.sh . ./update.sh - (cd tutti-app ; ./launch.sh) + ./tutti-app/launch.sh --option tutti.mode=full exitcode=$? echo "exitCode: $exitcode" Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-01-28 17:50:07 UTC (rev 252) @@ -1,10 +1,15 @@ #!/bin/bash MEMORY="-Xmx1024M" +TUTTI_JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000" +REP=$(dirname $0) + +cd $REP + echo "java command: $JAVA_COMMAND" -$JAVA_COMMAND $MEMORY -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000 -jar ${project.build.finalName}.${project.packaging} $* +$JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -jar ${project.build.finalName}.${project.packaging} $* exitcode=$? echo "Stop Tutti with exitcode: $exitcode" exit $exitcode Modified: trunk/tutti-ui-swing/src/main/assembly/min/update.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2013-01-28 17:50:07 UTC (rev 252) @@ -1,25 +1,24 @@ #!/bin/bash -if [ -d NEW/tutti-app ]; then - oldVersion=`cat tutti-app/version.appup` - newVersion=`cat NEW/tutti-app/version.appup` - echo "Update tutti version $oldVersion to $newVersion" - mkdir OLD - backupDate=`date -d %Y-%j` - backupdir=OLD/tutti-app-$oldVersion-$backupDate - echo "Backup tutti old version to $backupDir" - #mv tutti-app $backupDir - #mv NEW/tutti-app . -fi - +BACKUP_DATE=$(date -d %Y-%j) if [ -d NEW/jre ]; then oldVersion=`cat jre/version.appup` newVersion=`cat NEW/jre/version.appup` echo "Update jre version $oldVersion to $newVersion" mkdir OLD - backupDate=`date -d %Y-%j` - backupdir=OLD/jre-$oldVersion-$backupDate + backupdir=OLD/jre-$oldVersion-$BACKUP_DATE echo "Backup jre old version to $backupDir" #mv jre $backupDir #mv NEW/jre . fi + +if [ -d NEW/tutti-app ]; then + oldVersion=`cat tutti-app/version.appup` + newVersion=`cat NEW/tutti-app/version.appup` + echo "Update tutti version $oldVersion to $newVersion" + mkdir OLD + backupdir=OLD/tutti-app-$oldVersion-$BACKUP_DATE + echo "Backup tutti old version to $backupDir" + #mv tutti-app $backupDir + #mv NEW/tutti-app . +fi Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-01-28 17:50:07 UTC (rev 252) @@ -59,6 +59,8 @@ // prepare context (mainly init configs, i18n) context.init(); + //TODO tutti.mode=full alors mise a jour + // try to update jre updateTuttiJre(context); @@ -126,7 +128,7 @@ log.info(String.format("Try to update jre (current jre location: %s), using update url: %s", current, url)); } ApplicationUpdater up = new ApplicationUpdater(); - File dest = config.getNewTmpDirectory("NEW-jre"); + File dest = config.getTuttiBasedir(); up.update(url, current, dest, @@ -153,7 +155,7 @@ } ApplicationUpdater up = new ApplicationUpdater(); - File dest = config.getNewTmpDirectory("NEW-tutti"); + File dest = config.getTuttiBasedir(); up.update(url, current, dest, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-01-28 17:50:07 UTC (rev 252) @@ -29,7 +29,7 @@ import org.nuiton.util.ApplicationUpdater; /** - * CallBack to update jre. + * CallBack to update jre. TODO EMrger * * @author tchemit <chemit@codelutin.com> * @since 1.0 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDatabaseUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDatabaseUpdaterCallBack.java 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDatabaseUpdaterCallBack.java 2013-01-28 17:50:07 UTC (rev 252) @@ -63,12 +63,14 @@ if (log.isInfoEnabled()) { log.info("First time database was downloaded at version: " + applicationInfo.newVersion); } + //TODO copie base au bon endroit pour utilisation directe } else { // launch a referential synchronize operation if (log.isInfoEnabled()) { log.info(String.format("A database update was downloaded (oldVersion: %s, newVersion: %s), will launch a referential synchronize operation ", applicationInfo.oldVersion, applicationInfo.newVersion)); } + //TODO synchro referentiel } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiJreUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiJreUpdaterCallBack.java 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiJreUpdaterCallBack.java 2013-01-28 17:50:07 UTC (rev 252) @@ -40,8 +40,6 @@ private static final Log log = LogFactory.getLog(TuttiJreUpdaterCallBack.class); - - public static final String APP_KEY = "jre"; public TuttiJreUpdaterCallBack(TuttiUIContext context) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-28 13:58:33 UTC (rev 251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-28 17:50:07 UTC (rev 252) @@ -41,6 +41,11 @@ */ public enum TuttiConfigOption implements ApplicationConfig.OptionDef { + //TODO Utiliser une option full-mode pour trouver facilement le basedir + +// TUTTI_MODE( +// +// ), TUTTI_APPLICATION_BASEDIR( "tutti.application.basedir", n_("tutti.application.basedir.description"),