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@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@codelutin.com>.