Author: chatellier Date: 2009-10-20 13:20:33 +0000 (Tue, 20 Oct 2009) New Revision: 2673 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Fix compilation directory per simulation problem (aspect were defined before simulation context definition) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-10-20 12:44:50 UTC (rev 2672) +++ isis-fish/trunk/changelog.txt 2009-10-20 13:20:33 UTC (rev 2673) @@ -1,11 +1,20 @@ isis-fish (3.3.0.0) stable; urgency=low + * Fix a depth commit problem on script UI + * Readd diff on script UI * Update to svnkit 1.3.1 * Unification of error frames * Move codelutin libs to nuiton.org -- mar. oct. 13 09:48:15 CEST 2009 +isis-fish (3.2.0.8) stable; urgency=high + + * Fix compilation directory per simulation problem (aspect were defined + before simulation context definition) + + -- mar. oct. 20 12:21:46 CEST 2009 + isis-fish (3.2.0.7) stable; urgency=low * Fix a missing hashCode() problem in month (cause problem in matrixND) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 12:44:50 UTC (rev 2672) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 13:20:33 UTC (rev 2673) @@ -318,21 +318,22 @@ File rootDirectory = simulation.getDirectory(); // - // changement de classloader - // - classLoader = changeClassLoader(Thread.currentThread(), - rootDirectory); - - // // Creation et initialisation du context de simulation // SimulationContext context = SimulationContext.get(); + context.setSimulationControl(control != null ? control + : new SimulationControl(simulation.getName())); + + // changement de classloader + // IMPORTANT : must be set AFTER : + // - SimulationContext.get(); + // - context.setSimulationControl() + classLoader = changeClassLoader(Thread.currentThread(), rootDirectory); + context.setClassLoader(classLoader); context.setScriptDirectory(rootDirectory); context.setSimulationStorage(simulation); - context.setSimulationControl(control != null ? control - : new SimulationControl(simulation.getName())); - + // Warning : Rule have to be instanciated after aspect definition classLoader.deploy(RuleAspect.class);