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

Build failed in Jenkins: isis-fish-nightly #1
by admin+ci-codelutin.com＠codelutin.com June 3, 2014

June 3, 2014

See <http://ci.codelutin.com/jenkins/job/isis-fish-nightly/1/> ------------------------------------------ [...truncated 7961 lines...] <div id="members"> <ul> <li><a href="http://www.easter-eggs.com/">Easter-eggs</a></li> <li><a href="http://www.codelutin.com/">Code Lutin</a></li> <li><a href="http://www.entrouvert.com/">Entr'ouvert</a></li> <li><a href="http://www.ldd.fr/">Les Développements Durables</a></li> <li><a href="http://www.nereide.fr">Néréide</a></li> <li><a href="http://www.syloe.com/">Syloé</a></li> <li><a href="http://www.labor-liber.com/">labor-liber</a></li> <li><a href="http://www.cliss21.com/">Cliss XXI</a></li> <li><a href="http://www.silecs.info/">SILECS</a></li> <li><a href="http://www.libricks.fr/">Libricks</a></li> <li><a href="http://azae.net/">Azaé</a></li> <li><a href="http://www.scil.coop">SCIL</a></li> <li><a href="https://www.cadoles.com/">Cadoles</a></li> </ul> </div> </div> </div> </div> <div id="warpperhome" class="clearfix"> <div class="menu"> <div class="rightmenu"> <ul> <li class="level1"><div class="li"> <a href="/accueil" class="wikilink1" title="accueil">Accueil</a></div> </li> <li class="level1"><div class="li"> <a href="/nos_metiers" class="wikilink1" title="nos_metiers">Nos métiers</a></div> </li> <li class="level1"><div class="li"> <a href="/nos_valeurs" class="wikilink1" title="nos_valeurs">Nos valeurs</a></div> </li> <li class="level1"><div class="li"> <a href="/references" class="wikilink1" title="references"> Nos références</a></div> </li> <li class="level1"><div class="li"> <a href="/le_laboratoire" class="wikilink1" title="le_laboratoire">Le laboratoire</a></div> </li> <li class="level1"><div class="li"> <a href="/contact" class="wikilink1" title="contact">Contact</a></div> </li> </ul> </div> </div> <div id="warpper2"> <div class="maincontent"> <div class="margin">  <div class="page_left"> <h1 class="sectionedit1"><a name="cette_page_n_existe_pas_encore" id="cette_page_n_existe_pas_encore">Cette page n'existe pas encore</a></h1> <div class="level1"> <p> Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ou le lien « Créer cette page ». </p> </div> </div> <div class="right_sidebar"> <div class="main_sidebar sidebar_box"> <h1 class="sectionedit1"><a name="sb_right_actualites" id="sb_right_actualites">Actualités</a></h1> <div class="level1"> <p> <div class="news"> </p> <ul class="rss"><li><div class="li"><a href="http://www.codelutin.com/blog:news:salon_de_l_agriculture_2014" class="urlextern" title="http://www.codelutin.com/blog:news:salon_de_l_agriculture_2014" rel="nofollow">Salon de l'Agriculture 2014</a> (2014/02/03 14:56)<div class="detail"><div> <p> L'application Agrosyst, développée par Code Lutin, sera présentée lors du salon de l'agriculture 2014 par l'INRA lors de son colloque intitulé “Conception et adoption de systèmes de production agricole à hautes performances”. La présentation aura lieu le mardi 25 février à partir de 16h30. </p> <p> Agrosyst est un système d'information permettant à l'INRA d'identifier les pratiques culturales innovantes permettant de maintenir des rendements élevés tout en diminuant de 50% l'utilisation de produits phytosanitaires. Toutes les composantes des systèmes de culture y sont répertoriés afin de pouvoir comparer les différentes pratiques et mettre en évidence les plus efficaces. </p> <p> Vous pouvez assister à la présentation en vous inscrivant sur <a href="https://colloque.inra.fr/sia2014_agricultureperformante" title="https://colloque.inra.fr/sia2014_agricultureperformante" rel="nofollow">le site de l'organisation</a> </p> </div></div></div></li><li><div class="li"><a href="http://www.codelutin.com/blog:news:bonne_annee_2014" class="urlextern" title="http://www.codelutin.com/blog:news:bonne_annee_2014" rel="nofollow">Bonne année 2014</a> (2014/01/13 10:25)<div class="detail"><div> <p> En ce début d'année 2014, toute l'équipe Code Lutin vous souhaite ses meilleurs vœux. </p> <p> Que cette année à venir soit pour vous pleine de promesses et de succès, tant professionnels que personnels. </p> </div></div></div></li><li><div class="li"><a href="http://www.codelutin.com/blog:news:balle_de_match" class="urlextern" title="http://www.codelutin.com/blog:news:balle_de_match" rel="nofollow">Balle de match</a> (2013/11/18 17:22)<div class="detail"><div> <p> Code Lutin était partenaire du match de championnat de France Nationale 2 de Rink Hockey du Nantes ARH ce samedi 16 Novembre. L'équipe du NARH recevait le leader du championnat, le Biarritz OL. Le match s'est terminé par une défaite du NARH sur le score de 6-5. Les bleu et blanc n'ont pas démerité puisqu'ils s'inclinent sur un but a 50 secondes de la fin du match. </p> <p> Code Lutin a offert la balle de match et plusieurs balles distribuées aux spectateurs durant la rencontre. </p> <p> Le NARH est actuellement 3ème du classement et possède la meilleure défense du championnat. </p> </div></div></div></li></ul> <p> </div> </p> </div>  <h1 class="sectionedit2"><a name="sb_right_articles_techniques" id="sb_right_articles_techniques">Articles techniques</a></h1> <div class="level1"> <p> <div class="article"> </p> <ul class="rss"></ul> <p> </div> </p> <p> <a href="http://www.codelutin.com/blogtech" class="urlextern" title="http://www.codelutin.com/blogtech" rel="nofollow">Tous les articles</a> </p> </div>  <h1 class="sectionedit3"><a name="sb_right_actualites_des_forges" id="sb_right_actualites_des_forges">Actualités des forges</a></h1> <div class="level1"> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Code Lutin</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://forge.codelutin.com/news/259" class="urlextern" title="http://forge.codelutin.com/news/259" rel="nofollow">Tutti - Tutti 3.1.3 released</a> (2014/02/13 17:04)</div></li><li><div class="li"><a href="http://forge.codelutin.com/news/256" class="urlextern" title="http://forge.codelutin.com/news/256" rel="nofollow">Tutti - Tutti 3.1.1 released</a> (2014/02/04 13:32)</div></li><li><div class="li"><a href="http://forge.codelutin.com/news/254" class="urlextern" title="http://forge.codelutin.com/news/254" rel="nofollow">Tutti - Tutti 3.1 released</a> (2014/01/30 20:19)</div></li></ul> <p> </div> </p> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Chorem</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://www.chorem.org/news/58" class="urlextern" title="http://www.chorem.org/news/58" rel="nofollow">Pollen - Pollen 1.5.5 released</a> (2013/12/23 15:16)</div></li><li><div class="li"><a href="http://www.chorem.org/news/57" class="urlextern" title="http://www.chorem.org/news/57" rel="nofollow">jTimer - jTimer 1.4.3 released</a> (2013/09/27 07:50)</div></li><li><div class="li"><a href="http://www.chorem.org/news/56" class="urlextern" title="http://www.chorem.org/news/56" rel="nofollow">Bow - bow 1.2 released</a> (2013/09/25 05:32)</div></li></ul> <p> </div> </p> <p> <div class="article"> <div class="actutitle clearfix"> <h3>Nuiton</h3> </div> </p> <ul class="rss"><li><div class="li"><a href="http://www.nuiton.org/news/529" class="urlextern" title="http://www.nuiton.org/news/529" rel="nofollow">nuiton-maven-report-plugin - Nuiton Maven reports plugin 3.0-rc-1 released</a> (2014/02/13 17:43)</div></li><li><div class="li"><a href="http://www.nuiton.org/news/528" class="urlextern" title="http://www.nuiton.org/news/528" rel="nofollow">jaxx - JAXX 2.8.1 released</a> (2014/02/12 18:27)</div></li><li><div class="li"><a href="http://www.nuiton.org/news/526" class="urlextern" title="http://www.nuiton.org/news/526" rel="nofollow">nuiton-validator - Nuiton Validator 3.0-rc-1 released</a> (2014/02/12 18:04)</div></li></ul> <p> </div> </p> </div>  </div> </div>  </div> </div> </div> <div class="footer"> <ul> <li class="level1"><div class="li"> <a href="/tarifs" class="wikilink1" title="tarifs">Tarifs</a></div> </li> <li class="level1"><div class="li"> <a href="/remerciement" class="wikilink1" title="remerciement"> Remerciements</a></div> </li> <li class="level1"><div class="li"> <a href="/offres_de_stage" class="wikilink1" title="offres_de_stage"> Offres de stage</a></div> </li> <li class="level1"><div class="li"> <a href="/equipe_de_lutins" class="wikilink1" title="equipe_de_lutins"> Les lutins</a></div> </li> </ul> </div>  <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.codelutin.com/" : "http://piwik.codelutin.com/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); </script><script type="text/javascript"> try { var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1); piwikTracker.trackPageView(); piwikTracker.enableLinkTracking(); } catch( err ) {} </script><noscript><p><img src="http://piwik.codelutin.com/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript>  </body> </html> does not support Maven 3 at org.codehaus.mojo.sonar.SonarMojo.checkVersionRequirements(SonarMojo.java:126) at org.codehaus.mojo.sonar.SonarMojo.execute(SonarMojo.java:107) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sonar analysis completed: FAILURE Build step 'Sonar' changed build result to FAILURE Build step 'Sonar' marked build as failure

1 17

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

June 3, 2014

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

1 17

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

June 2, 2014

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

1 24

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

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

r3984 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bpoussin＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: bpoussin Date: 2014-05-16 19:10:22 +0200 (Fri, 16 May 2014) New Revision: 3984 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3984 Log: reset error counter to 0, when pause executor 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 2014-05-15 16:08:30 UTC (rev 3983) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-16 17:10:22 UTC (rev 3984) @@ -675,6 +675,8 @@ launcher, i.intValue())); SimulationExecutor e = executors.get(launcher); e.pause(); + // reset error to 0 + i.setValue(0); } // il faut bien penser a supprimer le launcher pour qu'un autre executor // puisse y mettre le sien.

1 0

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

May 15, 2014

Author: echatellier Date: 2014-05-15 18:08:30 +0200 (Thu, 15 May 2014) New Revision: 3983 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3983 Log: refs #2255: Readd full classloader modification for aspectj 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-15 15:31:29 UTC (rev 3982) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 16:08:30 UTC (rev 3983) @@ -34,6 +34,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import org.apache.commons.io.FileUtils; @@ -70,6 +71,7 @@ import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.util.CompileHelper; /** * Fait une simulation dans la meme jvm. @@ -278,6 +280,9 @@ * @return le classe loader modifié */ protected AspectJUrlClassLoader changeClassLoader(Thread thread, File directory) { + /* + FIXME echatellier 20140419 : normalement c'est ce code original qui est bon + il fonctionne sur eclipse, mais pas en java -jar ... try { URL[] classpath = new URL[] { directory.toURI().toURL(), // poussin 20080821 : il semble ne plus trouve les formules, @@ -294,6 +299,37 @@ // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); + }*/ + + // FIXME echatellier 20140419 : pour que aspectj fonctionne, on lui construit un urlclassloader + // complet avec toutes les urls + try { + List<URL> urls = new ArrayList<>(); + for (Enumeration<?> e = CompileHelper.class.getClassLoader() + .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { + URL url = (URL) e.nextElement(); + if (log.isDebugEnabled()) { + log.debug("Found manifest : " + url); + } + if ((url != null) && url.getFile().startsWith("file:/")) { + String jarPath = url.getPath().substring(0, + url.getPath().indexOf("!")); + urls.add(new URL(jarPath)); + } + } + urls.add(directory.toURI().toURL()); + urls.add(IsisFish.config.getCompileDirectory().toURI().toURL()); + 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 + // impossible car on creer l'url a partir d'un File ce qui ne pose + // noralement pas de probleme + throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); } }

1 0

r3982 - in trunk/src/main/java/fr/ifremer/isisfish: aspect simulator/launcher
by echatellier＠users.forge.codelutin.com May 15, 2014

May 15, 2014

Author: echatellier Date: 2014-05-15 17:31:29 +0200 (Thu, 15 May 2014) New Revision: 3982 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3982 Log: refs #2255: Move enum out of class for aspectization Added: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-15 10:09:19 UTC (rev 3981) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -54,13 +54,6 @@ @Aspect public class RuleAspect { - /** - * State phase to register. - */ - protected static enum State { - INIT, PRE, POST - } - /** Log. */ private static Log log = LogFactory.getLog(RuleAspect.class); Added: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -0,0 +1,36 @@ +/* + * #%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 +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/aspect/State.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-15 10:09:19 UTC (rev 3981) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-05-15 15:31:29 UTC (rev 3982) @@ -34,7 +34,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Enumeration; import java.util.List; import org.apache.commons.io.FileUtils; @@ -71,7 +70,6 @@ import fr.ifremer.isisfish.simulator.Simulator; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.util.CompileHelper; /** * Fait une simulation dans la meme jvm. @@ -280,9 +278,6 @@ * @return le classe loader modifié */ protected AspectJUrlClassLoader changeClassLoader(Thread thread, File directory) { - /* - FIXME echatellier 20140419 : normalement c'est ce code original qui est bon - il fonctionne sur eclipse, mais pas en java -jar ... try { URL[] classpath = new URL[] { directory.toURI().toURL(), // poussin 20080821 : il semble ne plus trouve les formules, @@ -299,37 +294,6 @@ // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); - }*/ - - // FIXME echatellier 20140419 : pour que aspectj fonctionne, on lui construit un urlclassloader - // complet avec toutes les urls - try { - List<URL> urls = new ArrayList<>(); - for (Enumeration<?> e = CompileHelper.class.getClassLoader() - .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { - URL url = (URL) e.nextElement(); - if (log.isDebugEnabled()) { - log.debug("Found manifest : " + url); - } - if ((url != null) && url.getFile().startsWith("file:/")) { - String jarPath = url.getPath().substring(0, - url.getPath().indexOf("!")); - urls.add(new URL(jarPath)); - } - } - urls.add(directory.toURI().toURL()); - urls.add(IsisFish.config.getCompileDirectory().toURI().toURL()); - 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 - // impossible car on creer l'url a partir d'un File ce qui ne pose - // noralement pas de probleme - throw new IsisFishRuntimeException(t("isisfish.error.change.classloader", directory), eee); } }

1 0

r3981 - in trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/queue resources/i18n
by bpoussin＠users.forge.codelutin.com May 15, 2014

May 15, 2014

Author: bpoussin Date: 2014-05-15 12:09:19 +0200 (Thu, 15 May 2014) New Revision: 3981 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3981 Log: - Ajout d'un delai avant resoumission d'un job qui n'a pas pu etre execute (ex: probleme de connexion reseau) - ajout d'un message sur le job lorsqu'il est en pause - Remise en marche du bouton Pause/Reprendre de la queue de simulation - changement de traduction pour le bouton Added: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -27,11 +27,14 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; + import static org.nuiton.i18n.I18n.t; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,6 +66,9 @@ this); /** vrai si cet executor est en pause */ protected boolean pause = false; + private ReentrantLock pauseLock = new ReentrantLock(); + private Condition unpaused = pauseLock.newCondition(); + /** le nombre de thread utilise avant la pause */ protected int lastCorePoolSize; /** le simulation service qui a cree cet executor */ @@ -121,24 +127,39 @@ protected void beforeExecute(Thread t, Runnable r) { super.beforeExecute(t, r); - // en premier lieu il faut que SimulationService autorise le lancement - getSimulationService().waitAutoLaunch(); + if (r instanceof SimulationJob) { + SimulationJob job = (SimulationJob) r; - // ensuite si cet executor est en pause, on tu le thread apres avoir - // resoumis la simulation - if (isPause()) { - // on est en pause, il faut remettre la tache et tuer le thread - // un simple suspend du thread n'est pas bon, car la tache ne - // serait alors jamais executer et ce n'est pas forcement ce que - // l'on souhaite - if (r instanceof SimulationJob) { - SimulationService.getService().resubmit((SimulationJob) r); + // en premier lieu il faut que SimulationService autorise le lancement + getSimulationService().waitAutoLaunch(job); + + // wait if this executor is in pause status + pauseLock.lock(); + try { + while (isPause()) { + job.getItem().getControl().setText(t("Pause")); + unpaused.await(); + } + } catch (InterruptedException ie) { + t.interrupt(); + } finally { + pauseLock.unlock(); } - throw new RuntimeException( - t("Normal stop thread, this is not an error")); - } - if (r instanceof SimulationJob) { - SimulationJob job = (SimulationJob) r; + +// // ensuite si cet executor est en pause, on tu le thread apres avoir +// // resoumis la simulation +// if (isPause()) { +// // on est en pause, il faut remettre la tache et tuer le thread +// // un simple suspend du thread n'est pas bon, car la tache ne +// // serait alors jamais executer et ce n'est pas forcement ce que +// // l'on souhaite +// if (r instanceof SimulationJob) { +// SimulationService.getService().resubmit((SimulationJob) r); +// } +// throw new RuntimeException( +// t("Normal stop thread, this is not an error")); +// } + if (job.getLauncher() == null) { // si la tache a deja un launcher, on l'utilise sinon on lui // indique d'utilise le notre. C'est seul facon propre et sans @@ -186,19 +207,36 @@ * @param pause pause value to set */ public void setPause(boolean pause) { - boolean oldValue = this.pause; - synchronized (this) { + pauseLock.lock(); + try { + + if (this.pause == pause) { + // same state, do nothing + return; + } + boolean oldValue = this.pause; this.pause = pause; - if (this.pause) { - lastCorePoolSize = getCorePoolSize(); - setCorePoolSize(0); - } else { - setCorePoolSize(lastCorePoolSize); - // on recree tous les threads qui avait ete tue par la pause - prestartAllCoreThreads(); + if (!this.pause) { + unpaused.signalAll(); } + propertyListeners.firePropertyChange("pause", oldValue, pause); + } finally { + pauseLock.unlock(); } - propertyListeners.firePropertyChange("pause", oldValue, this.pause); + +// boolean oldValue = this.pause; +// synchronized (this) { +// this.pause = pause; +// if (this.pause) { +// lastCorePoolSize = getCorePoolSize(); +// setCorePoolSize(0); +// } else { +// setCorePoolSize(lastCorePoolSize); +// // on recree tous les threads qui avait ete tue par la pause +// prestartAllCoreThreads(); +// } +// } +// propertyListeners.firePropertyChange("pause", oldValue, this.pause); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -346,12 +346,15 @@ /** * Permet de mettre en attente les threads de simulation si l'utilisateur * a suspendu la queue + * + * @param job le job pour lequel on vu savoir s'il faut l'executer ou non */ - protected void waitAutoLaunch() { + protected void waitAutoLaunch(SimulationJob job) { synchronized (this) { while (!isAutoLaunch()) { try { log.info("autoLaunch is false waiting queue start"); + job.getItem().getControl().setText(t("Pause")); this.wait(); } catch (InterruptedException eee) { log.warn("Error during wait autoLaunch flag", eee); @@ -655,6 +658,8 @@ } /** + * This method must be call in thread simulation + * * Report une erreur pour un launcher, on resoumet le job en supprimant * le launcher utilise * @@ -676,6 +681,12 @@ // FIXME: est ce le bon choix si l'utilisateur avait force un launcher particulier, ne faudrait t'il pas prevenir l'utilisateur ? // FIXME: disabled since caparmor is not our friend. Retry on caparmor in the limit of 50 errors //job.setLauncher(null); + try { + // not resubmit immediatly, wait some time (max 10 min and about 4,2 hours in total) + Thread.sleep(i.intValue() / 5 * 60 * 1000); + } catch (InterruptedException eee) { + log.info("Can't sleep before resubmit job, never mind", eee); + } resubmit(job); } Added: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java 2014-05-15 10:09:19 UTC (rev 3981) @@ -0,0 +1,71 @@ +package fr.ifremer.isisfish.ui.queue; + + +import fr.ifremer.isisfish.simulator.launcher.SimulationExecutor; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import javax.swing.JToggleButton.ToggleButtonModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class PauseButtonModel extends ToggleButtonModel implements PropertyChangeListener, ItemListener { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(PauseButtonModel.class); + private static final long serialVersionUID = 1L; + + protected SimulationService service; + final static private String servicePropertyName = "autoLaunch"; + final static private String executorPropertyName = "pause"; + + public PauseButtonModel(SimulationService service) { + this.service = service; + + boolean b = service.isAutoLaunch(); + service.addPropertyChangeListener(servicePropertyName, this); + + for (SimulationExecutor e : service.getSimulationExecutors()) { + b = b && !e.isPause(); + e.addPropertyChangeListener(executorPropertyName, this); + } + + setSelected(b); + + addItemListener(this); + } + + // event from service or executor, change button + @Override + public void propertyChange(PropertyChangeEvent event) { + boolean b = (Boolean)event.getNewValue(); + setSelected(b); + } + + // event from button, change model + @Override + public void itemStateChanged(ItemEvent event) { + boolean b = event.getStateChange() == ItemEvent.SELECTED; + service.setAutoLaunch(b); + // if pause asked, (b == false) only service can be put in autoLaunch = false + // executor see this autoLaunch value. + // if resume asked (b == true), we must ensure that all executer are resume too + if (b) { + for (SimulationExecutor e : service.getSimulationExecutors()) { + e.resume(); + } + } + } + + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/PauseButtonModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2014-05-15 10:09:19 UTC (rev 3981) @@ -46,6 +46,7 @@ <SimulationServiceTableModel id="newSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), true)'/> <SimulationServiceTableModel id="doneSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), false)' onTableChanged='queueAction.updateActions()' /> + <PauseButtonModel id="autoLaunchButtonModel" javaBean='new PauseButtonModel(SimulationService.getService())'/> <DefaultListSelectionModel id="selectionModelQueueTable" onValueChanged='queueAction.updateActions()'/> <DefaultListSelectionModel id="selectionModelQueueTableDone" onValueChanged='queueAction.updateActions()'/> @@ -68,7 +69,7 @@ </row> <row> <cell fill="horizontal" weightx="0.3"> - <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> + <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch" model="{autoLaunchButtonModel}"/> </cell> <cell fill="horizontal" weightx="0.3"> <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='queueAction.stopSimulation()' enabled='{isCanStop()}' /> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-05-15 10:09:19 UTC (rev 3981) @@ -45,6 +45,7 @@ No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= +Pause= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= @@ -811,7 +812,7 @@ isisfish.queue.progression=Progress isisfish.queue.restartSimulation=Restart isisfish.queue.showLog=Show simulation log -isisfish.queue.simulationLaunch=Simulation queue launch +isisfish.queue.simulationLaunch=Pause / Resume isisfish.queue.status=Status isisfish.queue.stopSimulation=Stop simulation isisfish.queue.title=Queue Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-05-12 08:16:17 UTC (rev 3980) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-05-15 10:09:19 UTC (rev 3981) @@ -45,6 +45,7 @@ No\ port\ cell= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= +Pause= Process\ template\ error= QUnif\ %= QUnif\ Min/Max= @@ -806,7 +807,7 @@ isisfish.queue.progression=Progression isisfish.queue.restartSimulation=Redémarrer isisfish.queue.showLog=Voir les logs de la simulation -isisfish.queue.simulationLaunch=Lanceur de la queue des simulations +isisfish.queue.simulationLaunch=Pause / Reprendre isisfish.queue.status=État isisfish.queue.stopSimulation=Arrêter la simulation isisfish.queue.title=Queue

1 0

r3980 - trunk
by echatellier＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: echatellier Date: 2014-05-12 10:16:17 +0200 (Mon, 12 May 2014) New Revision: 3980 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3980 Log: Use i18n and topia stable release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-29 08:23:58 UTC (rev 3979) +++ trunk/pom.xml 2014-05-12 08:16:17 UTC (rev 3980) @@ -470,9 +470,9 @@  <jaxxVersion>2.8.4</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> - <topiaVersion>2.9-SNAPSHOT</topiaVersion> + <topiaVersion>2.9-rc-1</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> - <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>

1 0