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.0..."); - 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(); + } } }