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