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> <!-- POM Relationships : Inheritance : Dependencies --> <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{