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