January 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r2866 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 14:01:31 +0000 (Mon, 04 Jan 2010) New Revision: 2866 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: vcs must be done is ui is enabled too Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 11:28:22 UTC (rev 2865) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 14:01:31 UTC (rev 2866) @@ -400,7 +400,8 @@ */ static public void initVCS() throws VCSException { - if (config.isPerformVcsUpdate()) { + // vcs must be done is ui is enabled too + if (config.isLaunchUI() && config.isPerformVcsUpdate()) { // init vcs // in graphical mode, real VCS

1 0

r2865 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:28:22 +0000 (Mon, 04 Jan 2010) New Revision: 2865 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add option to disable automatic data migration and vcs update Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 11:12:21 UTC (rev 2864) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 11:28:22 UTC (rev 2865) @@ -46,6 +46,7 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= +Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -161,6 +162,8 @@ isisfish.config.main.localSimulator.description=Local simulator launcher name (same process) isisfish.config.main.locale.description=user locale isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation +isisfish.config.main.performmigration.description=Perform data migration +isisfish.config.main.performvcsupdate.description=Perform vcs update isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 11:12:21 UTC (rev 2864) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 11:28:22 UTC (rev 2865) @@ -46,6 +46,7 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= +Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -161,6 +162,8 @@ isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations +isisfish.config.main.performmigration.description=Migre les donn\u00E9es +isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante isisfish.config.main.simulation.ssh.control.check.interval=V\u00E9rification de la progression (secondes) isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux v\u00E9rifications de progression

1 0

r2864 - isis-fish/trunk/src/main/xmi
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:12:21 +0000 (Mon, 04 Jan 2010) New Revision: 2864 Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties Log: Update date. Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/trunk/src/main/xmi/isis-fish.properties 2010-01-04 11:12:04 UTC (rev 2863) +++ isis-fish/trunk/src/main/xmi/isis-fish.properties 2010-01-04 11:12:21 UTC (rev 2864) @@ -1,4 +1,4 @@ -model.tagvalue.copyright=/* Copyright (C) 1999 - 2009 Ifremer - Code Lutin */ +model.tagvalue.copyright=/* Copyright (C) 1999 - 2010 Ifremer - Code Lutin */ model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.Date=fr.ifremer.isisfish.types.hibernate.DateType

1 0

r2863 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:12:04 +0000 (Mon, 04 Jan 2010) New Revision: 2863 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Log: Add option to disable automatic data migration and vcs update Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 11:12:04 UTC (rev 2863) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2010 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -151,7 +151,7 @@ return apiVersion; } - static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2009"; + static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2010"; static final public String CONFIG_FILENAME = "isis-config-" + version.getNumber(0); /** separateur de liste */ @@ -555,10 +555,35 @@ return result; }*/ + /** + * Get launch.ui option value. + * + * @return launch ui option value + */ public boolean isLaunchUI() { boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key); return result; } + + /** + * Get perform migration option value. + * + * @return perform migration option value + */ + public boolean isPerformMigration() { + boolean result = getOptionAsBoolean(Option.PERFORM_MIGRATION.key); + return result; + } + + /** + * Get perform vcs update option value. + * + * @return perform vcs update option value + */ + public boolean isPerformVcsUpdate() { + boolean result = getOptionAsBoolean(Option.PERFORM_VCS_UPDATE.key); + return result; + } public void setSimulatorLauncher(String value) { setOption(Option.SIMULATOR_LAUNCHER.key, value); @@ -896,14 +921,20 @@ /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + /** Application locale (for i18n init). */ LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), - // if false no graphical interface + /** Perform ui launch option. */ LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"), + /** Perform data migration option. */ + PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), + /** Perform vcs update option. */ + PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + /** Database directory. */ DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), - + /** Database lock mode (h2).*/ DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"), // SSH (global, for both VCS and caparmor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 11:12:04 UTC (rev 2863) @@ -139,9 +139,11 @@ if (log.isInfoEnabled()) { log.info(_("isisfish.launching", config.getElapsedTimeAsString())); } - + // after init vcs and local data config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + + doNuitonMigration(); launchUI(); @@ -177,65 +179,71 @@ * Find all files containing "org.codelutin." into "org.nuiton." */ protected static void doNuitonMigration() { - - // Search in a set of directories - // Searching throw simulations/* can take a huge time... - File[] folders = new File[]{ - AnalysePlanStorage.getAnalysePlanDirectory(), - ExportStorage.getExportDirectory(), - RuleStorage.getRuleDirectory(), - ScriptStorage.getScriptDirectory(), - SensitivityStorage.getSensitivityDirectory(), - SensitivityExportStorage.getSensitivityExportDirectory(), - SimulatorStorage.getSimulatorDirectory() - }; - - try { - Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); - for (File folder : folders) { - filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); - } - - if (filesToMigrate != null && !filesToMigrate.isEmpty()) { - - // yes by defaut (for tests) - // but ask user if UI launch - boolean migrationOption = true; - if (IsisFish.config.isLaunchUI()) { - // display a user frame - String migratedFiles = ""; - String separator = ""; - for (File fileToMigrate : filesToMigrate.keySet()) { - migratedFiles += separator + fileToMigrate.toString(); - separator = "\n"; - } - JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); - JTextArea areaModifiedFiles = new JTextArea(migratedFiles); - areaModifiedFiles.setEditable(false); - areaModifiedFiles.setAutoscrolls(true); - JScrollPane sp = new JScrollPane(areaModifiedFiles); - sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge - migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); + if (config.isPerformMigration()) { + // Search in a set of directories + // Searching throw simulations/* can take a huge time... + File[] folders = new File[]{ + AnalysePlanStorage.getAnalysePlanDirectory(), + ExportStorage.getExportDirectory(), + RuleStorage.getRuleDirectory(), + ScriptStorage.getScriptDirectory(), + SensitivityStorage.getSensitivityDirectory(), + SensitivityExportStorage.getSensitivityExportDirectory(), + SimulatorStorage.getSimulatorDirectory() + }; + + try { + Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); + for (File folder : folders) { + filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); } - - // if migration has to be done - if (migrationOption) { - if (log.isInfoEnabled()) { - log.info("Starting nuiton.org migration for user scripts :"); + + if (filesToMigrate != null && !filesToMigrate.isEmpty()) { + + // yes by defaut (for tests) + // but ask user if UI launch + boolean migrationOption = true; + if (IsisFish.config.isLaunchUI()) { + // display a user frame + String migratedFiles = ""; + String separator = ""; + for (File fileToMigrate : filesToMigrate.keySet()) { + migratedFiles += separator + fileToMigrate.toString(); + separator = "\n"; + } + JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); + JTextArea areaModifiedFiles = new JTextArea(migratedFiles); + areaModifiedFiles.setEditable(false); + areaModifiedFiles.setAutoscrolls(true); + JScrollPane sp = new JScrollPane(areaModifiedFiles); + sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge + migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); } - for (File fileToMigrate : filesToMigrate.keySet()) { + // if migration has to be done + if (migrationOption) { if (log.isInfoEnabled()) { - log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); + log.info("Starting nuiton.org migration for user scripts :"); } - FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); + + for (File fileToMigrate : filesToMigrate.keySet()) { + if (log.isInfoEnabled()) { + log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); + } + FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); + } } } } + catch(IOException eee) { + if (log.isErrorEnabled()) { + log.error("Can't to nuiton migration", eee); + } + } } - catch(IOException eee) { - if (log.isErrorEnabled()) { - log.error("Can't to nuiton migration", eee); + else { + if (log.isInfoEnabled()) { + log.info(_("Skip data migration (disabled)")); } } } @@ -392,7 +400,7 @@ */ static public void initVCS() throws VCSException { - if (config.isLaunchUI()) { + if (config.isPerformVcsUpdate()) { // init vcs // in graphical mode, real VCS @@ -564,16 +572,10 @@ } /** - * initialise et lance l'interface graphique si elle est demandee + * Initialise et lance l'interface graphique si elle a demandé a être lancée. */ public static void launchUI() { if (config.isLaunchUI()) { - - // migration must be done in UI envirronement and - // must nerver be done in caparmor - // TODO set it here for now, ui is not displayed on caparmor - doNuitonMigration(); - // init simulater manager SimulationService.getService(); Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 11:12:04 UTC (rev 2863) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false" /> +<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' />

1 0

r2862 - in isis-fish/trunk: . src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 08:53:44 +0000 (Mon, 04 Jan 2010) New Revision: 2862 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update version, dates. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/pom.xml 2010-01-04 08:53:44 UTC (rev 2862) @@ -422,7 +422,7 @@ <jaxx.version>1.7.1</jaxx.version> <eugene.version>2.0.0-beta-1</eugene.version> <topia.version>2.3.0-beta-1</topia.version> - <nuiton-utils.version>1.1.2-SNAPSHOT</nuiton-utils.version> + <nuiton-utils.version>1.1.2</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <jrst.version>1.0.0</jrst.version> @@ -447,7 +447,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>2.1</version> <configuration> <source>1.6</source> <target>1.6</target> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 08:53:44 UTC (rev 2862) @@ -66,7 +66,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2009. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2010. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 08:53:44 UTC (rev 2862) @@ -66,7 +66,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2009. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2010. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s

1 0