Author: chatellier Date: 2009-10-21 12:33:35 +0000 (Wed, 21 Oct 2009) New Revision: 2683 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/SSHSimulatorLauncher.java isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-cron.seq isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq Log: Add file redirection in caparmor simulation launch scripts 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-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-10-21 12:33:35 UTC (rev 2683) @@ -1,3 +1,9 @@ +isis-fish (3.2.0.9) stable; urgency=high + + * Add file redirection in caparmor simulation launch scripts + +-- mer. oct. 21 14:27:05 CEST 2009 + isis-fish (3.2.0.8) stable; urgency=high * Fix compilation directory per simulation problem (aspect were defined 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-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-10-21 12:33:35 UTC (rev 2683) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.8</version> + <version>3.2.0.9</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.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> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/isis-fish-3.2.0.9?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-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-21 12:33:35 UTC (rev 2683) @@ -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, 8); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 9); 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/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-10-21 12:33:35 UTC (rev 2683) @@ -950,6 +950,7 @@ // context values Map<String, Object> root = new HashMap<String, Object>(); root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); + root.put("isistemp", getRemoteTempDirectory()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); root.put("simulationresultzip", simulationZipResult); Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-cron.seq =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-cron.seq 2009-10-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-cron.seq 2009-10-21 12:33:35 UTC (rev 2683) @@ -3,7 +3,7 @@ cd "${isishome}" <#if simulationprescript?length > 0> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" +java -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" <#else> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" +java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" </#if> \ No newline at end of file Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-10-21 12:18:45 UTC (rev 2682) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-10-21 12:33:35 UTC (rev 2683) @@ -6,7 +6,7 @@ module load java/1.6.0 <#if simulationprescript?length > 0> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" <#else> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" </#if> \ No newline at end of file