Author: bleny Date: 2010-07-09 11:15:51 +0000 (Fri, 09 Jul 2010) New Revision: 3075 Log: abandon de job, configuration de diswork, int?\195?\169gration de la configuration dans l'ihm 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/simulator/launcher/DisworkSimulatorLauncher.java isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 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-05 12:34:19 UTC (rev 3074) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-07-09 11:15:51 UTC (rev 3075) @@ -608,7 +608,31 @@ boolean result = !VCSNone.TYPE_NONE.equals(value); return result; }*/ + + public int getDisworkPort() { + return getOptionAsInt(Option.SIMULATOR_DISWORK_PORT.key); + } + public void setDisworkPort(Integer port) { + setOption(Option.SIMULATOR_DISWORK_PORT.key, port.toString()); + } + + public int getDisworkBootstrapPort() { + return getOptionAsInt(Option.SIMULATOR_DISWORK_BOOTSTRAP_PORT.key); + } + + public void setDisworkBootstrapPort(Integer port) { + setOption(Option.SIMULATOR_DISWORK_BOOTSTRAP_PORT.key, port.toString()); + } + + public String getDisworkBootstrapIp() { + return getOption(Option.SIMULATOR_DISWORK_BOOTSTRAP_IP.key); + } + + public void setDisworkBootstrapPort(String ip) { + setOption(Option.SIMULATOR_DISWORK_BOOTSTRAP_IP.key, ip); + } + /** * Get launch.ui option value. * @@ -992,6 +1016,10 @@ /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + SIMULATOR_DISWORK_BOOTSTRAP_IP("simulation.diswork.bootstrap.ip", _("isisfish.config.main.simulation.diswork.bootstrap.ip.description"), ""), + SIMULATOR_DISWORK_BOOTSTRAP_PORT("simulation.diswork.bootstrap.port", _("isisfish.config.main.simulation.diswork.bootstrap.port.description"), "19000"), + SIMULATOR_DISWORK_PORT("simulation.diswork.port", _("isisfish.config.main.simulation.diswork.port.description"), "19000"), + /** Application locale (for i18n init). */ LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), 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-05 12:34:19 UTC (rev 3074) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/simulator/launcher/DisworkSimulatorLauncher.java 2010-07-09 11:15:51 UTC (rev 3075) @@ -25,6 +25,7 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -45,24 +46,32 @@ public DisworkSimulatorLauncher() { if (disworkDaemon == null) { + DisworkConfig config = new DisworkConfig(); - config.setBootstrapIp("192.168.99.119"); - config.setBootstrapPort(19002); - config.setActivityStrategy("none"); - config.setUsedPort(31000); - try { - disworkDaemon = new DisworkDaemon(config); - } catch (DisworkException e) { - log.error("unable to boot diswork FS"); - throw new RuntimeException("unable to boot diswork FS", e); + 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"); } } try { - for (JobDescription job : disworkDaemon.getAllJobs()) { + for (JobDescription job : disworkDaemon.getAllJobs("isis-fish")) { jobs.put(job.getJobName(), job); } - // FIXME 20100702 bleny daemon may contains not only isis-jobs log.info(jobs.size() + "jobs retrieved from diswork"); } catch (DisworkException e) { log.error("unable to boot diswork FS"); @@ -90,6 +99,7 @@ public void simulate(SimulationService simulationService, SimulationItem simulationItem) throws RemoteException { + //TODO 20100706 use simulationItem.getControl().setText(_("")); JobDescription jobDescription = new JobDescription(); String simulationId = simulationItem.getControl().getId(); @@ -99,6 +109,7 @@ // String isisVersion = simulationItem.getParameter().getIsisFishVersion(); String isisVersion = "3.3.0.4-SNAPSHOT"; + simulationItem.getControl().setText("uploading isis " + isisVersion); submitIsisApplication(isisVersion); jobDescription.setApplication("isis-fish", isisVersion); @@ -133,12 +144,14 @@ String standardOutputName = "simulation-" + simulationId + "-output.txt"; jobDescription.setStandardOutput(standardOutputName); jobDescription.addOutput(standardOutputName); - + jobs.put(simulationId, jobDescription); try { log.info("submitting job " + jobDescription.toJSDL()); + simulationItem.getControl().setText("submitting job"); disworkDaemon.submitJob(jobDescription); + simulationItem.getControl().setText("job submitted"); } catch (DisworkException e) { log.error("error while submiting job to diswork", e); throw new RemoteException("error while submiting job to diswork", e); @@ -179,7 +192,7 @@ for (String fileName : results.keySet()) { File localFile = new File(tempDir, fileName); localFile.deleteOnExit(); - log.debug("Downloading results in " + localFile.getAbsolutePath()); + log.debug("downloading results in " + localFile.getAbsolutePath()); out = new FileOutputStream(localFile); // copy data from diswork to local FS IOUtils.copy(results.get(fileName), out); @@ -188,7 +201,7 @@ ZipUtil.uncompress(localFile, SimulationStorage.getSimulationDirectory()); } } - + disworkDaemon.deleteJob(jobDescription); FileUtil.deleteRecursively(tempDir); } catch (IOException e) { log.error("unable to write results on the local FS", e); @@ -224,8 +237,12 @@ @Override public void simulationStopRequest(SimulationJob job) throws RemoteException { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("not yet implemented"); + try { + disworkDaemon.deleteJob(jobs.get(job.getId())); + } catch (DisworkException e) { + log.error("error while trying to delete a job", e); + throw new RemoteException("error while trying to delete a job", e); + } } /** Modified: isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2010-07-05 12:34:19 UTC (rev 3074) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2010-07-09 11:15:51 UTC (rev 3075) @@ -130,6 +130,15 @@ IsisConfig.Option.VCS_HOST_NAME, IsisConfig.Option.VCS_PATH ); + + // categorie diswork + model.addCategory( + _("isisfish.config.category.diswork"), + _("isisfish.config.category.diswork.description"), + IsisConfig.Option.SIMULATOR_DISWORK_PORT, + IsisConfig.Option.SIMULATOR_DISWORK_BOOTSTRAP_IP, + IsisConfig.Option.SIMULATOR_DISWORK_BOOTSTRAP_PORT + ); // categorie misc model.addCategory( 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-05 12:34:19 UTC (rev 3074) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-en_GB.properties 2010-07-09 11:15:51 UTC (rev 3075) @@ -140,6 +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.main=Main isisfish.config.category.main.description=Main configuration isisfish.config.category.misc=Misc 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-05 12:34:19 UTC (rev 3074) +++ isis-fish/branches/3.3.0.4-disworksupport/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-07-09 11:15:51 UTC (rev 3075) @@ -140,6 +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.main=Globale isisfish.config.category.main.description=Configuration globale isisfish.config.category.misc=Divers