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

r3521 - trunk/src/test/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 16:02:50 +0100 (Mon, 07 Nov 2011) New Revision: 3521 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3521 Log: #471 : Some tests fails during perform Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-11-07 15:01:17 UTC (rev 3520) +++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-11-07 15:02:50 UTC (rev 3521) @@ -29,9 +29,11 @@ import java.io.FileFilter; import org.apache.commons.io.FileUtils; -import org.nuiton.util.FileUtil; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import freemarker.cache.ClassTemplateLoader; @@ -43,7 +45,7 @@ * * Contains BeforeClass and AfterClass method to proper init cases. * - * Each test is done in a isolated isis-database-3 directory, and user.home + * Each test is done in a isolated isis-database directory, and user.home * is set to this directory. * * @author chatellier @@ -74,7 +76,7 @@ /** * Toujours appeler cette method pour les test d'isis. - * (sinon,il ira ecrire dans le isis-database-3 officiel). + * (sinon, il ira ecrire dans le isis-database officiel). * * Create a temp dir and init isis with that temp dir as database. * @@ -90,7 +92,6 @@ System.setProperty(IsisConfig.Option.LAUNCH_UI.key, "false"); System.setProperty(IsisConfig.Option.DATABASE_DIRECTORY.key, dirDatabase.getAbsolutePath()); System.setProperty(IsisConfig.Option.SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_dsa"); - //System.setProperty(IsisConfig.Option.VCS_SSH_KEY_FILE.key, dirDatabase.getAbsolutePath() + File.separator + "ssh" + File.separator + "isis_test_rsa"); IsisFish.init(); IsisFish.initVCS(); @@ -112,6 +113,16 @@ } }); } + + /** + * Some tests modify configuration, reset it before all tests. + * @throws ArgumentsParserException + */ + @Before + public void resetConfig() throws ArgumentsParserException { + IsisFish.config = new IsisConfig(); + IsisFish.config.parse(); + } /** * Return current database directory.

1 0

r3520 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 16:01:17 +0100 (Mon, 07 Nov 2011) New Revision: 3520 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3520 Log: Petit hack pour que la migration graphique n'interompe pas les tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 14:59:08 UTC (rev 3519) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 15:01:17 UTC (rev 3520) @@ -37,7 +37,7 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; import org.nuiton.util.Version; -import fr.ifremer.isisfish.datastore.update.ImportFromV2; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; import fr.ifremer.isisfish.util.EvaluatorHelper; @@ -88,28 +88,30 @@ queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); - // start equation migration - List<Equation> equations = tx.find("from " + Equation.class.getName()); - for (Equation equation : equations) { - int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); - if (ok != 0) { - EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle(_("isisfish.message.import.equation.convert")); - - try { - frame.setEquation(equation.getCategory(), equation.getName(), - equation.getJavaInterface(), equation.getContent()); - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Can't migrate equation", ex); + if (IsisFish.config.isLaunchUI()) { + // start equation migration + List<Equation> equations = tx.find("from " + Equation.class.getName()); + for (Equation equation : equations) { + int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); + if (ok != 0) { + EquationEditorPaneUI frame = new EquationEditorPaneUI(); + frame.setTitle(_("isisfish.message.import.equation.convert")); + + try { + frame.setEquation(equation.getCategory(), equation.getName(), + equation.getJavaInterface(), equation.getContent()); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't migrate equation", ex); + } } + + frame.setVisible(true); + if (frame.isResultOk()) { + equation.setContent(frame.getEditor().getText()); + equation.update(); + } } - - frame.setVisible(true); - if (frame.isResultOk()) { - equation.setContent(frame.getEditor().getText()); - equation.update(); - } } } }

1 0

r3519 - in trunk/src: main/java/fr/ifremer/isisfish/actions test/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 15:59:08 +0100 (Mon, 07 Nov 2011) New Revision: 3519 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3519 Log: SSH keys are not needed anymore Removed: trunk/src/test/java/fr/ifremer/isisfish/actions/ Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2011-11-07 14:40:25 UTC (rev 3518) +++ trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2011-11-07 14:59:08 UTC (rev 3519) @@ -31,9 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.KeyPair; - import fr.ifremer.isisfish.IsisConfig; /** @@ -56,34 +53,6 @@ this.config = config; } - public void sshCreateKey(boolean force) throws Exception { - File f = config.getSSHPrivateKeyFilePath(); - - // check already exist key - if (f.exists() && !force) { - log.error("the private key already exist " + f + ", use option [force] to overwrite"); - return; - } - - // bug #1623, le dossier parent n'existe pas - if (f.getParentFile() != null && !f.getParentFile().exists()) { - f.getParentFile().mkdirs(); - } - - if (log.isInfoEnabled()) { - log.info("Generate ssh key to " + f); - } - JSch jsch=new JSch(); - KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048); - //kpair.setPassphrase(passphrase); - kpair.writePrivateKey(f.getAbsolutePath()); - kpair.writePublicKey(f.getAbsolutePath()+".pub", config.getUserName() + "@forIsisFish"); - if (log.isInfoEnabled()) { - log.info("Finger print: "+kpair.getFingerPrint()); - } - kpair.dispose(); - } - public void vcsUpdate() throws Exception { // ATTENTION: il est inutile de d'accepter cette option au premier // lancement! car on a effectue soit un checkout, soit

1 0

r3518 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 15:40:25 +0100 (Mon, 07 Nov 2011) New Revision: 3518 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3518 Log: #469 : Afficher une fen?\195?\170tre de correction des equations non compilable apres migration. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 13:29:00 UTC (rev 3517) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 14:40:25 UTC (rev 3518) @@ -25,14 +25,23 @@ package fr.ifremer.isisfish.datastore.migration; +import static org.nuiton.i18n.I18n._; + import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; import org.nuiton.util.Version; +import fr.ifremer.isisfish.datastore.update.ImportFromV2; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; +import fr.ifremer.isisfish.util.EvaluatorHelper; + /** * Migration between version 3.3 and 4.0. * @@ -44,6 +53,8 @@ */ public class MigrationV33V40 extends MigrationCallBackForVersion { + static private Log log = LogFactory.getLog(MigrationV33V40.class); + /** * Constructor. * @@ -76,5 +87,30 @@ // capturability equation queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + + // start equation migration + List<Equation> equations = tx.find("from " + Equation.class.getName()); + for (Equation equation : equations) { + int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); + if (ok != 0) { + EquationEditorPaneUI frame = new EquationEditorPaneUI(); + frame.setTitle(_("isisfish.message.import.equation.convert")); + + try { + frame.setEquation(equation.getCategory(), equation.getName(), + equation.getJavaInterface(), equation.getContent()); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't migrate equation", ex); + } + } + + frame.setVisible(true); + if (frame.isResultOk()) { + equation.setContent(frame.getEditor().getText()); + equation.update(); + } + } + } } }

1 0

r3517 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 14:29:00 +0100 (Mon, 07 Nov 2011) New Revision: 3517 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3517 Log: Also remove \r in equation Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-07 11:14:50 UTC (rev 3516) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-07 13:29:00 UTC (rev 3517) @@ -680,6 +680,7 @@ // a ne pas faire pour le reste, pour les // matrice par exemple, ca passe mal escValue = StringUtils.replace(escValue, "\n", ""); + escValue = StringUtils.replace(escValue, "\r", ""); escValue = StringUtils.replace(escValue, "\"", "\\\""); } String path = factor.getPath();

1 0

r3516 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 07 Nov '11

07 Nov '11

Author: echatellier Date: 2011-11-07 12:14:50 +0100 (Mon, 07 Nov 2011) New Revision: 3516 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3516 Log: Fix la conversion des "" qui ne doit ?\195?\170tre faite que pour les equations finalement. Dans le cas de matrices (ou autre) ca case tout. Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-04 14:19:23 UTC (rev 3515) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-07 11:14:50 UTC (rev 3516) @@ -673,16 +673,21 @@ else { Object value = factor.getValue(); String stringValue = beanUtils.convert(value); + String escValue = stringValue; + if (factor.getDomain() instanceof EquationDiscreteDomain) { + // echatellier: equation can contains quotes that break + // prescript, only quote, not all java replacements + // a ne pas faire pour le reste, pour les + // matrice par exemple, ca passe mal + escValue = StringUtils.replace(escValue, "\n", ""); + escValue = StringUtils.replace(escValue, "\"", "\\\""); + } String path = factor.getPath(); String topiaId = path.substring(0, path.lastIndexOf('#')); String property = path.substring(path.lastIndexOf('#') + 1); // Double value123 = beanUtils.convert("mystringvalue", Double.class); buffer.append(value.getClass().getName()).append(" value"); buffer.append(factorIndex).append(" = beanUtils.convert(\""); - // echatellier: equation can contains quotes that break - // prescript, only quote, not all java replacements - String escValue = StringUtils.replace(stringValue, "\n", ""); - escValue = StringUtils.replace(escValue, "\"", "\\\""); buffer.append(escValue).append("\", ").append(value.getClass().getName()); buffer.append(".class);\n"); // TopiaEntity entity123 = db.findByTopiaId(topiaId);

1 0

r3515 - trunk
by echatellier＠users.forge.codelutin.com 04 Nov '11

04 Nov '11

Author: echatellier Date: 2011-11-04 15:19:23 +0100 (Fri, 04 Nov 2011) New Revision: 3515 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3515 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 21:27:38 UTC (rev 3514) +++ trunk/pom.xml 2011-11-04 14:19:23 UTC (rev 3515) @@ -191,14 +191,14 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> @@ -236,7 +236,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.44-1</version> + <version>0.1.45</version> <scope>compile</scope> </dependency>

1 0

r3514 - trunk
by maven-release＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:27:38 +0200 (Fri, 28 Oct 2011) New Revision: 3514 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3514 Log: Update mavenpom4redmine to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:32:12 UTC (rev 3513) +++ trunk/pom.xml 2011-10-28 21:27:38 UTC (rev 3514) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3513 - trunk
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 17:32:12 +0200 (Fri, 28 Oct 2011) New Revision: 3513 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3513 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:32:10 UTC (rev 3512) +++ trunk/pom.xml 2011-10-28 15:32:12 UTC (rev 3513) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-1</version> + <version>4.0.0.0-beta-2-SNAPSHOT</version>  <dependencies> @@ -704,9 +704,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0-beta-1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3512 - in tags: . isis-fish-4.0.0.0-beta-1
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 17:32:10 +0200 (Fri, 28 Oct 2011) New Revision: 3512 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3512 Log: [maven-release-plugin] copy for tag isis-fish-4.0.0.0-beta-1 Added: tags/isis-fish-4.0.0.0-beta-1/ Property changes on: tags/isis-fish-4.0.0.0-beta-1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0