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

r3119 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 14:25:19 +0000 (Sun, 21 Nov 2010) New Revision: 3119 Log: Update mavenpom4labs to 2.4.1. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-11-17 11:09:17 UTC (rev 3118) +++ isis-fish/trunk/pom.xml 2010-11-21 14:25:19 UTC (rev 3119) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3118 - in isis-fish/trunk: . src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: chatellier Date: 2010-11-17 11:09:17 +0000 (Wed, 17 Nov 2010) New Revision: 3118 Log: Renommage de l'onglet "emmigration" Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-11-09 11:07:21 UTC (rev 3117) +++ isis-fish/trunk/changelog.txt 2010-11-17 11:09:17 UTC (rev 3118) @@ -1,5 +1,6 @@ isis-fish (3.3.0.6) stable; urgency=low + * Rename emigration tab to "Emmigration" for french locale * Add characters escaping in qsub script regex * Update to nuiton-j2r 1.0.2 * Clean debug file at each isis lauching Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-11-09 11:07:21 UTC (rev 3117) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-11-17 11:09:17 UTC (rev 3118) @@ -735,7 +735,7 @@ isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part -isisfish.populationMigrationEmigration.title=Migration +isisfish.populationMigrationEmigration.title=Emmigration isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e isisfish.populationMigrationImmigration.coefficient=Coefficient isisfish.populationMigrationImmigration.title=Immigration

1 0

r3117 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Nov '10

09 Nov '10

Author: chatellier Date: 2010-11-09 11:07:21 +0000 (Tue, 09 Nov 2010) New Revision: 3117 Log: Add special characters escaping in freemarker script Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-11-09 11:06:37 UTC (rev 3116) +++ isis-fish/trunk/changelog.txt 2010-11-09 11:07:21 UTC (rev 3117) @@ -1,5 +1,6 @@ isis-fish (3.3.0.6) stable; urgency=low + * Add characters escaping in qsub script regex * Update to nuiton-j2r 1.0.2 * Clean debug file at each isis lauching

1 0

r3116 - in isis-fish/trunk/src: main/resources/templates/ssh test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 09 Nov '10

09 Nov '10

Author: chatellier Date: 2010-11-09 11:06:37 +0000 (Tue, 09 Nov 2010) New Revision: 3116 Log: Add special characters escaping in freemarker script Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-10-29 08:26:23 UTC (rev 3115) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-11-09 11:06:37 UTC (rev 3116) @@ -10,12 +10,12 @@ <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' /> <#if simulationstandalonezip> - <#assign localsimulationzip='${simulationzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationzip='${simulationzip?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#else> <#assign localsimulationzip='${simulationzip}' /> </#if> - <#assign localsimulationresultzip='${simulationresultzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> - <#assign localsimulationprescript='${simulationprescript?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationresultzip='${simulationresultzip?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationprescript='${simulationprescript?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#assign localsimulationoutput='${isistemp}simulation-${simulationid}_$PBS_ARRAY_INDEX-output.txt' /> <#else> <#assign localsimulationid='${simulationid}' /> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-10-29 08:26:23 UTC (rev 3115) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-11-09 11:06:37 UTC (rev 3116) @@ -19,6 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; import java.io.IOException; +import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -239,4 +240,42 @@ Assert.assertTrue(remoteTemp.startsWith("/")); Assert.assertTrue(remoteTemp.endsWith("/")); } + + /** + * Test simulation names with special char. + * + * as_ICES2010_M+_10%_152Param_2010-11-08-17-18. + * + * Script now contains \\Q and \\E for thta case. + * + * @throws IOException when freemarker throws it + * @throws TemplateException when freemarker throws it + */ + @Test + public void testFreemarkerTemplateScriptSpecialchar() throws IOException, TemplateException { + + // some things to test ! + String shortSimulationId = "as_ICES2010_M+_10%_152Param_2010-11-08-17-18"; + String simulationId = shortSimulationId + "_122"; + String simulationZip = "simulation-" + simulationId + "-preparation.zip"; + String simulationResultZip = "/tmp/simulation-" + simulationId + "-result.zip"; + String simulationPreScript = null; + String isisTemp = IsisFish.config.getSimulatorSshTmpPath(); + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, shortSimulationId, + simulationZip, true, simulationResultZip, simulationPreScript, true); + + if (log.isInfoEnabled()) { + log.info("Script content = " + content); + } + + // simulation parameters + Assert.assertTrue("String \"" + shortSimulationId + "\" not found in template", content.indexOf(shortSimulationId) > 0); + Assert.assertTrue(content.indexOf("simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-preparation.zip") > 0); + Assert.assertTrue(content.indexOf("/tmp/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-result.zip") > 0); + Assert.assertTrue("String " + isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\" not found in template", content.indexOf(isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\"") > 0); + Assert.assertTrue("Action --simulateRemotelly not on script", content.indexOf(" --simulateRemotelly ") > 0); + } } \ No newline at end of file

1 0

r3115 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: tchemit Date: 2010-10-29 08:26:23 +0000 (Fri, 29 Oct 2010) New Revision: 3115 Log: Update mavenpom4labs to 2.4. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-26 12:52:56 UTC (rev 3114) +++ isis-fish/trunk/pom.xml 2010-10-29 08:26:23 UTC (rev 3115) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3114 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 12:52:56 +0000 (Tue, 26 Oct 2010) New Revision: 3114 Log: fix build (use inheritance from mavenpom for commons libs) Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-26 12:03:02 UTC (rev 3113) +++ isis-fish/trunk/pom.xml 2010-10-26 12:52:56 UTC (rev 3114) @@ -85,36 +85,26 @@ <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> - <version>1.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> </dependency> <dependency> @@ -127,8 +117,6 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> @@ -325,8 +313,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> </dependency> </dependencies>

1 0

r3113 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 12:03:02 +0000 (Tue, 26 Oct 2010) New Revision: 3113 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-17 01:43:09 UTC (rev 3112) +++ isis-fish/trunk/pom.xml 2010-10-26 12:03:02 UTC (rev 3113) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -5,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -19,21 +20,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> @@ -47,7 +48,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>${nuiton-widgets.version}</version> + <version>${nuitonWidgetsVersion}</version> <scope>compile</scope> </dependency> @@ -55,21 +56,21 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-api</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> @@ -225,19 +226,19 @@ <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> @@ -448,21 +449,21 @@  <projectId>isis-fish</projectId> <labs.id>8</labs.id> - <javadoc.version>2.7</javadoc.version> + <javadocPluginVersion>2.7</javadocPluginVersion> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName>  - <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.1</eugene.version> - <topia.version>2.3.0-beta-6</topia.version> - <nuiton-utils.version>1.1.4</nuiton-utils.version> - <nuiton-i18n.version>1.2.2</nuiton-i18n.version> - <nuiton-widgets.version>1.0.1</nuiton-widgets.version> - <jrst.version>1.1.1</jrst.version> - <aspectwerkz.version>2.0</aspectwerkz.version> - <xmlrpc.version>3.1.2</xmlrpc.version> + <jaxxVersion>1.7.1</jaxxVersion> + <eugeneVersion>2.0.1</eugeneVersion> + <topiaVersion>2.3.0-beta-6</topiaVersion> + <nuitonUtilsVersion>1.1.4</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonWidgetsVersion>1.0.1</nuitonWidgetsVersion> + <jrstPluginVersion>1.1.1</jrstPluginVersion> + <aspectwerkzVersion>2.0</aspectwerkzVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath> @@ -480,19 +481,19 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${nuiton-i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <!-- <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -545,7 +546,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -591,7 +592,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>runtime</scope> </dependency> </dependencies>

1 0

r3112 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 01:43:09 +0000 (Sun, 17 Oct 2010) New Revision: 3112 Log: Update mavenpom4labs to 2.3.2 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-15 16:15:53 UTC (rev 3111) +++ isis-fish/trunk/pom.xml 2010-10-17 01:43:09 UTC (rev 3112) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3111 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 15 Oct '10

15 Oct '10

Author: chatellier Date: 2010-10-15 16:15:53 +0000 (Fri, 15 Oct 2010) New Revision: 3111 Log: Still wrong release (http://jira.codehaus.org/browse/MEV-647) Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-15 16:07:17 UTC (rev 3110) +++ isis-fish/trunk/pom.xml 2010-10-15 16:15:53 UTC (rev 3111) @@ -159,7 +159,7 @@ <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>1.0.12</version> </dependency>

1 0

r3110 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 15 Oct '10

15 Oct '10

Author: chatellier Date: 2010-10-15 16:07:17 +0000 (Fri, 15 Oct 2010) New Revision: 3110 Log: Update jfreechart Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-15 12:44:39 UTC (rev 3109) +++ isis-fish/trunk/pom.xml 2010-10-15 16:07:17 UTC (rev 3110) @@ -159,7 +159,7 @@ <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.12</version> + <version>1.0.13</version> </dependency>

1 0