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

r2609 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org Sept. 14, 2009

Sept. 14, 2009

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 Sept. 14, 2009

Sept. 14, 2009

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 Sept. 14, 2009

Sept. 14, 2009

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 Sept. 14, 2009

Sept. 14, 2009

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 Sept. 14, 2009

Sept. 14, 2009

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

r2604 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Sept. 14, 2009

Sept. 14, 2009

Author: chatellier Date: 2009-09-14 09:26:02 +0000 (Mon, 14 Sep 2009) New Revision: 2604 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Add log message on linkage error Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 08:47:30 UTC (rev 2603) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-14 09:26:02 UTC (rev 2604) @@ -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 :

1 0

r2603 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Sept. 14, 2009

Sept. 14, 2009

Author: chatellier Date: 2009-09-14 08:47:30 +0000 (Mon, 14 Sep 2009) New Revision: 2603 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-14 08:33:38 UTC (rev 2602) +++ isis-fish/trunk/changelog.txt 2009-09-14 08:47:30 UTC (rev 2603) @@ -1,5 +1,7 @@ isis-fish (3.2.0.6) stable; urgency=low + * Fix force parameter when adding result with coposed names + * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary --

1 0

r2602 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.labs.libre-entreprise.org Sept. 14, 2009

Sept. 14, 2009

Author: bpoussin Date: 2009-09-14 08:33:38 +0000 (Mon, 14 Sep 2009) New Revision: 2602 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Log: - bug fix if in addResult pop name is added Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-11 10:17:20 UTC (rev 2601) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2009-09-14 08:33:38 UTC (rev 2602) @@ -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

r2601 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by chatellier＠users.labs.libre-entreprise.org Sept. 11, 2009

Sept. 11, 2009

Author: chatellier Date: 2009-09-11 10:17:20 +0000 (Fri, 11 Sep 2009) New Revision: 2601 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java Log: Update aspect package info. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-09-11 10:16:31 UTC (rev 2600) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-09-11 10:17:20 UTC (rev 2601) @@ -5,6 +5,7 @@ * <ul> * <li>{@link fr.ifremer.isisfish.aspect.Cache} : cache aspect</li> * <li>{@link fr.ifremer.isisfish.aspect.Trace} : trace expect</li> + * <li>{@link fr.ifremer.isisfish.aspect.RuleAspect} : rule timing aspect</li> * </ul> */ package fr.ifremer.isisfish.aspect;

1 0

r2600 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect
by chatellier＠users.labs.libre-entreprise.org Sept. 11, 2009

Sept. 11, 2009

Author: chatellier Date: 2009-09-11 10:16:31 +0000 (Fri, 11 Sep 2009) New Revision: 2600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Log: Throw runtime exception if there is no trace object in context. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -39,6 +39,7 @@ import org.codehaus.aspectwerkz.joinpoint.MethodRtti; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -83,6 +84,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -34,6 +34,7 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -79,6 +80,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; }

1 0