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

r3029 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 26 Apr '10

26 Apr '10

Author: chatellier Date: 2010-04-26 14:41:07 +0000 (Mon, 26 Apr 2010) New Revision: 3029 Log: Add frame centering Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2010-04-23 16:26:42 UTC (rev 3028) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2010-04-26 14:41:07 UTC (rev 3029) @@ -84,8 +84,8 @@ */ protected void createGroups() { - int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), _("isisfish.common.confirm"), - JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), + _("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { JFrame wizardFrame = new JFrame(); @@ -101,6 +101,7 @@ wizard.setCard("beginGroupLength"); } wizardFrame.pack(); + wizardFrame.setLocationRelativeTo(this); wizardFrame.setVisible(true); //refresh(); }

1 0

r3028 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 23 Apr '10

23 Apr '10

Author: chatellier Date: 2010-04-23 16:26:42 +0000 (Fri, 23 Apr 2010) New Revision: 3028 Log: Encode accent Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-04-23 16:24:09 UTC (rev 3027) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-04-23 16:26:42 UTC (rev 3028) @@ -179,7 +179,7 @@ isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur isisfish.config.main.simulation.ssh.pbsqsuboptions=Arguments qsub -isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments utilisés lors de la soumission des jobs. Par d\u00E9faut '-m n' pas d'envoi de mails. +isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments utilis\u00E9s lors de la soumission des jobs. Par d\u00E9faut '-m n' pas d'envoi de mails. isisfish.config.main.simulation.ssh.server=Serveur de simulation isisfish.config.main.simulation.ssh.server.description=Adresse du serveur de simulation isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier (laisser vide pour utiliser directement scp sur le serveur de simulation)

1 0

r3027 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/ui/config src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 23 Apr '10

23 Apr '10

Author: chatellier Date: 2010-04-23 16:24:09 +0000 (Fri, 23 Apr 2010) New Revision: 3027 Log: Add new option to customize qsub options Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/changelog.txt 2010-04-23 16:24:09 UTC (rev 3027) @@ -1,5 +1,6 @@ isis-fish (3.3.0.3) stable; urgency=low + * Add new option to customize qsub options * Update libs (log4j, junit) * Fix first age use in group creation wizard Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-04-23 16:24:09 UTC (rev 3027) @@ -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, 2); + protected final static Version version = new Version(3, 3, 0, 3); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version( @@ -504,6 +504,27 @@ } /** + * PBS qsub options (command line). + * + * See man qsub for available options. + * + * @return options + */ + public String getSimulatorSshPbsQsubOptions() { + String result = getOption(Option.SIMULATOR_SSH_PBSQSUBOPTIONS.key); + return result; + } + + /** + * Change PBS qsub options (command line). + * + * @param options new options + */ + public void setSimulatorSshPbsQsubOptions(String options) { + setOption(Option.SIMULATOR_SSH_PBSQSUBOPTIONS.key, options); + } + + /** * Java path directory. * * @return path @@ -958,6 +979,8 @@ SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", _("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", _("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), /** Serveur accessible par SSH : interval de check du fichier de control */ SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2010-04-23 16:24:09 UTC (rev 3027) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008, 2009 Ifremer, Code Lutin + * Copyright (C) 2008, 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1142,10 +1142,15 @@ // command to : // - add script in qsub queue - // - use option -m n (to not send email) String remoteFilenameId = getRemoteTempDirectory() + "simulation-" + simulationId + "-pbs.id"; - String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qsub -m n"; + String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qsub"; + // add qsub options + String qsubOptions = IsisFish.config.getSimulatorSshPbsQsubOptions(); + if (StringUtils.isNotEmpty(qsubOptions)) { + command += " " + qsubOptions; + } + // multi job specific if (lastSimulationNumber >=0 ) { command+= " -J 0-" + String.valueOf(lastSimulationNumber); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2010-04-23 16:24:09 UTC (rev 3027) @@ -71,6 +71,7 @@ protected String currentSSHTempPath; protected String currentSSHJavaPath; protected String currentSSHPbsBinPath; + protected String currentSSHPbsQsubOptions; protected String currentSSHMaxThreads; protected String currentSSHControlInterval; @@ -99,6 +100,7 @@ configUI.getSshTemppathField().setText(IsisFish.config.getSimulatorSshTmpPath()); configUI.getSshJavaPathField().setText(IsisFish.config.getSimulatorSshJavaPath()); configUI.getSshPbsBinPathField().setText(IsisFish.config.getSimulatorSshPbsBinPath()); + configUI.getSshPbsQsubOptionsField().setText(IsisFish.config.getSimulatorSshPbsQsubOptions()); configUI.getSshControlIntervalField().setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); configUI.getSshMaxThreadsField().setText(String.valueOf(IsisFish.config.getSimulatorSshMaxThreads())); @@ -189,6 +191,9 @@ setColor(false, configUI.getSshPbsBinPathField()); } + // currentSSHPbsQsubOptions + currentSSHPbsQsubOptions = configUI.getSshPbsQsubOptionsField().getText().trim(); + // currentSSHMaxThreads currentSSHMaxThreads = configUI.getSshMaxThreadsField().getText().trim(); if (!currentSSHMaxThreads.matches("\\d+")) { @@ -222,6 +227,7 @@ IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); IsisFish.config.setSimulatorSshJavaPath(currentSSHJavaPath); IsisFish.config.setSimulatorSshPbsBinPath(currentSSHPbsBinPath); + IsisFish.config.setSimulatorSshPbsQsubOptions(currentSSHPbsQsubOptions); IsisFish.config.setSimulatorSshControlCheckInterval(Integer.parseInt(currentSSHControlInterval)); IsisFish.config.setSimulatorSshMaxThreads(Integer.parseInt(currentSSHMaxThreads)); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2010-04-23 16:24:09 UTC (rev 3027) @@ -128,6 +128,17 @@ </row> <row fill='horizontal'> <cell> + <JLabel id='sshPbsQsubOptionsLabel' text='isisfish.config.main.simulation.ssh.pbsqsuboptions' + toolTipText='isisfish.config.main.simulation.ssh.pbsqsuboptions.description' /> + </cell> + <cell> + <JTextField id='sshPbsQsubOptionsField' + toolTipText='isisfish.config.main.simulation.ssh.pbsqsuboptions.description' + onKeyReleased="getAction().doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> <JLabel id='sshMaxThreadsLabel' text='isisfish.config.main.simulation.ssh.max.threads' toolTipText='isisfish.config.main.simulation.ssh.max.threads.description' /> </cell> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-04-23 16:24:09 UTC (rev 3027) @@ -178,6 +178,8 @@ isisfish.config.main.simulation.ssh.max.threads.description=Number of simultaneous simulations to do through SSH. Might only be usefull for dependent analysis plans. Otherwise keep value at '1'. isisfish.config.main.simulation.ssh.pbsbinpath=PBS executables directory isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory +isisfish.config.main.simulation.ssh.pbsqsuboptions=Qsub arguments +isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments used at qsub job sumbit. Default to '-m n' don't send mail. isisfish.config.main.simulation.ssh.server=Simulation server isisfish.config.main.simulation.ssh.server.description=Simulation server address isisfish.config.main.simulation.ssh.sftpserver.description=Transfer server address (set empty to use scp from simulation server) Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-04-21 16:44:36 UTC (rev 3026) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-04-23 16:24:09 UTC (rev 3027) @@ -178,6 +178,8 @@ isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultan\u00E9e \u00E0 faire en SSH. Attention, ne doit \u00EAtre utilis\u00E9 que pour faire plusieurs plans d'analyse d\u00E9pendants en m\u00EAme temps, sinon laisser '1'. isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur +isisfish.config.main.simulation.ssh.pbsqsuboptions=Arguments qsub +isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments utilisés lors de la soumission des jobs. Par d\u00E9faut '-m n' pas d'envoi de mails. isisfish.config.main.simulation.ssh.server=Serveur de simulation isisfish.config.main.simulation.ssh.server.description=Adresse du serveur de simulation isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier (laisser vide pour utiliser directement scp sur le serveur de simulation)

1 0

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

21 Apr '10

Author: chatellier Date: 2010-04-21 16:44:36 +0000 (Wed, 21 Apr 2010) New Revision: 3026 Log: Update log4j. Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-21 16:38:24 UTC (rev 3025) +++ isis-fish/trunk/changelog.txt 2010-04-21 16:44:36 UTC (rev 3026) @@ -1,4 +1,6 @@ isis-fish (3.3.0.3) stable; urgency=low + + * Update libs (log4j, junit) * Fix first age use in group creation wizard -- mer. avril 21 18:28:46 CEST 2010 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-04-21 16:38:24 UTC (rev 3025) +++ isis-fish/trunk/pom.xml 2010-04-21 16:44:36 UTC (rev 3026) @@ -133,7 +133,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> <scope>compile</scope> </dependency>

1 0

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

21 Apr '10

Author: chatellier Date: 2010-04-21 16:38:24 +0000 (Wed, 21 Apr 2010) New Revision: 3025 Log: Uddate junit Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-04-21 16:19:49 UTC (rev 3024) +++ isis-fish/trunk/pom.xml 2010-04-21 16:38:24 UTC (rev 3025) @@ -324,7 +324,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>4.8.1</version> <scope>test</scope> </dependency> </dependencies>

1 0

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

21 Apr '10

Author: chatellier Date: 2010-04-21 16:19:49 +0000 (Wed, 21 Apr 2010) New Revision: 3024 Log: L'assitant de creation des groupes ne prenait pas en compte l'age de d?\195?\169part. Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-21 16:14:49 UTC (rev 3023) +++ isis-fish/trunk/changelog.txt 2010-04-21 16:19:49 UTC (rev 3024) @@ -1,3 +1,8 @@ +isis-fish (3.3.0.3) stable; urgency=low + * Fix first age use in group creation wizard + + -- mer. avril 21 18:28:46 CEST 2010 + isis-fish (3.3.0.2) stable; urgency=low * Fix a NPE when reloading in process simulation

1 0

r3023 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 21 Apr '10

21 Apr '10

Author: chatellier Date: 2010-04-21 16:14:49 +0000 (Wed, 21 Apr 2010) New Revision: 3023 Log: L'assitant de creation des groupes ne prenait pas en compte l'age de d?\195?\169part. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2010-04-07 09:09:00 UTC (rev 3022) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2010-04-21 16:14:49 UTC (rev 3023) @@ -420,7 +420,7 @@ <JLabel text="isisfish.wizardGroupCreation.firstAge"/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="firstAge" onFocusLost=''/> + <JTextField id="firstAge" onFocusLost='firstAgeChanged()'/> </cell> </row> <row>

1 0

r3022 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 09:09:00 +0000 (Wed, 07 Apr 2010) New Revision: 3022 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-04-07 09:08:57 UTC (rev 3021) +++ isis-fish/trunk/pom.xml 2010-04-07 09:09:00 UTC (rev 3022) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.2</version> + <version>3.3.0.3-SNAPSHOT</version>  <dependencies> @@ -683,9 +683,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.2</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.2</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

r3021 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 09:08:57 +0000 (Wed, 07 Apr 2010) New Revision: 3021 Added: isis-fish/tags/isis-fish-3.3.0.2/ Log: [maven-scm] copy for tag isis-fish-3.3.0.2

1 0

r3020 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 09:08:52 +0000 (Wed, 07 Apr 2010) New Revision: 3020 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.3.0.2 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-04-07 08:53:23 UTC (rev 3019) +++ isis-fish/trunk/pom.xml 2010-04-07 09:08:52 UTC (rev 3020) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.2-SNAPSHOT</version> + <version>3.3.0.2</version>  <dependencies> @@ -683,9 +683,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.2</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.2</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0