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

Jenkins build is unstable: isis-fish-ci » IsisFish #1
by admin+ci-codelutin.com＠codelutin.com June 2, 2014

June 2, 2014

See <http://ci.codelutin.com/jenkins/job/isis-fish-ci/fr.ifremer$isis-fish/1/>

1 24

r3993 - in trunk/src/test/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 09:06:01 +0200 (Mon, 02 Jun 2014) New Revision: 3993 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3993 Log: fix tests Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -85,7 +85,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/jdk64/bin/java") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk7/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 06:52:35 UTC (rev 3992) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-06-02 07:06:01 UTC (rev 3993) @@ -197,7 +197,9 @@ */ @After public void clear() throws IOException { - FileUtils.deleteDirectory(simulationsDir); + if (simulationsDir != null) { + FileUtils.deleteDirectory(simulationsDir); + } } /**

1 0

r3992 - trunk/src/main/assembly
by echatellier＠users.forge.codelutin.com June 2, 2014

June 2, 2014

Author: echatellier Date: 2014-06-02 08:52:35 +0200 (Mon, 02 Jun 2014) New Revision: 3992 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3992 Log: Add system property to load jri libs Modified: trunk/src/main/assembly/isisfish.bat trunk/src/main/assembly/isisfish.sh Modified: trunk/src/main/assembly/isisfish.bat =================================================================== --- trunk/src/main/assembly/isisfish.bat 2014-06-01 19:20:40 UTC (rev 3991) +++ trunk/src/main/assembly/isisfish.bat 2014-06-02 06:52:35 UTC (rev 3992) @@ -1,8 +1,8 @@ @echo off rem Uncomment following 2 lines to easy configure R for ISIS-Fish -rem SET R_HOME=C:\Program Files\R\R-2.14.1 +rem SET R_HOME=C:\Program Files\R\R-3.0.0 rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx900M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx900M -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: trunk/src/main/assembly/isisfish.sh =================================================================== --- trunk/src/main/assembly/isisfish.sh 2014-06-01 19:20:40 UTC (rev 3991) +++ trunk/src/main/assembly/isisfish.sh 2014-06-02 06:52:35 UTC (rev 3992) @@ -2,4 +2,4 @@ MEMORY="-Xmx1024M" -java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt +java $MEMORY -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt

1 0

r3991 - branches/4.0.1/src/main/assembly
by echatellier＠users.forge.codelutin.com June 1, 2014

June 1, 2014

Author: echatellier Date: 2014-06-01 21:20:40 +0200 (Sun, 01 Jun 2014) New Revision: 3991 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3991 Log: Add system property to load jri libs Modified: branches/4.0.1/src/main/assembly/isisfish.bat branches/4.0.1/src/main/assembly/isisfish.sh Modified: branches/4.0.1/src/main/assembly/isisfish.bat =================================================================== --- branches/4.0.1/src/main/assembly/isisfish.bat 2014-05-30 09:36:58 UTC (rev 3990) +++ branches/4.0.1/src/main/assembly/isisfish.bat 2014-06-01 19:20:40 UTC (rev 3991) @@ -5,4 +5,4 @@ rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx900M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx900M -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: branches/4.0.1/src/main/assembly/isisfish.sh =================================================================== --- branches/4.0.1/src/main/assembly/isisfish.sh 2014-05-30 09:36:58 UTC (rev 3990) +++ branches/4.0.1/src/main/assembly/isisfish.sh 2014-06-01 19:20:40 UTC (rev 3991) @@ -2,4 +2,4 @@ MEMORY="-Xmx1024M" -java $MEMORY -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt +java $MEMORY -Djri.load.classpath.libs=true -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt

1 0

r3990 - trunk/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com May 30, 2014

May 30, 2014

Author: echatellier Date: 2014-05-30 11:36:58 +0200 (Fri, 30 May 2014) New Revision: 3990 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3990 Log: Fix build, deps, licenses Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-05-30 09:16:45 UTC (rev 3989) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-05-30 09:36:58 UTC (rev 3990) @@ -25,13 +25,16 @@ package fr.ifremer.isisfish.util; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.types.TimeStep; import java.util.Map; + +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; + /** * IsisCacheBackendOnReferenceMap utilise pour mettre les resultats de methode durant la simulation * pour minimiser les appels @@ -76,7 +79,7 @@ * Value est en SOFT reference pour que les valeurs soit effacee du cache * lorsqu'il n'y a plus de place memoire */ - protected Map cache = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD); + protected Map cache = new ReferenceMap(ReferenceStrength.WEAK, ReferenceStrength.HARD); public IsisCacheBackendOnReferenceMap() { } @@ -99,7 +102,7 @@ } Map result = (Map)cache.get(key); if (result == null) { - result = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + result = new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.SOFT); cache.put(key, result); } return result;

1 0

r3989 - in trunk: . src/license src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/sensitivity src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/models/optimization src/main/java/fr/ifremer/isisfish/ui/queue src/main/java/fr/ifremer/isisfish/ui/widget/editor src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com May 30, 2014

May 30, 2014

Author: echatellier Date: 2014-05-30 11:16:45 +0200 (Fri, 30 May 2014) New Revision: 3989 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3989 Log: Fix build, deps, licenses Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditorListener.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/pom.xml 2014-05-30 09:16:45 UTC (rev 3989) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.0.0-rc1-SNAPSHOT</version> + <version>4.3.0.0-SNAPSHOT</version>  <dependencies> @@ -178,6 +178,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> </dependency> <dependency> @@ -328,6 +329,13 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> </dependencies>  Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/license/THIRD-PARTY.properties 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,19 +1,22 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - BSD-style license -# - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence -# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPL # - GPL (with dual licensing option) @@ -21,7 +24,6 @@ # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL, version 2.1 -# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -29,9 +31,9 @@ # - MIT License # - MPL 1.1 # - Modified BSD License -# - Mozilla Public License # - New BSD License # - OpenMap Software License Agreement +# - Public Domain # - Revised BSD # - Sequence Library License # - TMate Open Source License (with dual licensing option) @@ -39,17 +41,13 @@ # - The H2 License, Version 1.0 # - Trilead Library License # - http://jaxen.codehaus.org/license.html -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Feb 05 11:48:25 CET 2014 +#Fri May 30 10:59:27 CEST 2014 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.antlr--antlr-runtime--3.4=BSD License -org.nuiton.thirdparty--JRI--0.8-4=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--REngine--0.6-1=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--Rserve--0.6-1=Lesser General Public License (LGPL v. 2.1) Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2007 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.simulator.sensitivity; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, Benjamin Poussin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.rule.RuleHelper; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2012 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2005 - 2014 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, 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 @@ -36,7 +36,7 @@ import javax.swing.JOptionPane; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixFactory; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.ui.models.optimization; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.ui.queue; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, Benjamin Poussin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.isisfish.simulator.launcher.SimulationExecutor; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import java.awt.event.ItemEvent; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditor.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditor.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.ui.widget.editor; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javax.swing.CellEditor; import javax.swing.JButton; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditorListener.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditorListener.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/FactorEditorListener.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.ui.widget.editor; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.awt.event.ActionListener; import fr.ifremer.isisfish.simulator.sensitivity.Factor; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-05-30 08:49:02 UTC (rev 3988) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-05-30 09:16:45 UTC (rev 3989) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r3988 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com May 30, 2014

May 30, 2014

Author: echatellier Date: 2014-05-30 10:49:02 +0200 (Fri, 30 May 2014) New Revision: 3988 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3988 Log: Fix database repository Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-05-28 17:15:33 UTC (rev 3987) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-05-30 08:49:02 UTC (rev 3988) @@ -963,7 +963,7 @@ public static enum Option implements ConfigOptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()+"beta"), + ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + majorVersion.toString()), COMPILATION_DIRECTORY("compilation.directory", n("isisfish.config.main.compileDirectory.description"), "${isis.home.directory}" + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n("isisfish.config.main.monitoringDirectory.description"), "${isis.home.directory}" + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n("isisfish.config.main.javadocDirectory.description"), "${isis.home.directory}" + File.separator + "isis-docs"),

1 0

r3987 - trunk
by echatellier＠users.forge.codelutin.com May 28, 2014

May 28, 2014

Author: echatellier Date: 2014-05-28 19:15:33 +0200 (Wed, 28 May 2014) New Revision: 3987 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3987 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 17:12:43 UTC (rev 3986) +++ trunk/pom.xml 2014-05-28 17:15:33 UTC (rev 3987) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6</version> + <version>5.0.7</version> </parent> <groupId>fr.ifremer</groupId> @@ -81,14 +81,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <scope>compile</scope> </dependency> @@ -185,18 +185,11 @@ <artifactId>commons-io</artifactId> <version>2.4</version> </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.2</version> - <scope>runtime</scope>  - </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.2</version> + <version>3.3</version> <scope>runtime</scope>  </dependency> @@ -327,7 +320,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>16.0.1</version> + <version>17.0</version> </dependency>  @@ -468,7 +461,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.8.4</jaxxVersion> + <jaxxVersion>2.8.5</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9-rc-1</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion>

1 0

r3986 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com May 28, 2014

May 28, 2014

Author: echatellier Date: 2014-05-28 19:12:43 +0200 (Wed, 28 May 2014) New Revision: 3986 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3986 Log: Remove log errors Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-21 09:01:26 UTC (rev 3985) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-28 17:12:43 UTC (rev 3986) @@ -291,8 +291,6 @@ AspectJUrlClassLoader loader = new AspectJUrlClassLoader(classpath, IsisFish.class.getClassLoader()); thread.setContextClassLoader(loader); - log.error("Classloader used for simulation: " + loader + " " - + Arrays.toString(loader.getURLs())); return loader; } catch (MalformedURLException eee) { // on leve un runtime, car normalement cette erreur est pratiquement @@ -322,8 +320,6 @@ AspectJUrlClassLoader loader = new AspectJUrlClassLoader(urls.toArray(new URL[urls.size()]), IsisFish.class.getClassLoader()); thread.setContextClassLoader(loader); - log.error("Classloader used for simulation: " + loader + " " - + Arrays.toString(loader.getURLs())); return loader; } catch (Exception eee) { // on leve un runtime, car normalement cette erreur est pratiquement

1 0

r3985 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com May 21, 2014

May 21, 2014

Author: echatellier Date: 2014-05-21 11:01:26 +0200 (Wed, 21 May 2014) New Revision: 3985 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3985 Log: refs #2255: Remove enum because aspectj don't like enum :( Removed: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-16 17:10:22 UTC (rev 3984) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-21 09:01:26 UTC (rev 3985) @@ -67,7 +67,7 @@ @Around("execution(* rules.*.init(..))") public Object initCall(final ProceedingJoinPoint jp) throws Throwable { - Object result = makeTimedCall(jp, State.INIT); + Object result = makeTimedCall(jp, 0); return result; } @@ -82,7 +82,7 @@ @Around("execution(* rules.*.preAction(..))") public Object initPreCall(final ProceedingJoinPoint jp) throws Throwable { - Object result = makeTimedCall(jp, State.PRE); + Object result = makeTimedCall(jp, 1); return result; } @@ -96,7 +96,7 @@ @Around("execution(* rules.*.postAction(..))") public Object initPostCall(final ProceedingJoinPoint jp) throws Throwable { - Object result = makeTimedCall(jp, State.POST); + Object result = makeTimedCall(jp, 2); return result; } @@ -107,7 +107,7 @@ * @param state state * @throws Throwable */ - protected Object makeTimedCall(ProceedingJoinPoint jp, State state) throws Throwable { + protected Object makeTimedCall(ProceedingJoinPoint jp, int state) throws Throwable { if (log.isTraceEnabled()) { log.trace("Rule aspect called : " + jp.getTarget().getClass().getSimpleName()); @@ -139,7 +139,7 @@ * @param state state * @param timeTaken time taken by {@code state} */ - protected void registerTime(JoinPoint jp, State state, long timeTaken) { + protected void registerTime(JoinPoint jp, int state, long timeTaken) { SimulationContext context = SimulationContext.get(); SimulationStorage simulation = context.getSimulationStorage(); @@ -153,15 +153,16 @@ String ruleName = calleeClass.getSimpleName(); SimulationInformation info = simulation.getInformation(); - + + // since 20140521: remove use of enum because aspectj don't like that switch (state) { - case INIT: + case 0: info.addRuleInitTime(ruleName, timeTaken); break; - case PRE: + case 1: info.addRulePreTime(ruleName, timeTaken); break; - case POST: + case 2: info.addRulePostTime(ruleName, timeTaken); break; default: Deleted: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java 2014-05-16 17:10:22 UTC (rev 3984) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java 2014-05-21 09:01:26 UTC (rev 3985) @@ -1,36 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 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 3 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, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.aspect; - -/** - * State phase to register. - * - * Avant, cette enum était dans RuleAspect. Mais depuis le passage à aspectj, il y a une erreur - * étrange d'accès: - * java.lang.IllegalAccessError: tried to access class fr.ifremer.isisfish.aspect.RuleAspect$1 from class fr.ifremer.isisfish.aspect.RuleAspect - */ -public enum State { - INIT, PRE, POST -}

1 0