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

r3086 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish/simulator/launcher resources
by bleny＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: bleny Date: 2010-07-22 07:44:45 +0000 (Thu, 22 Jul 2010) New Revision: 3086 Log: bugfix, config log4j Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:07:38 UTC (rev 3085) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-22 07:44:45 UTC (rev 3086) @@ -41,6 +41,8 @@ protected static final String ISIS_APPLICATION_NAME = "isis-fish"; protected static DisworkDaemon disworkDaemon; + + protected static boolean closed = false; /** for each job id, the corresponding job description */ protected static Map<String, JobDescription> jobs = @@ -48,7 +50,7 @@ public DisworkSimulatorLauncher() {} - protected synchronized static DisworkDaemon getDaemon() { + protected synchronized static DisworkDaemon getDaemon() throws RemoteException { if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); @@ -61,25 +63,28 @@ disworkDaemon = new DisworkDaemon(config); } catch (DisworkException e) { log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); + closed = true; + throw new RemoteException("unable to boot diswork FS", e); } - } - try { - synchronized (jobs) { - for (JobDescription job : disworkDaemon.getAllJobs(ISIS_APPLICATION_NAME)) { + + try { + for (JobDescription job : getDaemon().getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); - } + } + log.debug(jobs.size() + " jobs retrieved from diswork"); + } catch (DisworkException e) { + log.error("unable to boot diswork FS"); + throw new RuntimeException("unable to boot diswork FS", e); } - log.info(jobs.size() + "jobs retrieved from diswork"); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); } + return disworkDaemon; } // TODO 20100628 bleny upload application if needed, whatever the version - protected void submitIsisApplication(String isisVersion) { + protected synchronized void submitIsisApplication(String isisVersion) { + // method is synchronized so two submission at the same time + // will not upload isis twice try { log.info("submitting isis-fish " + isisVersion + " to diswork"); URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); @@ -98,6 +103,19 @@ @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + if (closed) { + simulationItem.getControl().setText("unable to connect to diswork"); + simulationItem.getControl().setStopSimulationRequest(true); + + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); @@ -180,8 +198,6 @@ protected File downloadResults(JobDescription jobDescription) throws DisworkException { - - OutputStream out = null; try { File tempDir = FileUtil.createTempDirectory("isis-results-" + @@ -215,6 +231,18 @@ @Override public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException { + if (closed) { + control.setText("unable to connect to diswork"); + + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + JobDescription jobDescription = jobs.get(control.getId()); if (jobDescription == null) { log.error("unknow Id" + control.getId()); @@ -236,8 +264,23 @@ @Override public void simulationStopRequest(SimulationJob job) throws RemoteException { + if (closed) { + // sleep a bit before throwing exception prevent infinite loop + try { + Thread.sleep(1 * 1000); + } catch (InterruptedException e) { + throw new RemoteException("lancher interrupted", e); + } + throw new RemoteException("daemon has been closed"); + } + try { - getDaemon().deleteJob(jobs.get(job.getId())); + JobDescription jobDescription = jobs.get(job.getId()); + if (jobDescription == null) { + log.warn(job + " is not a know job"); + } else { + getDaemon().deleteJob(jobDescription); + } } catch (DisworkException e) { log.error("error while trying to delete a job", e); throw new RemoteException("error while trying to delete a job", e); @@ -253,9 +296,14 @@ } /** must be called when IsisFish is being closed */ - public static void close() throws DisworkException { + public static void close() throws RemoteException { + closed = true; if (getDaemon() != null) { - getDaemon().close(); + try { + getDaemon().close(); + } catch (DisworkException e) { + throw new RemoteException("unable to close daemon", e); + } } } Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:07:38 UTC (rev 3085) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/log4j.properties 2010-07-22 07:44:45 UTC (rev 3086) @@ -8,8 +8,6 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.nuiton=INFO -log4j.logger.org.nuiton.diswork.daemon=DEBUG -log4j.logger.org.nuiton.diswork.fs=INFO log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.analyseplans=INFO log4j.logger.exports=INFO @@ -19,3 +17,8 @@ log4j.logger.sensitivity=INFO log4j.logger.sensitivityexports=INFO log4j.logger.simulators=INFO + +# diswork +log4j.logger.org.nuiton.diswork.daemon=DEBUG +log4j.logger.org.nuiton.diswork.fs=INFO +log4j.logger.org.planx.xmlstore=WARN \ No newline at end of file

1 0

r3085 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 22 Jul '10

22 Jul '10

Author: chatellier Date: 2010-07-22 07:07:38 +0000 (Thu, 22 Jul 2010) New Revision: 3085 Log: Update version and changelog Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-07-21 16:21:17 UTC (rev 3084) +++ isis-fish/trunk/changelog.txt 2010-07-22 07:07:38 UTC (rev 3085) @@ -1,3 +1,7 @@ +isis-fish (3.3.0.5) stable; urgency=low + + -- jeu. juil. 22 09:32:36 CEST 2010 + isis-fish (3.3.0.4) stable; urgency=low * Add more startup information in debug.txt file (arch, R_HOME, PATH) @@ -7,7 +11,7 @@ * Fix parameter edition for non primitive types in user script (Double...) * Add simulation parameter cache to not keep simulation prescript on memory - -- jeu. avril 29 18:47:58 CEST 2010 + -- jeu. juil. 21 19:32:36 CEST 2010 isis-fish (3.3.0.3) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-21 16:21:17 UTC (rev 3084) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-22 07:07:38 UTC (rev 3085) @@ -113,7 +113,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 4); + protected final static Version version = new Version(3, 3, 0, 5); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version(

1 0

r3084 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:17 +0000 (Wed, 21 Jul 2010) New Revision: 3084 Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-21 16:21:14 UTC (rev 3083) +++ isis-fish/trunk/pom.xml 2010-07-21 16:21:17 UTC (rev 3084) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.4</version> + <version>3.3.0.5-SNAPSHOT</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> </scm> <repositories>

1 0

r3083 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:14 +0000 (Wed, 21 Jul 2010) New Revision: 3083 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.4 Added: isis-fish/tags/isis-fish-3.3.0.4/

1 0

r3082 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 16:21:07 +0000 (Wed, 21 Jul 2010) New Revision: 3082 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.4 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-21 15:51:10 UTC (rev 3081) +++ isis-fish/trunk/pom.xml 2010-07-21 16:21:07 UTC (rev 3082) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.4-SNAPSHOT</version> + <version>3.3.0.4</version>  <dependencies> @@ -657,9 +657,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.4</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3081 - in isis-fish/trunk/src: . license
by chatellier＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: chatellier Date: 2010-07-21 15:51:10 +0000 (Wed, 21 Jul 2010) New Revision: 3081 Log: Add thrid party licenses Added: isis-fish/trunk/src/license/ isis-fish/trunk/src/license/THIRD-PARTY.properties Added: isis-fish/trunk/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/trunk/src/license/THIRD-PARTY.properties (rev 0) +++ isis-fish/trunk/src/license/THIRD-PARTY.properties 2010-07-21 15:51:10 UTC (rev 3081) @@ -0,0 +1,58 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BBN Technologies +# - BSD License +# - BSD licence +# - BSD-style license +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License +# - GPL +# - LGPL +# - Lesser General Public License (LGPL) +# - MIT License +# - Mozilla Public License 1.1 (MPL 1.1) +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The OpenSymphony Software License 1.1 +# - dom4j +# - http://sqljet.com/ +# - http://svnkit.com/license.html +# - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Jul 21 15:09:24 CEST 2010 +aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License +com.ibm.icu--icu4j--2.6.1=ICU License +com.sun--tools--1.6.0.16=Sun's Binary Code License +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.help--javahelp--2.0.02=GNU General Public License - Version 2 +javax.transaction--jta--1.1=Java Transaction API (JTA) License +jaxen--jaxen--1.1.1=Jaxen license +jdom--jdom--1.0=JDom license +jgoodies--looks--1.2.2=JGoodies license +jrexx--jrexx--1.1.1=Apache Software License +net.java.dev.jna--jna--3.2.3=GNU Lesser General Public License +opensymphony--ognl--2.6.11=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.nuiton.thirdparty--JRI--0.8-0=GNU Lesser General Public License +org.nuiton.thirdparty--REngine--0.6-0=GPL v2 +org.nuiton.thirdparty--Rserve--0.6-0=GPL v2 +org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--l2fprod-common--0.1=Apache Software License +org.nuiton.thirdparty--rsyntaxtextarea--1.4.0=GNU Lesser General Public License +qdox--qdox--1.4=Apache Software License, Version 2.0 +trove--trove--1.0.2=Lesser General Public License (LGPL) +xalan--xalan--2.6.0=Apache Software License Version 2.0 +xerces--xmlParserAPIs--2.6.2=Apache Software License, Version 1.1

1 0

r3080 - in isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by bleny＠users.labs.libre-entreprise.org 21 Jul '10

21 Jul '10

Author: bleny Date: 2010-07-21 08:39:56 +0000 (Wed, 21 Jul 2010) New Revision: 3080 Log: fermeture de diswork ?\195?\160 la fermeture de isis Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-20 14:29:06 UTC (rev 3079) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-21 08:39:56 UTC (rev 3080) @@ -296,7 +296,6 @@ try { config.doAction(IsisConfig.STEP_BEFORE_EXIT); - // XXX 20100720 bleny is this the good way to proceed ? DisworkSimulatorLauncher.close(); } catch (Exception eee) { Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-20 14:29:06 UTC (rev 3079) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-21 08:39:56 UTC (rev 3080) @@ -38,8 +38,11 @@ private static final Log log = LogFactory.getLog(DisworkSimulatorLauncher.class); + protected static final String ISIS_APPLICATION_NAME = "isis-fish"; + protected static DisworkDaemon disworkDaemon; + /** for each job id, the corresponding job description */ protected static Map<String, JobDescription> jobs = new HashMap<String, JobDescription>(); @@ -63,7 +66,7 @@ } try { synchronized (jobs) { - for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { + for (JobDescription job : disworkDaemon.getAllJobs(ISIS_APPLICATION_NAME)) { jobs.put(job.getJobName(), job); } } @@ -80,7 +83,9 @@ try { log.info("submitting isis-fish " + isisVersion + " to diswork"); URL url = new URL("http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-3.3.…"); - getDaemon().submitApplication("isis-fish", isisVersion, url.openStream()); + getDaemon().submitApplication(ISIS_APPLICATION_NAME, + isisVersion, + url.openStream()); } catch (MalformedURLException e) { // hardcoded URL cannot be malformed } catch (DisworkException e) { @@ -104,7 +109,7 @@ simulationItem.getControl().setText("uploading isis " + isisVersion); submitIsisApplication(isisVersion); - jobDescription.setApplication("isis-fish", isisVersion); + jobDescription.setApplication(ISIS_APPLICATION_NAME, isisVersion); InputStream simulationZipData; try { @@ -120,7 +125,7 @@ String resultZipName = "simulation-" + simulationId + "-result.zip"; jobDescription.addOutput(resultZipName); - String isisJarPath = "isis-fish-" + isisVersion + "/isis-fish-" + + String isisJarPath = "isis-fish-" + isisVersion + "%sep" + "isis-fish-" + isisVersion + ".jar"; String commandLine = "%java -Xmx2500M -jar" + " " + isisJarPath @@ -139,7 +144,7 @@ jobDescription.addOutput(standardOutputName); jobs.put(simulationId, jobDescription); - + try { log.info("submitting job " + jobDescription.toJSDL()); simulationItem.getControl().setText("submitting job"); @@ -203,7 +208,8 @@ IOUtils.closeQuietly(out); } - return new File(SimulationStorage.getSimulationDirectory() + File.separator + jobDescription.getJobName()); + return new File(SimulationStorage.getSimulationDirectory() + + File.separator + jobDescription.getJobName()); } @Override @@ -248,7 +254,9 @@ /** must be called when IsisFish is being closed */ public static void close() throws DisworkException { - disworkDaemon.close(); + if (getDaemon() != null) { + getDaemon().close(); + } } }

1 0

r3079 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 20 Jul '10

20 Jul '10

Author: chatellier Date: 2010-07-20 14:29:06 +0000 (Tue, 20 Jul 2010) New Revision: 3079 Log: Relocate isis to fr.ifremer. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-07-20 14:16:11 UTC (rev 3078) +++ isis-fish/trunk/pom.xml 2010-07-20 14:29:06 UTC (rev 3079) @@ -5,10 +5,10 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.1.5</version> + <version>2.2.2.1</version> </parent> - <groupId>ifremer</groupId> + <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> <version>3.3.0.4-SNAPSHOT</version> @@ -171,7 +171,7 @@ </dependency> <dependency> - <groupId>openmap</groupId> + <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> <version>4.6.5</version> <scope>compile</scope> @@ -653,38 +653,17 @@ </plugins> </build> -  -    <scm> <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> </scm> <repositories> <repository> - <id>labs.repository</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </repository> - <repository> <id>javanet.repository</id> <url>http://download.java.net/maven/2/</url> </repository> @@ -700,10 +679,6 @@ <pluginRepositories> <pluginRepository> - <id>labs.plugin.repository</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </pluginRepository> - <pluginRepository> <id>nuiton.plugin.release</id> <url>http://maven.nuiton.org/release</url> </pluginRepository> @@ -713,17 +688,6 @@ </pluginRepository> </pluginRepositories> - <distributionManagement> - <repository> - <id>labs</id> - <url>scpexe://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> - </repository> - <site> - <id>labs</id> - <url>scpexe://labs.libre-entreprise.org/home/groups/isis-fish/htdocs/isis-fish</url> - </site> - </distributionManagement> - <profiles>

1 0

r3078 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher resources/i18n
by bleny＠users.labs.libre-entreprise.org 20 Jul '10

20 Jul '10

Author: bleny Date: 2010-07-20 14:16:11 +0000 (Tue, 20 Jul 2010) New Revision: 3078 Log: i18n, config, fermeture de diswork a la fermeture de isis Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-09 12:49:03 UTC (rev 3077) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-20 14:16:11 UTC (rev 3078) @@ -103,7 +103,7 @@ * <li>l: le numero de version du logiciel * <li>d: le numero de version du schema de la base de donnees * <li>a: le numero de version de l'api des scripts - * <li>r: le numero de version de de l'interface graphique ou autre modif mineur + * <li>r: le numero de version de l'interface graphique ou autre modif mineur * <p> * lors de l'increment de l, d, a et r sont remis a 0 * lors de l'increment de d, a et r sont remis a 0 Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-09 12:49:03 UTC (rev 3077) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-07-20 14:16:11 UTC (rev 3078) @@ -65,6 +65,7 @@ import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import fr.ifremer.isisfish.simulator.launcher.DisworkSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.types.Month; @@ -294,6 +295,10 @@ public void run() { try { config.doAction(IsisConfig.STEP_BEFORE_EXIT); + + // XXX 20100720 bleny is this the good way to proceed ? + DisworkSimulatorLauncher.close(); + } catch (Exception eee) { log.info("Error in quit daemon", eee); } Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 12:49:03 UTC (rev 3077) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-20 14:16:11 UTC (rev 3078) @@ -48,24 +48,18 @@ protected synchronized static DisworkDaemon getDaemon() { if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); - String bootStrapIp = IsisFish.config.getDisworkBootstrapIp(); - // if (!"".equals(bootStrapIp)) { - config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); - config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); - config.setUsedPort(IsisFish.config.getDisworkPort()); - - - config.setActivityStrategy("none"); - config.setHttpFrontendPort(8081); - try { - disworkDaemon = new DisworkDaemon(config); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); - } -// } else { -// log.info("diswork not started, no bootstrap ip specified"); -// } + config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); + config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); + config.setUsedPort(IsisFish.config.getDisworkPort()); + + config.setActivityStrategy("unlimited"); + config.setHttpFrontendPort(8081); + try { + disworkDaemon = new DisworkDaemon(config); + } catch (DisworkException e) { + log.error("unable to boot diswork FS"); + throw new RuntimeException("unable to boot diswork FS", e); + } } try { synchronized (jobs) { @@ -99,8 +93,6 @@ @Override public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { - - //TODO 20100706 use simulationItem.getControl().setText(_("")); JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); @@ -253,5 +245,10 @@ public String toString() { return _("isisfish.simulator.launcher.diswork"); } + + /** must be called when IsisFish is being closed */ + public static void close() throws DisworkException { + disworkDaemon.close(); + } } Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties 2010-07-09 12:49:03 UTC (rev 3077) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties 2010-07-20 14:16:11 UTC (rev 3078) @@ -140,8 +140,8 @@ isisfish.common.warn=warn isisfish.common.year=year isisfish.common.zone=Zone -isisfish.config.category.diswork= -isisfish.config.category.diswork.description= +isisfish.config.category.diswork=Diswork +isisfish.config.category.diswork.description=Distributed computing set-up isisfish.config.category.main=Main isisfish.config.category.main.description=Main configuration isisfish.config.category.misc=Misc @@ -157,7 +157,7 @@ isisfish.config.main.defaultResultNames.description=Result names to manage during a simulation isisfish.config.main.defaultSimulator.description=Default simulator to use to simulate isisfish.config.main.defaultTagValue.description= -isisfish.config.main.disworkSimulator.description=Diswork +isisfish.config.main.disworkSimulator.description=Distributed computing system set-up isisfish.config.main.encoding.description=encoding used on system isisfish.config.main.javadocDirectory.description=Javadoc generation directory isisfish.config.main.javadocURL.description=Javadoc url @@ -169,6 +169,9 @@ 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.simulation.diswork.bootstrap.ip.description=An IP address of a machine which is already running Diswork +isisfish.config.main.simulation.diswork.bootstrap.port.description=The port on which the bootstrap node run diswork +isisfish.config.main.simulation.diswork.port.description=The port to use locally isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) isisfish.config.main.simulation.ssh.datapath=Isis-Fish database @@ -938,7 +941,7 @@ isisfish.simulation.remote.message.waitingstart=Waiting for simulation start isisfish.simulation.restarting=Restarting... isisfish.simulation.title=Simulation launcher -isisfish.simulator.launcher.diswork= +isisfish.simulator.launcher.diswork=on Diswork distributed computing system isisfish.simulator.launcher.inprocess=in current process isisfish.simulator.launcher.remote=on Caparmor server isisfish.simulator.launcher.subprocess=in subprocess Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-07-09 12:49:03 UTC (rev 3077) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-07-20 14:16:11 UTC (rev 3078) @@ -140,8 +140,8 @@ isisfish.common.warn=Warning isisfish.common.year=ann\u00E9e isisfish.common.zone=Zone -isisfish.config.category.diswork= -isisfish.config.category.diswork.description= +isisfish.config.category.diswork=Diswork +isisfish.config.category.diswork.description=R\u00E9glage du syst\u00E8me de calcul r\u00E9parti isisfish.config.category.main=Globale isisfish.config.category.main.description=Configuration globale isisfish.config.category.misc=Divers @@ -169,6 +169,9 @@ isisfish.config.main.performmigration.description=Migre les donn\u00E9es isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante +isisfish.config.main.simulation.diswork.bootstrap.ip.description=IP d'une machine bootstrap (nimporte-qu'elle machine avec Diswork en marche) +isisfish.config.main.simulation.diswork.bootstrap.port.description=Port de la machine bootstrap +isisfish.config.main.simulation.diswork.port.description=Le port que diswork doit utiliser sur la machine locale isisfish.config.main.simulation.ssh.control.check.interval=V\u00E9rification de la progression (secondes) isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux v\u00E9rifications de progression isisfish.config.main.simulation.ssh.datapath=Base de donn\u00E9es @@ -938,7 +941,7 @@ isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation isisfish.simulation.restarting=Red\u00E9marrage... isisfish.simulation.title=Lanceur de simulation -isisfish.simulator.launcher.diswork= +isisfish.simulator.launcher.diswork=sur le syst\u00E8me de calcul r\u00E9parti Diswork isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus isisfish.simulator.launcher.remote=sur le serveur Caparmor isisfish.simulator.launcher.subprocess=dans un sous processus

1 0

r3077 - in isis-fish/branches/3.3.0.4-disworksupport/src/main: java/fr/ifremer/isisfish/simulator/launcher resources/i18n
by bleny＠users.labs.libre-entreprise.org 09 Jul '10

09 Jul '10

Author: bleny Date: 2010-07-09 12:49:03 +0000 (Fri, 09 Jul 2010) New Revision: 3077 Log: bidouille :-( Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 12:21:57 UTC (rev 3076) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 12:49:03 UTC (rev 3077) @@ -43,15 +43,13 @@ protected static Map<String, JobDescription> jobs = new HashMap<String, JobDescription>(); - public DisworkSimulatorLauncher() {} - - protected synchronized DisworkDaemon getDaemon() { + protected synchronized static DisworkDaemon getDaemon() { if (disworkDaemon == null) { DisworkConfig config = new DisworkConfig(); String bootStrapIp = IsisFish.config.getDisworkBootstrapIp(); - if (!"".equals(bootStrapIp)) { + // if (!"".equals(bootStrapIp)) { config.setBootstrapIp(IsisFish.config.getDisworkBootstrapIp()); config.setBootstrapPort(IsisFish.config.getDisworkBootstrapPort()); config.setUsedPort(IsisFish.config.getDisworkPort()); @@ -65,14 +63,14 @@ log.error("unable to boot diswork FS"); throw new RuntimeException("unable to boot diswork FS", e); } - } else { - log.info("diswork not started, no bootstrap ip specified"); - } +// } else { +// log.info("diswork not started, no bootstrap ip specified"); +// } } try { synchronized (jobs) { for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { - // jobs.put(job.getJobName(), job); + jobs.put(job.getJobName(), job); } } log.info(jobs.size() + "jobs retrieved from diswork"); @@ -204,7 +202,7 @@ ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); } } - getDaemon().deleteJob(jobDescription); + // getDaemon().deleteJob(jobDescription); FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties 2010-07-09 12:21:57 UTC (rev 3076) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties 2010-07-09 12:49:03 UTC (rev 3077) @@ -938,6 +938,7 @@ isisfish.simulation.remote.message.waitingstart=Waiting for simulation start isisfish.simulation.restarting=Restarting... isisfish.simulation.title=Simulation launcher +isisfish.simulator.launcher.diswork= isisfish.simulator.launcher.inprocess=in current process isisfish.simulator.launcher.remote=on Caparmor server isisfish.simulator.launcher.subprocess=in subprocess Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-07-09 12:21:57 UTC (rev 3076) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-07-09 12:49:03 UTC (rev 3077) @@ -938,6 +938,7 @@ isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation isisfish.simulation.restarting=Red\u00E9marrage... isisfish.simulation.title=Lanceur de simulation +isisfish.simulator.launcher.diswork= isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus isisfish.simulator.launcher.remote=sur le serveur Caparmor isisfish.simulator.launcher.subprocess=dans un sous processus

1 0