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

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

r2999 - isis-fish/trunk/src/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:06:30 +0000 (Tue, 23 Feb 2010) New Revision: 2999 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Log: Fix imports Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:45:47 UTC (rev 2998) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 13:06:30 UTC (rev 2999) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-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 @@ -21,11 +21,9 @@ import java.io.File; import java.io.IOException; -import junit.framework.Assert; - import org.apache.commons.io.FileUtils; -import org.h2.Driver; import org.h2.engine.Constants; +import org.junit.Assert; import org.junit.Test; /**

1 0

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

23 Feb '10

Author: chatellier Date: 2010-02-23 11:45:47 +0000 (Tue, 23 Feb 2010) New Revision: 2998 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Log: Update h2 (and add a test to block future h2 update) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-23 11:44:54 UTC (rev 2997) +++ isis-fish/trunk/pom.xml 2010-02-23 11:45:47 UTC (rev 2998) @@ -217,7 +217,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> + <version>1.2.128</version> <scope>compile</scope> </dependency> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:44:54 UTC (rev 2997) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2010-02-23 11:45:47 UTC (rev 2998) @@ -24,6 +24,8 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; +import org.h2.Driver; +import org.h2.engine.Constants; import org.junit.Test; /** @@ -57,4 +59,17 @@ Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); } } + + /** + * Test that h2 version is < 1.2.129. + * + * Upgrading from < 1.1.x to 1.2.129 doesn't work + * Since page store has been changed in 1.2.x release, and removed since 1.2.129. + */ + @Test + public void testH2Version() { + Assert.assertEquals(1, Constants.VERSION_MAJOR); + Assert.assertEquals(2, Constants.VERSION_MINOR); + Assert.assertTrue("Using H2 >= 1.2.129 will not work", Constants.BUILD_ID < 129); + } }

1 0

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

23 Feb '10

Author: chatellier Date: 2010-02-23 11:44:54 +0000 (Tue, 23 Feb 2010) New Revision: 2997 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-23 11:28:44 UTC (rev 2996) +++ isis-fish/trunk/changelog.txt 2010-02-23 11:44:54 UTC (rev 2997) @@ -1,7 +1,9 @@ isis-fish (3.3.0.0) stable; urgency=low + * Replace zone selection event from mouse click to correct valueChanged + * Fix a NullPointerException during region check * Disable all list filtering functionalities (don't work anymore with a lot of simulations) - + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low

1 0