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

r4425 - in trunk: . src/test/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 13 Sep '17

13 Sep '17

Author: echatellier Date: 2017-09-13 23:10:16 +0200 (Wed, 13 Sep 2017) New Revision: 4425 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4425 Log: Add test to show topia connection closing leak Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 15:04:49 UTC (rev 4424) +++ trunk/pom.xml 2017-09-13 21:10:16 UTC (rev 4425) @@ -561,7 +561,7 @@  <jaxxVersion>2.41</jaxxVersion> - <topiaVersion>2.12</topiaVersion> + <topiaVersion>2.12.1-SNAPSHOT</topiaVersion> <hibernateVersion>5.1.10.Final</hibernateVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-09-12 15:04:49 UTC (rev 4424) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-09-13 21:10:16 UTC (rev 4425) @@ -26,6 +26,7 @@ package fr.ifremer.isisfish.simulator.launcher; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,6 +34,7 @@ import java.util.SortedMap; import java.util.TreeMap; +import fr.ifremer.isisfish.datastore.IsisH2Config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -42,6 +44,7 @@ import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.AbstractIsisFishTest; @@ -75,6 +78,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.Month; +import org.nuiton.topia.framework.TopiaContextImpl; +import org.nuiton.util.FileUtil; /** * Test for {@link SimulationService}. @@ -610,4 +615,42 @@ Assert.assertTrue(preScriptContent.contains("beanUtils.convert(\"String myValue=\\\"test2\\\"")); Assert.assertTrue(preScriptContent.contains("BeanUtils.setProperty(entity0, \"growthEquationContent\"")); } + + /** + * Test que lorsque l'on lance beaucoup de simulations, il ne reste oas des threads inutiles qui occupent toutes + * les ressources de la machines. + * @throws InterruptedException + */ + @Test + @Ignore + public void testNonClosedThreadsWhenRunningALotOfSimulations() throws IOException, InterruptedException { + //RegionStorage region = RegionStorage.getRegion("DemoRegion"); + + File dirTest = FileUtil.createTempDirectory("sims-", "test", new File("target")).getAbsoluteFile(); + + for (int i = 0; i <= 20; i++) { + // V1 + // SimulationStorage sim = SimulationStorage.importAndRenameZip( + // dirTest, initialZip, "sim" + i); + + // v2 + //SimulationStorage result = new SimulationStorage(dirTest, "test" + i, null); + //TopiaContext tx = result.getStorage().beginTransaction(); + //tx.closeContext(); + //result.closeStorage(); + + // v3 + File simDir = new File(dirTest, "sim" + i); + Properties config = new Properties(); + IsisH2Config.addDatabaseConfig(config, simDir); + TopiaContext storage = TopiaContextFactory.getContext(config); + storage.closeContext(); + } + + Thread.getAllStackTraces().keySet().forEach(t -> System.out.println(t.getName())); + + // une seule simulation en prends 10 + // donc meme pour 100 simulations, ca ne devrait pas être beaucoup plus + Assert.assertTrue(String.format("Il y a %d threads", Thread.activeCount()), Thread.activeCount() < 100); + } }

1 0

r4424 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 17:04:49 +0200 (Tue, 12 Sep 2017) New Revision: 4424 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4424 Log: Remove hikari Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/pom.xml 2017-09-12 15:04:49 UTC (rev 4424) @@ -68,13 +68,6 @@ <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-hikaricp</artifactId> - <version>${hibernateVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 15:04:49 UTC (rev 4424) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Tony Chemit + * Copyright (C) 2002 - 2017 Ifremer, Code Lutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.hikaricp.internal.HikariCPConnectionProvider; import org.nuiton.topia.migration.TopiaMigrationEngine; import org.nuiton.topia.migration.TopiaMigrationService; @@ -130,8 +129,7 @@ config.setProperty(Environment.DIALECT, H2Dialect.class.getName()); config.setProperty(Environment.DRIVER, org.h2.Driver.class.getName()); // correct error : org.hibernate.HibernateException: No CurrentSessionContext configured! - //config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); - config.setProperty(Environment.CONNECTION_PROVIDER, HikariCPConnectionProvider.class.getName()); + config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); //config.setProperty(Environment.SHOW_SQL, "true"); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-09-12 14:39:41 UTC (rev 4423) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-09-12 15:04:49 UTC (rev 4424) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2014 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2014 - 2017 Ifremer, Code Lutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -207,9 +207,9 @@ } } // close context for plan generator - // FIXME echatellier 20120904 could throw - //org.nuiton.topia.TopiaException: Ce contexte a deja ete ferme sim.closeStorage(); + sim.closeMemStorage(); + // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtils.deleteQuietly(tmpDirectory)) { log.warn(t("isisfish.error.remove.directory", tmpDirectory));

1 0

r4423 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore src/main/javascript/templates/web
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 16:39:41 +0200 (Tue, 12 Sep 2017) New Revision: 4423 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4423 Log: Update libs Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java trunk/src/main/javascript/templates/web/region-web.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/pom.xml 2017-09-12 14:39:41 UTC (rev 4423) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-18</version> + <version>3.0</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.2</version> + <version>3.3</version> <scope>compile</scope> </dependency> @@ -65,9 +65,16 @@ <version>${hibernateVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-hikaricp</artifactId> + <version>${hibernateVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> @@ -135,7 +142,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.6</version> + <version>1.6.0</version> <scope>compile</scope> </dependency> @@ -192,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -223,7 +230,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.4</version> + <version>1.5</version> </dependency> <dependency> @@ -312,7 +319,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.194</version> + <version>1.4.196</version> <scope>compile</scope> </dependency> @@ -332,7 +339,7 @@ <dependency> <groupId>ca.umontreal.iro.simul</groupId> <artifactId>ssj</artifactId> - <version>3.2.0</version> + <version>3.2.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -351,7 +358,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.12</version> + <version>1.9.0</version> <scope>compile</scope> <exclusions> <exclusion> @@ -373,7 +380,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.25-incubating</version> + <version>2.3.26-incubating</version> <scope>compile</scope> </dependency> @@ -386,25 +393,25 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>23.0</version> </dependency> <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>3.9</version> + <version>4.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.7</version> + <version>2.9.1</version> </dependency>  @@ -562,7 +569,7 @@  <jaxxVersion>2.41</jaxxVersion> <topiaVersion>2.12</topiaVersion> - <hibernateVersion>5.1.5.Final</hibernateVersion> + <hibernateVersion>5.1.10.Final</hibernateVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -612,7 +619,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> <executions> <execution> <id>enforce-bytecode-version</id> @@ -622,7 +629,7 @@ <configuration> <rules> <enforceBytecodeVersion> - <maxJdkVersion>1.7</maxJdkVersion> + <maxJdkVersion>1.8</maxJdkVersion> </enforceBytecodeVersion> </rules> <fail>true</fail> @@ -633,7 +640,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-6</version> </dependency> </dependencies> </plugin> @@ -764,9 +771,9 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.3</version> + <version>1.5</version> <configuration> - <nodeVersion>v7.7.4</nodeVersion> + <nodeVersion>v8.4.0</nodeVersion> </configuration> <executions> <execution> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2017-09-12 14:39:41 UTC (rev 4423) @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; +import org.hibernate.hikaricp.internal.HikariCPConnectionProvider; import org.nuiton.topia.migration.TopiaMigrationEngine; import org.nuiton.topia.migration.TopiaMigrationService; @@ -129,7 +130,8 @@ config.setProperty(Environment.DIALECT, H2Dialect.class.getName()); config.setProperty(Environment.DRIVER, org.h2.Driver.class.getName()); // correct error : org.hibernate.HibernateException: No CurrentSessionContext configured! - config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); + //config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); + config.setProperty(Environment.CONNECTION_PROVIDER, HikariCPConnectionProvider.class.getName()); //config.setProperty(Environment.SHOW_SQL, "true"); Modified: trunk/src/main/javascript/templates/web/region-web.html =================================================================== --- trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 10:33:07 UTC (rev 4422) +++ trunk/src/main/javascript/templates/web/region-web.html 2017-09-12 14:39:41 UTC (rev 4423) @@ -1,3 +1,24 @@ + <!doctype html> <html> <head>

1 0

r4422 - trunk
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 12:33:07 +0200 (Tue, 12 Sep 2017) New Revision: 4422 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4422 Log: fixes #7989: Use java 8 compiler and code compliance Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-09-12 10:28:35 UTC (rev 4421) +++ trunk/pom.xml 2017-09-12 10:33:07 UTC (rev 4422) @@ -554,9 +554,9 @@ <siteDeployClassifier /> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion>  @@ -907,7 +907,7 @@ <properties>  <minimumTokens>100</minimumTokens> - <targetJdk>1.7</targetJdk> + <targetJdk>1.8</targetJdk> </properties> <build> @@ -920,7 +920,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <links> - <link>http://docs.oracle.com/javase/7/docs/api/</link> + <link>http://docs.oracle.com/javase/8/docs/api/</link> <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> <link>http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/</link> <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link>

1 0

r4421 - in trunk: doc src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/ui/config src/main/resources/i18n src/test/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 12 Sep '17

12 Sep '17

Author: echatellier Date: 2017-09-12 12:28:35 +0200 (Tue, 12 Sep 2017) New Revision: 4421 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4421 Log: fixes #9363: Add datarmor simulation launcher Modified: trunk/doc/SimulationSSH.rst trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Modified: trunk/doc/SimulationSSH.rst =================================================================== --- trunk/doc/SimulationSSH.rst 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/doc/SimulationSSH.rst 2017-09-12 10:28:35 UTC (rev 4421) @@ -6,7 +6,7 @@ Il faut configurer les paramètres : ssh.key.file=/home/username/.ssh/id_rsa - simulation.ssh.server=caparmor.ifremer.fr\:22 + simulation.ssh.server=datarmor.ifremer.fr\:22 simulation.ssh.username=username simulation.ssh.datapath=/home/username/isis-database-3 simulation.ssh.addscripttoqueuecommand=/usr/pbs/bin/qsub Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -137,7 +137,7 @@ protected static Version databaseVersion; protected static Version apiVersion; // IDEA: perhaps add this in simulation configuration to permit easy portable - // export between CapArmor and Windows world + // export between datarmor and Windows world public static final Charset charset = Charset.forName("UTF-8"); public static final String COMPRESSION_EXTENSION = ".gz"; @@ -216,7 +216,7 @@ IsisConfig.databaseVersion = Versions.extractVersion(IsisConfig.version, 0, 1); IsisConfig.apiVersion = Versions.extractVersion(IsisConfig.version, 0, 2); - setDefaultOption(Option.SIMULATOR_SSH_ISIS_HOME.key, "/home3/caparmor/poussin/isis-fish-" + apiVersion.toString()); + setDefaultOption(Option.SIMULATOR_SSH_ISIS_HOME.key, "/home3/datahome/echatell/isis-fish-" + apiVersion.toString()); } ////////////////////////////////////////////////// @@ -554,25 +554,6 @@ public void setSimulatorSshTmpPath(String sshtemppath) { setOption(Option.SIMULATOR_SSH_TMPPATH.key, sshtemppath); } - - /** - * PBS bin path directory. - * - * @return path - */ - public String getSimulatorSshPbsBinPath() { - String result = getOption(Option.SIMULATOR_SSH_PBSBINPATH.key); - return result; - } - - /** - * Change PBS bin path. - * - * @param path new path - */ - public void setSimulatorSshPbsBinPath(String path) { - setOption(Option.SIMULATOR_SSH_PBSBINPATH.key, path); - } /** * PBS qsub options (command line). @@ -1130,7 +1111,7 @@ /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n("isisfish.config.main.remoteDatarmor.description"), SSHSimulatorLauncher.class.getName()), // pour les simulations @@ -1150,31 +1131,29 @@ SIMULATOR_SUB_MAXMEMORY("simulation.sub.max.memory", n("isisfish.config.main.simulation.sub.max.memory.description"), "1024M"), /** Serveur accessible par ssh : address */ - SIMULATOR_SSH_SERVER("simulation.ssh.server", n("isisfish.config.main.simulation.ssh.server.description"), "caparmor-sftp"), + SIMULATOR_SSH_SERVER("simulation.ssh2.server", n("isisfish.config.main.simulation.ssh.server.description"), "datarmor"), /** Serveur accessible par ssh : login */ - SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n("isisfish.config.main.simulation.ssh.username.description"), ""), + SIMULATOR_SSH_USER_NAME("simulation.ssh2.username", n("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ - SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n("isisfish.config.main.simulation.ssh.userhome.description"), ""), + SIMULATOR_SSH_USER_HOME("simulation.ssh2.userhome", n("isisfish.config.main.simulation.ssh.userhome.description"), ""), /** Serveur accessible par ssh : remote data path */ - SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n("isisfish.config.main.simulation.ssh.datapath.description"), "isis-fish-4/isis-database"), + SIMULATOR_SSH_DATAPATH("simulation.ssh2.datapath", n("isisfish.config.main.simulation.ssh.datapath.description"), "isis-fish-4/isis-database"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n("isisfish.config.main.simulation.ssh.isis.home.description"), null), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh2.isis.home", n("isisfish.config.main.simulation.ssh.isis.home.description"), null), /** Serveur accessible par ssh : remote tmp path */ - SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + SIMULATOR_SSH_TMPPATH("simulation.ssh2.tmppath", n("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement de Java (full path) */ - SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath430", n("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk7/bin/java"), - /** Serveur accessible par SSH : emplacement des executables pbs */ - SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + SIMULATOR_SSH_JAVAPATH("simulation.ssh2.javapath431", n("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/datahome/echatell/jdk8/bin/java"), /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ - SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh2.pbsqsuboptions", n("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n -l mem=2GB -l walltime=01:00:00"), /** Serveur accessible par SSH : interval de check du fichier de control */ - SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh2.control.check.interval", n("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ - SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), - /** Serveur accessible par SSH : mémoire (Xmx) allouée pour les process java sur caparmor */ - SIMULATOR_SSH_MAXMEMORY("simulation.ssh.max.memory", n("isisfish.config.main.simulation.ssh.max.memory.description"), "2000M"), + SIMULATOR_SSH_MAXTHREADS("simulation.ssh2.max.threads", n("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + /** Serveur accessible par SSH : mémoire (Xmx) allouée pour les process java sur datarmor */ + SIMULATOR_SSH_MAXMEMORY("simulation.ssh2.max.memory", n("isisfish.config.main.simulation.ssh.max.memory.description"), "2000M"), /** Serveur accessible par SSH : la proxy commande a ajouter pour ouvrir la connexion. */ - SIMULATOR_SSH_PROXYCOMMAND("simulation.ssh.proxy.command", n("isisfish.config.main.simulation.ssh.proxy.command.description"), null), + SIMULATOR_SSH_PROXYCOMMAND("simulation.ssh2.proxy.command", n("isisfish.config.main.simulation.ssh.proxy.command.description"), null), /** Application locale (for i18n init). */ LOCALE("locale", n("isisfish.config.main.locale.description"), "fr_FR"), @@ -1194,7 +1173,7 @@ /** Database lock mode (h2).*/ DATABASE_LOCK_MODE("database.lockmode", n("isisfish.config.database.lockmode.description"), "file"), - // SSH (global, for both VCS and caparmor) + // SSH (global, for both VCS and datarmor) SSH_KEY_FILE("ssh.key.file", n("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), DATABASE_DIRECTORY("database.directory", n("isisfish.config.vcs.localDatabasePath.description"), "${isis.home.directory}" + File.separator + "isis-database"), Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -75,7 +75,7 @@ * * Isis-Fish must be installed on remote server. * - * Caparmor file layout ($i = plan/as increment) : + * Datarmor file layout ($i = plan/as increment) : * <ul> * <li>$ISIS-TMP/simulation-$id-preparation.zip</li> * <li>$ISIS-TMP/simulation-$id-prescript.bsh</li> @@ -864,7 +864,7 @@ } /** - * Remove all {@code $ISIS-TMP/simulation-$id-*} files on caparmor. + * Remove all {@code $ISIS-TMP/simulation-$id-*} files on datarmor. * * @param session valid opened ssh session * @param control simulation control @@ -1126,7 +1126,7 @@ // command to : // - add script in qsub queue String remoteFilenameId = getRemoteTempDirectory() + "simulation-" + simulationId + "-pbs.id"; - String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qsub"; + String command = "qsub"; // add qsub options String qsubOptions = IsisFish.config.getSimulatorSshPbsQsubOptions(); @@ -1173,7 +1173,7 @@ // command to : String remoteFilenameId = getRemoteTempDirectory() + "simulation-" + simulationId + "-pbs.id"; - String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qdel `cat \"" + remoteFilenameId + "\"`"; + String command = "qdel `cat \"" + remoteFilenameId + "\"`"; // and delete simulation //command += " && rm -rf \"" + IsisFish.config.getSimulatorSshDataPath() + "/simulations/" + simulationId + "\""; @@ -1193,7 +1193,7 @@ /** * Get remote directory absolute path. * - * Don't use {@link java.io.File#separator} here, caparmor is always unix. + * Don't use {@link java.io.File#separator} here, datarmor is always unix. * * @return remote temp directory path */ Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -222,7 +222,7 @@ SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); // c'est bloquant seulement le temps du lancement - // (envoie sur caparmor par exemple) + // (envoie sur datarmor par exemple) // l'appel peut ensuite passer alors que la simulation // n'a pas effectivement demarré subjob.run(); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -676,7 +676,7 @@ // il faut bien penser a supprimer le launcher pour qu'un autre executor // puisse y mettre le sien. // FIXME: est ce le bon choix si l'utilisateur avait force un launcher particulier, ne faudrait t'il pas prevenir l'utilisateur ? - // FIXME: disabled since caparmor is not our friend. Retry on caparmor in the limit of 50 errors + // FIXME: disabled since datarmor is not our friend. Retry on datarmor in the limit of 50 errors //job.setLauncher(null); try { // not resubmit immediatly, wait some time (max 10 min and about 4,2 hours in total) Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -32,7 +32,7 @@ /** * Interface devant etre implantée par les classes souhaitants etre utilisees - * comme plugin de simulation (InProcess, SubProcess, CapArmor, ...) + * comme plugin de simulation (InProcess, SubProcess, Datarmor, ...) * * @author poussin * @version $Revision$ Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -77,7 +77,6 @@ protected String currentSSHIsisHome; protected String currentSSHTempPath; protected String currentSSHJavaPath; - protected String currentSSHPbsBinPath; protected String currentSSHPbsQsubOptions; protected String currentSSHMaxThreads; protected String currentSSHMaxMemory; @@ -112,7 +111,6 @@ configUI.getSshIsisHomeField().setText(IsisFish.config.getSimulatorSshIsisHome()); configUI.getSshTemppathField().setText(IsisFish.config.getSimulatorSshTmpPath()); configUI.getSshJavaPathField().setText(IsisFish.config.getSimulatorSshJavaPath()); - configUI.getSshPbsBinPathField().setText(IsisFish.config.getSimulatorSshPbsBinPath()); configUI.getSshPbsQsubOptionsField().setText(IsisFish.config.getSimulatorSshPbsQsubOptions()); configUI.getSshControlIntervalField().setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); configUI.getSshMaxThreadsField().setText(String.valueOf(IsisFish.config.getSimulatorSshMaxThreads())); @@ -197,14 +195,6 @@ setColor(false, configUI.getSshJavaPathField()); } - currentSSHPbsBinPath = configUI.getSshPbsBinPathField().getText() - .trim(); - if (currentSSHPbsBinPath.isEmpty()) { - setColor(true, configUI.getSshPbsBinPathField()); - } else { - setColor(false, configUI.getSshPbsBinPathField()); - } - // currentSSHPbsQsubOptions currentSSHPbsQsubOptions = configUI.getSshPbsQsubOptionsField().getText().trim(); @@ -243,7 +233,6 @@ IsisFish.config.setSimulatorSshIsisHome(currentSSHIsisHome); IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); IsisFish.config.setSimulatorSshJavaPath(currentSSHJavaPath); - IsisFish.config.setSimulatorSshPbsBinPath(currentSSHPbsBinPath); IsisFish.config.setSimulatorSshPbsQsubOptions(currentSSHPbsQsubOptions); IsisFish.config.setSimulatorSshControlCheckInterval(Integer.parseInt(currentSSHControlInterval)); IsisFish.config.setSimulatorSshMaxThreads(Integer.parseInt(currentSSHMaxThreads)); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2017-09-12 10:28:35 UTC (rev 4421) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin + Copyright (C) 2009 - 2017 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -128,17 +128,6 @@ </row> <row fill='horizontal'> <cell> - <JLabel id='sshPbsBinPathLabel' text='isisfish.config.main.simulation.ssh.pbsbinpath' - toolTipText='isisfish.config.main.simulation.ssh.pbsbinpath.description' /> - </cell> - <cell> - <JTextField id='sshPbsBinPathField' - toolTipText='isisfish.config.main.simulation.ssh.pbsbinpath.description' - onKeyReleased="handler.doCheck()" /> - </cell> - </row> - <row fill='horizontal'> - <cell> <JLabel id='sshPbsQsubOptionsLabel' text='isisfish.config.main.simulation.ssh.pbsqsuboptions' toolTipText='isisfish.config.main.simulation.ssh.pbsqsuboptions.description' /> </cell> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-09-12 10:28:35 UTC (rev 4421) @@ -202,7 +202,7 @@ isisfish.config.main.performcron.description=Perform all task registered in cron service isisfish.config.main.performmigration.description=Perform data migration isisfish.config.main.performvcsupdate.description=Perform vcs update -isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name +isisfish.config.main.remoteDatarmor.description=Remote simulator launcher name isisfish.config.main.script.autoconfig.description=Display a dialog to force script configuration isisfish.config.main.simulation.in.max.threads.description=Max threads count in current process isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) @@ -212,7 +212,7 @@ isisfish.config.main.simulation.ssh.isis.home=ISIS-Fish home isisfish.config.main.simulation.ssh.isis.home.description=ISIS-Fish installation directory isisfish.config.main.simulation.ssh.javapath=Java path -isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is caparmor configuration) +isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is datarmor configuration) isisfish.config.main.simulation.ssh.max.memory=Ssh simulation Xmx allocated memory isisfish.config.main.simulation.ssh.max.memory.description=Ssh simulation Xmx allocated memory isisfish.config.main.simulation.ssh.max.threads=SSH threads count @@ -931,7 +931,7 @@ isisfish.simulation.message.analyzeResults=Results analysis isisfish.simulation.message.lookingforlast=Looking for last simulation isisfish.simulation.message.scriptscompilation=Rules and scripts compilation -isisfish.simulation.remote.message.connection=Connecting to Caparmor +isisfish.simulation.remote.message.connection=Connecting to Datarmor isisfish.simulation.remote.message.deletingfiles=Deleting simulation files isisfish.simulation.remote.message.downloadresults=Downloading results isisfish.simulation.remote.message.upload=Uploading simulation @@ -952,7 +952,7 @@ isisfish.simulator.configuration.r.testok=R successfully tested \! isisfish.simulator.configuration.r.title=R Configuration isisfish.simulator.launcher.inprocess=in current process -isisfish.simulator.launcher.remote=on Caparmor server +isisfish.simulator.launcher.remote=on Datarmor server isisfish.simulator.launcher.subprocess=in subprocess isisfish.simulator.simulaction.badid=Can't start simulation, bad id\: %s isisfish.simulator.ssh.configuration.connecting=Connection... @@ -960,7 +960,7 @@ isisfish.simulator.ssh.configuration.connection=Connection information isisfish.simulator.ssh.configuration.connectionerror=Can't connect isisfish.simulator.ssh.configuration.connectionok=Connection successfull -isisfish.simulator.ssh.configuration.environment=Caparmor configuration +isisfish.simulator.ssh.configuration.environment=Datarmor configuration isisfish.simulator.ssh.configuration.freespace=Used space disk \: isisfish.simulator.ssh.configuration.freespace.confirmdelete=Warning, deleting folder '%s' is irreversible.\nDo you confirm the deletion of contents ? isisfish.simulator.ssh.configuration.freespace.label=Size of %s \: %s @@ -968,7 +968,7 @@ isisfish.simulator.ssh.configuration.keygenerate=Generate isisfish.simulator.ssh.configuration.status=Status isisfish.simulator.ssh.configuration.test=Test configuration -isisfish.simulator.ssh.configuration.title=Caparmor launcher configuration +isisfish.simulator.ssh.configuration.title=Datarmor launcher configuration isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=Age isisfish.species.cee=CEE @@ -1075,7 +1075,7 @@ isisfish.welcome.menu.close=Close isisfish.welcome.menu.configuration=Configuration isisfish.welcome.menu.configuration.r=R configuration -isisfish.welcome.menu.configuration.sshlauncher=Caparmor configuration +isisfish.welcome.menu.configuration.sshlauncher=Datarmor configuration isisfish.welcome.menu.configuration.vcs=VCS configuration isisfish.welcome.menu.file=File isisfish.welcome.menu.frame=Window Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-09-12 10:28:35 UTC (rev 4421) @@ -202,7 +202,7 @@ isisfish.config.main.performcron.description=Démarre toutes les tâches définies dans le service cron isisfish.config.main.performmigration.description=Migre les données isisfish.config.main.performvcsupdate.description=Met à jour le dépôt VCS -isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante +isisfish.config.main.remoteDatarmor.description=Nom du lanceur de simulation distante isisfish.config.main.script.autoconfig.description=Affiche une fenêtre pour forcer la configuration des scripts isisfish.config.main.simulation.in.max.threads.description=Nombre de thread maximum dans le processus courant isisfish.config.main.simulation.ssh.control.check.interval=Vérification de la progression (secondes) @@ -212,7 +212,7 @@ isisfish.config.main.simulation.ssh.isis.home=Installation d'ISIS-Fish isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'ISIS-Fish sur le serveur isisfish.config.main.simulation.ssh.javapath=Emplacement de java -isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de caparmor) +isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de datarmor) isisfish.config.main.simulation.ssh.max.memory=Quantité de mémoire allouée isisfish.config.main.simulation.ssh.max.memory.description=Quantité de mémoire maximum allouée (Xmx) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH @@ -931,7 +931,7 @@ isisfish.simulation.message.analyzeResults=Analyse des résultats isisfish.simulation.message.lookingforlast=Recherche de la dernière simulation isisfish.simulation.message.scriptscompilation=Compilation des scripts -isisfish.simulation.remote.message.connection=Connexion à Caparmor +isisfish.simulation.remote.message.connection=Connexion à Datarmor isisfish.simulation.remote.message.deletingfiles=Suppression des fichiers de simulation isisfish.simulation.remote.message.downloadresults=Téléchargement des résultats isisfish.simulation.remote.message.upload=Upload de la simulation @@ -952,7 +952,7 @@ isisfish.simulator.configuration.r.testok=R testé avec succès \! isisfish.simulator.configuration.r.title=Configuration de R isisfish.simulator.launcher.inprocess=dans le même processus -isisfish.simulator.launcher.remote=sur le serveur Caparmor +isisfish.simulator.launcher.remote=sur le serveur Datarmor isisfish.simulator.launcher.subprocess=dans un sous processus isisfish.simulator.simulaction.badid=Impossible de lancer la simulation '%s' \: l'identifiant existe déjà \! isisfish.simulator.ssh.configuration.connecting=Connexion en cours @@ -960,7 +960,7 @@ isisfish.simulator.ssh.configuration.connection=Information de connexion isisfish.simulator.ssh.configuration.connectionerror=Connexion impossible (%s) isisfish.simulator.ssh.configuration.connectionok=Connecté avec succès -isisfish.simulator.ssh.configuration.environment=Configuration sur Caparmor +isisfish.simulator.ssh.configuration.environment=Configuration sur Datarmor isisfish.simulator.ssh.configuration.freespace=Espace disque utilisé \: isisfish.simulator.ssh.configuration.freespace.confirmdelete=Attention, la suppression du dossier '%s' est irréversible.\nConfirmez-vous la suppression de son contenu ? isisfish.simulator.ssh.configuration.freespace.label=Taille de %s \: %s @@ -968,7 +968,7 @@ isisfish.simulator.ssh.configuration.keygenerate=Générer isisfish.simulator.ssh.configuration.status=Statut isisfish.simulator.ssh.configuration.test=Tester la configuration -isisfish.simulator.ssh.configuration.title=Configuration du lanceur Caparmor +isisfish.simulator.ssh.configuration.title=Configuration du lanceur Datarmor isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=Age isisfish.species.cee=CEE @@ -1075,7 +1075,7 @@ isisfish.welcome.menu.close=Fermer isisfish.welcome.menu.configuration=Configuration isisfish.welcome.menu.configuration.r=Configuration R -isisfish.welcome.menu.configuration.sshlauncher=Configuration Caparmor +isisfish.welcome.menu.configuration.sshlauncher=Configuration Datarmor isisfish.welcome.menu.configuration.vcs=Configuration vcs isisfish.welcome.menu.file=Fichier isisfish.welcome.menu.frame=Fenêtre Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2017-08-18 15:48:57 UTC (rev 4420) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2017-09-12 10:28:35 UTC (rev 4421) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2012 Ifremer, Code Lutin + * Copyright (C) 2008 - 2017 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -52,7 +52,7 @@ private static Log log = LogFactory.getLog(SshSimulatorLauncherTest.class); /** - * Test l'instantiation du script qsub (caparmor). + * Test l'instantiation du script qsub (datarmor). * * Le script contient plusieurs variables qui doivent être remplacées. * @@ -85,7 +85,7 @@ Assert.assertTrue("String \"" + simulationResultZip + "\" not found in template", content.indexOf(simulationResultZip) > 0); Assert.assertTrue("String \"" + simulationPreScript + "\" not found in template", content.indexOf(simulationPreScript) > 0); Assert.assertTrue("Action --simulateRemotellyWithPreScript not on script", content.indexOf(" --simulateRemotellyWithPreScript ") > 0); - Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk7/bin/java") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/datahome/echatell/jdk8/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); @@ -95,7 +95,7 @@ } /** - * Test l'instantiation du script qsub (caparmor). + * Test l'instantiation du script qsub (datarmor). * * Test sans script de pre simu. *

1 0