September 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2614 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 12:29:54 +0000 (Mon, 14 Sep 2009) New Revision: 2614 Added: isis-fish/tags/isis-fish-3.2.0.6/ Log: Rename tag

1 0

r2613 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 12:27:19 +0000 (Mon, 14 Sep 2009) New Revision: 2613 Added: isis-fish/tags/3.2.0.6/ Log: Tag branche

1 0

r2612 - isis-fish/branches/3.2.0.5.x
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 12:27:09 +0000 (Mon, 14 Sep 2009) New Revision: 2612 Modified: isis-fish/branches/3.2.0.5.x/pom.xml Log: Update isis version Modified: isis-fish/branches/3.2.0.5.x/pom.xml =================================================================== --- isis-fish/branches/3.2.0.5.x/pom.xml 2009-09-14 10:44:25 UTC (rev 2611) +++ isis-fish/branches/3.2.0.5.x/pom.xml 2009-09-14 12:27:09 UTC (rev 2612) @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.5</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.5</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.6</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.6</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> </scm>

1 0

r2611 - isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:44:25 +0000 (Mon, 14 Sep 2009) New Revision: 2611 Modified: isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Update isis version Modified: isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 10:41:04 UTC (rev 2610) +++ isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 10:44:25 UTC (rev 2611) @@ -120,7 +120,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 5); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 6); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber(

1 0

r2610 - in isis-fish/branches/3.2.0.5.x: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:41:04 +0000 (Mon, 14 Sep 2009) New Revision: 2610 Modified: isis-fish/branches/3.2.0.5.x/changelog.txt isis-fish/branches/3.2.0.5.x/pom.xml isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Log: Add message if scripts can't be compiled Restore local simulation launcher (not as default) Fix force parameter when adding result with composed names Modified: isis-fish/branches/3.2.0.5.x/changelog.txt =================================================================== --- isis-fish/branches/3.2.0.5.x/changelog.txt 2009-09-14 10:29:43 UTC (rev 2609) +++ isis-fish/branches/3.2.0.5.x/changelog.txt 2009-09-14 10:41:04 UTC (rev 2610) @@ -1,3 +1,11 @@ +isis-fish (3.2.0.6) stable; urgency=low + + * Add message if scripts can't be compiled + * Restore local simulation launcher (not as default) + * Fix force parameter when adding result with composed names + + -- lun. sept. 14 12:35:44 CEST 2009 + isis-fish (3.2.0.5) stable; urgency=low * Fix export loaded too early (not in correct classloader) @@ -5,7 +13,7 @@ * Fix a date comparison problem (frequent in windows) * Restore running status progress bar indeterminate state - -- + -- ven. sept. 4 19:41:17 CEST 2009 isis-fish (3.2.0.5-rc3) stable; urgency=low Modified: isis-fish/branches/3.2.0.5.x/pom.xml =================================================================== --- isis-fish/branches/3.2.0.5.x/pom.xml 2009-09-14 10:29:43 UTC (rev 2609) +++ isis-fish/branches/3.2.0.5.x/pom.xml 2009-09-14 10:41:04 UTC (rev 2610) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5</version> + <version>3.2.0.6</version>  <dependencies> Modified: isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 10:29:43 UTC (rev 2609) +++ isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 10:41:04 UTC (rev 2610) @@ -48,6 +48,7 @@ import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; @@ -891,9 +892,9 @@ SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ - //SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localDefault", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localSubProcessDefault", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".remoteCaparmor", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), SIMULATOR_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"), /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */ Modified: isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 10:29:43 UTC (rev 2609) +++ isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 10:41:04 UTC (rev 2610) @@ -148,6 +148,11 @@ e.printStackTrace(); quit(); } catch (LinkageError e) { + + if (log.isFatalEnabled()) { + log.fatal("Linkage error detected", e); + } + // a real java.lang.Error sometimes happen when // using non recompiled script due to dependency changes // this is the better solution found : Modified: isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-14 10:29:43 UTC (rev 2609) +++ isis-fish/branches/3.2.0.5.x/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-14 10:41:04 UTC (rev 2610) @@ -186,7 +186,12 @@ } public void addResult(boolean force, Date date, String name, Population pop, MatrixND mat) throws IsisFishException{ - addResult(force, date, name + " " + pop, mat); + // don't call generic addResult, because pop name is added + if (force || isEnabled(name)) { + for (SimulationResultListener l : listeners) { + l.addResult(context, date, name + " " + pop, mat); + } + } } public void addResult(boolean force, Date date, String name, MatrixND mat) throws IsisFishException{

1 0

r2609 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:29:43 +0000 (Mon, 14 Sep 2009) New Revision: 2609 Added: isis-fish/branches/3.2.0.5.x/ Log: Redo branches from tag

1 0

r2608 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:29:10 +0000 (Mon, 14 Sep 2009) New Revision: 2608 Removed: isis-fish/branches/3.2.0.5.x/ Log: Redo branches from tag (not trunk)

1 0

r2607 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:25:34 +0000 (Mon, 14 Sep 2009) New Revision: 2607 Added: isis-fish/branches/3.2.0.5.x/ Log: Branche de maintenance de isis 3.2.0.5

1 0

r2606 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:15:24 +0000 (Mon, 14 Sep 2009) New Revision: 2606 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-14 10:07:10 UTC (rev 2605) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-14 10:15:24 UTC (rev 2606) @@ -1353,7 +1353,7 @@ result.exportDirectory = exportDirectory; result.strategies.addAll(strategies) ; result.populations.addAll(populations) ; - result.rules.addAll(rules) ; + result.rules.addAll(getRules()) ; result.plans.addAll(plans) ; result.resultEnabled.addAll(resultEnabled); result.numbers.putAll(numbers) ;

1 0

r2605 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 14 Sep '09

14 Sep '09

Author: chatellier Date: 2009-09-14 10:07:10 +0000 (Mon, 14 Sep 2009) New Revision: 2605 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Rename launcher config key with only number Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 09:26:02 UTC (rev 2604) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-14 10:07:10 UTC (rev 2605) @@ -48,8 +48,9 @@ import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; +import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; import fr.ifremer.isisfish.vcs.VCS; @@ -891,9 +892,9 @@ SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ - //SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localDefault", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localSubProcessDefault", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".remoteCaparmor", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), SIMULATOR_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"), /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */

1 0