Author: chatellier Date: 2009-10-20 10:26:38 +0000 (Tue, 20 Oct 2009) New Revision: 2671 Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt isis-fish/branches/isis-fish-3.2.0.8/pom.xml isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/isis-fish-3.2.0.8/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/branches/isis-fish-3.2.0.8/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-10-20 10:12:40 UTC (rev 2670) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-10-20 10:26:38 UTC (rev 2671) @@ -1,3 +1,10 @@ +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/branches/isis-fish-3.2.0.8/pom.xml =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-10-20 10:12:40 UTC (rev 2670) +++ isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-10-20 10:26:38 UTC (rev 2671) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.7</version> + <version>3.2.0.8</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> @@ -585,9 +585,9 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/isis-fish-3.2.0.7?root=isis-fish</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.8</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.8</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/isis-fish-3.2.0.8?root=isis-fish</url> </scm> <!--Code Lutin Repository--> Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-20 10:12:40 UTC (rev 2670) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-20 10:26:38 UTC (rev 2671) @@ -121,7 +121,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 7); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 8); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber( Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 10:12:40 UTC (rev 2670) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-10-20 10:26:38 UTC (rev 2671) @@ -318,20 +318,21 @@ 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);