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

r3009 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 30 Mar '10

30 Mar '10

Author: chatellier Date: 2010-03-30 10:09:59 +0000 (Tue, 30 Mar 2010) New Revision: 3009 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.3.0.1 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-03-30 09:24:33 UTC (rev 3008) +++ isis-fish/trunk/pom.xml 2010-03-30 10:09:59 UTC (rev 3009) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.1-SNAPSHOT</version> + <version>3.3.0.1</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.1</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.1</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3008 - 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 src/main/resources/templates/ssh src/test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 30 Mar '10

30 Mar '10

Author: chatellier Date: 2010-03-30 09:24:33 +0000 (Tue, 30 Mar 2010) New Revision: 3008 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 isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Make java path configurable on cluster server (caparmor & noumea) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/changelog.txt 2010-03-30 09:24:33 UTC (rev 3008) @@ -1,3 +1,9 @@ +isis-fish (3.3.0.1) stable; urgency=low + + * Make java path configurable on cluster server (caparmor & noumea) + + -- mar. mars 30 10:37:48 CEST 2010 + isis-fish (3.3.0.0) stable; urgency=low * Replace zone selection event from mouse click to correct valueChanged Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-03-30 09:24:33 UTC (rev 3008) @@ -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, 0); + protected final static Version version = new Version(3, 3, 0, 1); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version( @@ -386,27 +386,8 @@ public void setSimulatorSshServer(String sshServer) { setOption(Option.SIMULATOR_SSH_SERVER.key, sshServer); } - - /** - * Retourne l'url du service de tranfert de fichier. - * - * @return sftp server - */ - public String getSimulatorSshSftpServer() { - String result = getOption(Option.SIMULATOR_SSH_SFTP_SERVER.key); - return result; - } /** - * Change sftp server url value. - * - * @param sshSftpServer sftp server - */ - public void setSimulatorSshSftpServer(String sshSftpServer) { - setOption(Option.SIMULATOR_SSH_SFTP_SERVER.key, sshSftpServer); - } - - /** * Retourne le login pour acceder au serveur de simulation accessible via SSH. * * @return simulator username @@ -521,8 +502,27 @@ public void setSimulatorSshPbsBinPath(String path) { setOption(Option.SIMULATOR_SSH_PBSBINPATH.key, path); } + + /** + * Java path directory. + * + * @return path + */ + public String getSimulatorSshJavaPath() { + String result = getOption(Option.SIMULATOR_SSH_JAVAPATH.key); + return result; + } /** + * Change Java bin path. + * + * @param path new path + */ + public void setSimulatorSshJavaPath(String path) { + setOption(Option.SIMULATOR_SSH_JAVAPATH.key, path); + } + + /** * Retourne l'interval de temps a utiliser * pour recuperer le fichier de control. * @@ -944,8 +944,6 @@ /** Serveur accessible par ssh : address */ SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), - /** Serveur accessible par ssh : nom du service de transfert de fichier */ - SIMULATOR_SSH_SFTP_SERVER("simulation.ssh.sftpserver", _("isisfish.config.main.simulation.ssh.sftpserver.description"), "caparmor-sftp"), /** Serveur accessible par ssh : login */ SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ @@ -956,6 +954,8 @@ SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + /** Serveur accessible par SSH : emplacement de Java (full path) */ + 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 : interval de check du fichier de control */ 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-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2010-03-30 09:24:33 UTC (rev 3008) @@ -1102,6 +1102,7 @@ Map<String, Object> root = new HashMap<String, Object>(); root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("isistemp", getRemoteTempDirectory()); + root.put("javapath", IsisFish.config.getSimulatorSshJavaPath()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); root.put("simulationstandalonezip", standaloneZip); 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-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2010-03-30 09:24:33 UTC (rev 3008) @@ -63,13 +63,13 @@ protected SSHLauncherConfigUI configUI; protected String currentSSHserver; - //protected String currentSSHsftpServer; protected String currentSSHUsername; protected File currentSSHKey; protected String currentSSHUserhome; protected String currentSSHDatapath; protected String currentSSHIsisHome; protected String currentSSHTempPath; + protected String currentSSHJavaPath; protected String currentSSHPbsBinPath; protected String currentSSHMaxThreads; protected String currentSSHControlInterval; @@ -89,7 +89,6 @@ public void resetSSHConfiguration() { // server config configUI.getSshServerField().setText(IsisFish.config.getSimulatorSshServer()); - //configUI.getSshSftpServerField().setText(IsisFish.config.getSimulatorSshSftpServer()); configUI.getUsernameField().setText(IsisFish.config.getSimulatorSshUsername()); configUI.getSshKeyField().setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath()); @@ -98,6 +97,7 @@ configUI.getSshDatapathField().setText(IsisFish.config.getSimulatorSshDataPath()); configUI.getSshIsisHomeField().setText(IsisFish.config.getSimulatorSshIsisHome()); configUI.getSshTemppathField().setText(IsisFish.config.getSimulatorSshTmpPath()); + configUI.getSshJavaPathField().setText(IsisFish.config.getSimulatorSshJavaPath()); configUI.getSshPbsBinPathField().setText(IsisFish.config.getSimulatorSshPbsBinPath()); configUI.getSshControlIntervalField().setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); configUI.getSshMaxThreadsField().setText(String.valueOf(IsisFish.config.getSimulatorSshMaxThreads())); @@ -174,6 +174,13 @@ setColor(false, configUI.getSshTemppathField()); } + currentSSHJavaPath = configUI.getSshJavaPathField().getText().trim(); + if (currentSSHJavaPath.isEmpty()) { + setColor(true, configUI.getSshJavaPathField()); + } else { + setColor(false, configUI.getSshJavaPathField()); + } + currentSSHPbsBinPath = configUI.getSshPbsBinPathField().getText() .trim(); if (currentSSHPbsBinPath.isEmpty()) { @@ -213,6 +220,7 @@ IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath); IsisFish.config.setSimulatorSshIsisHome(currentSSHIsisHome); IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); + IsisFish.config.setSimulatorSshJavaPath(currentSSHJavaPath); IsisFish.config.setSimulatorSshPbsBinPath(currentSSHPbsBinPath); 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-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2010-03-30 09:24:33 UTC (rev 3008) @@ -40,16 +40,6 @@ onKeyReleased="getAction().doCheck()" /> </cell> </row> -  <row fill='horizontal'> <cell> <JLabel id='usernameLabel' text='isisfish.config.main.simulation.ssh.username' @@ -116,6 +106,17 @@ </row> <row fill='horizontal'> <cell> + <JLabel id='sshJavaPathLabel' text='isisfish.config.main.simulation.ssh.javapath' + toolTipText='isisfish.config.main.simulation.ssh.javapath.description' /> + </cell> + <cell> + <JTextField id='sshJavaPathField' + toolTipText='isisfish.config.main.simulation.ssh.javapath.description' + onKeyReleased="getAction().doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> <JLabel id='sshPbsBinPathLabel' text='isisfish.config.main.simulation.ssh.pbsbinpath' toolTipText='isisfish.config.main.simulation.ssh.pbsbinpath.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-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-03-30 09:24:33 UTC (rev 3008) @@ -172,6 +172,8 @@ isisfish.config.main.simulation.ssh.datapath.description=Isis-Fish database path isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory +isisfish.config.main.simulation.ssh.javapath=Java path +isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is caparmor configuration) isisfish.config.main.simulation.ssh.max.threads=SSH threads count 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 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-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-03-30 09:24:33 UTC (rev 3008) @@ -172,6 +172,8 @@ isisfish.config.main.simulation.ssh.datapath.description=Emplacement de la base de donn\u00E9es (isis-database) isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur +isisfish.config.main.simulation.ssh.javapath=Emplacement de java +isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par d\u00E9faut la valeur est celle de caparmor) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH 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 Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-03-30 09:24:33 UTC (rev 3008) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> +<#assign commonCommand="${javapath} -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' /> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-03-01 14:12:20 UTC (rev 3007) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-03-30 09:24:33 UTC (rev 3008) @@ -78,6 +78,7 @@ Assert.assertTrue("String \"" + simulationResultZip + "\" not found in template", content.indexOf(simulationResultZip) > 0); Assert.assertTrue("String \"" + simulationPreScript + "\" not found in template", content.indexOf(simulationPreScript) > 0); Assert.assertTrue("Action --simulateRemotellyWithPreScript not on script", content.indexOf(" --simulateRemotellyWithPreScript ") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); @@ -136,6 +137,8 @@ * * Le script contient plusieurs variables qui doivent être remplacées. * + * Also test configuration off remote Java path. + * * @throws IOException when freemarker throws it * @throws TemplateException when freemarker throws it */ @@ -143,6 +146,7 @@ public void testFreemarkerTemplateMultiJobs() throws IOException, TemplateException { + // some things to test ! String shortSimulationId = "sim_test1_2009-11-10-18-08"; String simulationId = shortSimulationId + "_122"; String simulationZip = "simulation-" + simulationId + "-preparation.zip"; @@ -150,6 +154,8 @@ String simulationPreScript = null; String isisHome = IsisFish.config.getSimulatorSshIsisHome(); String isisTemp = IsisFish.config.getSimulatorSshTmpPath(); + String javaPath = "/home1/noumea/cluster"; + IsisFish.config.setSimulatorSshJavaPath(javaPath); SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( @@ -166,6 +172,7 @@ Assert.assertTrue(content.indexOf("/tmp/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-result.zip") > 0); Assert.assertTrue("String " + isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\" not found in template", content.indexOf(isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\"") > 0); Assert.assertTrue("Action --simulateRemotelly not on script", content.indexOf(" --simulateRemotelly ") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf(javaPath) > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0);

1 0

r3007 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 01 Mar '10

01 Mar '10

Author: chatellier Date: 2010-03-01 14:12:20 +0000 (Mon, 01 Mar 2010) New Revision: 3007 Modified: isis-fish/trunk/pom.xml Log: Update commons-lang to 2.5 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-24 14:24:18 UTC (rev 3006) +++ isis-fish/trunk/pom.xml 2010-03-01 14:12:20 UTC (rev 3007) @@ -91,7 +91,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>compile</scope> </dependency>

1 0

r3006 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 14:24:18 +0000 (Wed, 24 Feb 2010) New Revision: 3006 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Modification de la valeur par defaut de l'installation caparmor (depend de la version d'isis) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-02-24 11:09:32 UTC (rev 3005) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-02-24 14:24:18 UTC (rev 3006) @@ -953,7 +953,7 @@ /** Serveur accessible par ssh : remote data path */ SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish"), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement des executables pbs */

1 0

r3005 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 11:09:32 +0000 (Wed, 24 Feb 2010) New Revision: 3005 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-02-24 11:09:29 UTC (rev 3004) +++ isis-fish/trunk/pom.xml 2010-02-24 11:09:32 UTC (rev 3005) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0</version> + <version>3.3.0.1-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.0</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.0</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

r3004 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 11:09:29 +0000 (Wed, 24 Feb 2010) New Revision: 3004 Added: isis-fish/tags/isis-fish-3.3.0.0/ Log: [maven-scm] copy for tag isis-fish-3.3.0.0

1 0

r3003 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 11:09:25 +0000 (Wed, 24 Feb 2010) New Revision: 3003 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.3.0.0 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-24 10:08:40 UTC (rev 3002) +++ isis-fish/trunk/pom.xml 2010-02-24 11:09:25 UTC (rev 3003) @@ -10,7 +10,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0-SNAPSHOT</version> + <version>3.3.0.0</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.0</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.0</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3002 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 10:08:40 +0000 (Wed, 24 Feb 2010) New Revision: 3002 Modified: isis-fish/trunk/pom.xml Log: Integration tests fails Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-24 09:12:37 UTC (rev 3001) +++ isis-fish/trunk/pom.xml 2010-02-24 10:08:40 UTC (rev 3002) @@ -504,7 +504,7 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> - <executions> +  </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r3001 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . script
by chatellier＠users.labs.libre-entreprise.org 24 Feb '10

24 Feb '10

Author: chatellier Date: 2010-02-24 09:12:37 +0000 (Wed, 24 Feb 2010) New Revision: 3001 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Disable non implemented actions Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2010-02-23 13:30:34 UTC (rev 3000) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2010-02-24 09:12:37 UTC (rev 3001) @@ -197,7 +197,7 @@ </JMenu> <JMenu text="isisfish.welcome.menu.configuration"> <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='configVCS()' enabled="false"/> <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> </JMenu> <JMenu text="isisfish.welcome.menu.help"> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-02-23 13:30:34 UTC (rev 3000) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-02-24 09:12:37 UTC (rev 3001) @@ -58,11 +58,11 @@ <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='false' /> <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()"/> + <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()" enabled='false'/> <JSeparator/> - <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='{isSingleFileSelected()}'/> + <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='false'/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> @@ -80,7 +80,7 @@ <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' icon="script.png" /> <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" /> <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" /> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' icon="cut.png" /> <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' icon="page_copy.png" /> <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' icon="page_paste.png" />

1 0

r3000 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 23 Feb '10

23 Feb '10

Author: chatellier Date: 2010-02-23 13:30:34 +0000 (Tue, 23 Feb 2010) New Revision: 3000 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Add some setter (and test) on some options Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-02-23 13:06:30 UTC (rev 2999) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-02-23 13:30:34 UTC (rev 3000) @@ -297,7 +297,7 @@ } return result; } - + /** * Retourne l'objet {@link Locale} a utilise pour la langue. * @@ -308,8 +308,18 @@ Locale result = (Locale)ConvertUtils.convert(value, Locale.class); return result; } - + /** + * Change application locale. + * (used during application config command line parse) + * + * @param locale new locale + */ + public void setLocale(String locale) { + setOption(Option.LOCALE.key, locale); + } + + /** * Retourne l'encoding a utiliser pour les fichiers textes. * * @return encoding to use @@ -318,7 +328,7 @@ String result = getOption(Option.ENCODING.key); return result; } - + /** * Retourne le serveur SMTP a utiliser pour l'envoie de mail. * @@ -328,7 +338,7 @@ String result = getOption(Option.SMTP_SERVER.key); return result; } - + /** * Retourne le nom usuel de l'utilisateur. * Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2010-02-23 13:30:34 UTC (rev 3000) @@ -0,0 +1,45 @@ +/* *##% + * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish; + +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; + +/** + * Test for IsisConfig. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IsisConfigTest { + + /** + * Test presence of some setXXX option called only + * in instrospection by {@link ApplicationConfig}. + */ + @Test + public void testSetterExistence() { + IsisConfig config = new IsisConfig(); + // --locale fr_FR + config.setLocale("fr_GB"); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0