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

r3731 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: echatellier Date: 2012-08-25 08:38:45 +0200 (Sat, 25 Aug 2012) New Revision: 3731 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3731 Log: Fix code style Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-08-25 06:38:26 UTC (rev 3730) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-08-25 06:38:45 UTC (rev 3731) @@ -48,9 +48,9 @@ * by : $Author$ */ public class SimulatorStorage extends JavaSourceStorage { - + public static final String SIMULATOR_PATH = "simulators"; - + /** Template freemarker pour les scripts. */ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl";

1 0

r3730 - trunk
by echatellier＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: echatellier Date: 2012-08-25 08:38:26 +0200 (Sat, 25 Aug 2012) New Revision: 3730 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3730 Log: Use performances improvements in nuiton matrix. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 12:57:23 UTC (rev 3729) +++ trunk/pom.xml 2012-08-25 06:38:26 UTC (rev 3730) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

r3729 - in trunk/src/main/java/fr/ifremer/isisfish: aspect util
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 14:57:23 +0200 (Fri, 24 Aug 2012) New Revision: 3729 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3729 Log: fixes #1411 : Add annotation to not cache method or class call Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:19:40 UTC (rev 3728) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Nocache; /** * Cache aspect. @@ -61,7 +62,7 @@ */ @Aspect("perJVM") public class Cache { - + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(Cache.class); @@ -117,23 +118,32 @@ @Around("scriptsMethod") public Object call(final JoinPoint jp) throws Throwable { totalCall++; - Object key = computeKey(jp); - Object result = cache.get(key); - if (result == null) { - - // computation increment (/ by 0) - // FIXME need to be called, but fail with empty stack - //Method method = ((MethodSignature)jp.getSignature()).getMethod(); - //getTrace().traceAfterComputation(method); + Object result = null; + Method method = ((MethodSignature)jp.getSignature()).getMethod(); + if (method.getAnnotation(Nocache.class) != null || + method.getDeclaringClass().getAnnotation(Nocache.class) != null) { result = realCall(jp); -// addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer - if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( - cache.put(key, result); + } else { + Object key = computeKey(jp); + result = cache.get(key); + if (result == null) { + + // computation increment (/ by 0) + // FIXME need to be called, but fail with empty stack + //Method method = ((MethodSignature)jp.getSignature()).getMethod(); + //getTrace().traceAfterComputation(method); + + result = realCall(jp); + // addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer + if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( + cache.put(key, result); + } + } else { + cacheUsed++; } - } else { - cacheUsed++; } + if (log.isTraceEnabled()) { log.trace(((MethodSignature)jp.getSignature()).getMethod() + " args " + Arrays.toString(((MethodRtti)jp.getRtti()).getParameterValues()) Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -0,0 +1,47 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation pour specifier à l'aspect du cache que l'on ne souhaite ne pas + * mettre en cache l'appel d'une méthode ou des méthodes d'une classe. + * + * @author echatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target({ElementType.METHOD, ElementType.TYPE}) +public @interface Nocache { + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3728 - trunk/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 14:19:40 +0200 (Fri, 24 Aug 2012) New Revision: 3728 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3728 Log: fixes #1415 : ConverterUtil#getConverter must be cached to return only one instance instead of one for each call Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-16 13:05:04 UTC (rev 3727) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-24 12:19:40 UTC (rev 3728) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric 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,6 +36,8 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; +import java.util.Map; +import java.util.WeakHashMap; /** * ConverterUtil. @@ -50,28 +52,43 @@ */ public class ConverterUtil { + static protected Map<TopiaContext, ConvertUtilsBean> cache = new WeakHashMap<TopiaContext, ConvertUtilsBean>(); + static protected ConvertUtilsBean nullConverter = getConverterNoCache(null); + public static ConvertUtilsBean getConverter(TopiaContext context) { - BeanUtilsBean result = BeanUtilsBean.getInstance(); - ConvertUtilsBean cub = result.getConvertUtils(); + ConvertUtilsBean result; + if (context == null) { + result = nullConverter; + } else { + result = cache.get(context); + if (result == null) { + result = getConverterNoCache(context); + } + } + return result; + } + protected static ConvertUtilsBean getConverterNoCache(TopiaContext context) { + BeanUtilsBean bub = BeanUtilsBean.getInstance(); + ConvertUtilsBean result = bub.getConvertUtils(); + cache.put(context, result); + // mise en place de converter de string vers des objet ... - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - cub.register(new TimeStepConverter(), TimeStep.class); - cub.register(new MonthConverter(), Month.class); - cub.register(new TimeUnitConverter(), TimeUnit.class); - cub.register(new RangeOfValuesConverter(), RangeOfValues.class); - + result.register(new TopiaEntityConverter(context), TopiaEntity.class); + result.register(new TimeStepConverter(), TimeStep.class); + result.register(new MonthConverter(), Month.class); + result.register(new TimeUnitConverter(), TimeUnit.class); + result.register(new RangeOfValuesConverter(), RangeOfValues.class); + // Not used since mexico file format use // Still used in sensivity analysis prescript - cub.register(new MatrixConverter(), MatrixND.class); + result.register(new MatrixConverter(), MatrixND.class); // dans les prescripts generé on a MatrixNDImpl.class // c'est tres étrange, mais ca ne fonctionne pas par MatrixND.class - cub.register(new MatrixConverter(), MatrixNDImpl.class); + result.register(new MatrixConverter(), MatrixNDImpl.class); // ... et inversement - cub.register(new StringConverter(), String.class); - - return cub; + result.register(new StringConverter(), String.class); + return result; } - }

1 0

r3727 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com 16 Aug '12

16 Aug '12

Author: echatellier Date: 2012-08-16 15:05:04 +0200 (Thu, 16 Aug 2012) New Revision: 3727 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3727 Log: fixes #1406 : Can't create SimulationPlan Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-10 16:12:54 UTC (rev 3726) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-16 13:05:04 UTC (rev 3727) @@ -292,7 +292,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName, Location.COMMUNITY); + script = SimulationPlanStorage.createSimulationPlan(fileName, Location.COMMUNITY); break; case CommunityExport: script = ExportStorage.createExport(fileName, Location.COMMUNITY);

1 0

r3726 - trunk
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:54 +0200 (Fri, 10 Aug 2012) New Revision: 3726 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3726 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:12:47 UTC (rev 3725) +++ trunk/pom.xml 2012-08-10 16:12:54 UTC (rev 3726) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3</version> + <version>4.1.0.4-SNAPSHOT</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3725 - in tags: . isis-fish-4.1.0.3
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:47 +0200 (Fri, 10 Aug 2012) New Revision: 3725 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3725 Log: [maven-release-plugin] copy for tag isis-fish-4.1.0.3 Added: tags/isis-fish-4.1.0.3/ Property changes on: tags/isis-fish-4.1.0.3 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0

r3724 - trunk
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:36 +0200 (Fri, 10 Aug 2012) New Revision: 3724 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3724 Log: [maven-release-plugin] prepare release isis-fish-4.1.0.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) +++ trunk/pom.xml 2012-08-10 16:12:36 UTC (rev 3724) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3-SNAPSHOT</version> + <version>4.1.0.3</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> </scm> <repositories>

1 0

r3723 - trunk
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 18:05:29 +0200 (Fri, 10 Aug 2012) New Revision: 3723 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3723 Log: Udpate to mavenpom 3.3.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) +++ trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3722 - trunk
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 16:52:27 +0200 (Fri, 10 Aug 2012) New Revision: 3722 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3722 Log: Fix animal-sniffer signature (sun version) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:43:15 UTC (rev 3721) +++ trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) @@ -624,6 +624,18 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> </plugins> </pluginManagement>

1 0