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

r2654 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 17:56:26 +0000 (Mon, 28 Sep 2009) New Revision: 2654 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Update version to 3.2.0.8 Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-28 16:28:38 UTC (rev 2653) +++ isis-fish/trunk/changelog.txt 2009-09-28 17:56:26 UTC (rev 2654) @@ -1,3 +1,7 @@ +isis-fish (3.2.0.8) stable; urgency=low + + -- lun. sept. 28 19:52:53 CEST 2009 + isis-fish (3.2.0.7) stable; urgency=low * Fix a missing hashCode() problem in month (cause problem in matrixND) @@ -19,7 +23,7 @@ * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary - -- + -- lun. sept. 28 19:52:53 CEST 2009 isis-fish (3.2.0.6) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 16:28:38 UTC (rev 2653) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 17:56:26 UTC (rev 2654) @@ -121,7 +121,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 7); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 8); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber(

1 0

r2653 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 16:28:38 +0000 (Mon, 28 Sep 2009) New Revision: 2653 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-09-28 16:28:35 UTC (rev 2652) +++ isis-fish/trunk/pom.xml 2009-09-28 16:28:38 UTC (rev 2653) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.7</version> + <version>3.2.0.8-SNAPSHOT</version>  <dependencies> @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> </scm>

1 0

r2652 - in isis-fish/tags: . isis-fish-3.2.0.7
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 16:28:35 +0000 (Mon, 28 Sep 2009) New Revision: 2652 Added: isis-fish/tags/isis-fish-3.2.0.7/ isis-fish/tags/isis-fish-3.2.0.7/pom.xml Removed: isis-fish/tags/isis-fish-3.2.0.7/pom.xml Log: [maven-release-plugin] copy for tag isis-fish-3.2.0.7 Deleted: isis-fish/tags/isis-fish-3.2.0.7/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-09-28 15:14:37 UTC (rev 2650) +++ isis-fish/tags/isis-fish-3.2.0.7/pom.xml 2009-09-28 16:28:35 UTC (rev 2652) @@ -1,770 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5</version> - </parent> - - <groupId>ifremer</groupId> - <artifactId>isis-fish</artifactId> - <version>3.2.0.7-SNAPSHOT</version> - -  - <dependencies> - -  - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia-service</artifactId> - <version>${topia.service.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinmatrix</artifactId> - <version>${lutinmatrix.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>${lutinwidget.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-validator</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinj2r</artifactId> - <version>${lutinj2r.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>jfreechart</groupId> - <artifactId>jfreechart</artifactId> - <version>0.9.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>jcommon</groupId> - <artifactId>jcommon</artifactId> - <version>0.7.0</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>openmap</groupId> - <artifactId>openmap</artifactId> - <version>${openmap.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.fife</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.3.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.42</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.118</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkz.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>ssj</groupId> - <artifactId>ssj</artifactId> - <version>2.1.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>Blas</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>colt</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>interpreter</artifactId> - <version>1.6.8</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>language</artifactId> - <version>1.6.7</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>logger</artifactId> - <version>1.6.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>ssj</groupId> - <artifactId>optimization</artifactId> - <version>20081007</version> - <scope>runtime</scope> - </dependency> -  - -  - <dependency> - <groupId>org.tmatesoft</groupId> - <artifactId>svnkit</artifactId> - <version>1.2.3.5521</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.trilead</groupId> - <artifactId>trilead-ssh2</artifactId> - <version>build213-svnkit-1.2</version> - <scope>runtime</scope> - </dependency> -  - - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.15</version> - </dependency> - - <dependency> - <groupId>net.sourceforge.cpdetector</groupId> - <artifactId>cpdetector</artifactId> - <version>1.0.7</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.6.0</version> - </dependency> - </dependencies> - -  -  -  - <name>IsisFish</name> - <description>Simulateur de pecherie complexe.</description> - <inceptionYear>1999</inceptionYear> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/copyleft/gpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - -  -  -  - <packaging>jar</packaging> - - <properties> -  - <labs.id>8</labs.id> - -  - <labs.project>isis-fish</labs.project> - -  - <jaxx.version>1.5.1</jaxx.version> - <topia.version>2.1.6.1</topia.version> - <topia.service.version>1.0.3</topia.service.version> - <lutinmatrix.version>1.3</lutinmatrix.version> - <lutinutil.version>1.0.6</lutinutil.version> - <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.14.1</lutinwidget.version> - <generator.version>0.64</generator.version> - <lutinj2r.version>0.4</lutinj2r.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - <openmap.version>4.6.4</openmap.version> - <aspectwerkz.version>2.0</aspectwerkz.version> - <xmlrpc.version>3.1.2</xmlrpc.version> - -  - <maven.test.forkMode>once</maven.test.forkMode> - -  - <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> - -  - <keystorepath>${codelutin.keystorepath}</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - - <jnlpCodebase>${project.url}</jnlpCodebase> -  - <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> - <extractedPackages>fr.ifremer.isisfish</extractedPackages> -  - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <excludeTemplates> - <value>org.codelutin.topia.generator.EntityEnumGenerator</value> - <value>org.codelutin.topia.generator.EntityProviderGenerator</value> - </excludeTemplates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% - </copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <extraImportList>jaxx.runtime.SwingUtil</extraImportList> - <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/**UI.java</param> - </includes> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <defaultLocale>fr</defaultLocale> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6</version> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> - <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link> - <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.1</version> - </plugin> - </plugins> - </reporting> - -  -  -  - <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> -  - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> - <filter token="lib-activation" value="activation-1.1.jar" /> - <filter token="lib-mail" value="mail-1.4.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> - - <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> - <fileset dir="${project.build.directory}/lib"> - <include name="javahelp-2.0.02.jar" /> - <include name="activation-1.1.jar" /> - <include name="mail-1.4.jar" /> - <include name="jxlayer-3.0.1.jar" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> -  - <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip" /> - </fileset> - - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>javax.mail:mail</exclude> - <exclude>javax.activation:activation</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>isis-fish-v3.jnlp</outputFile> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - - <sign> - <keystore>${keystorepath}</keystore> - <keypass /> - <storepass>${keystorepass}</storepass> - <storetype /> - <alias>${keystorealias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> - </configuration> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> - -</project> Copied: isis-fish/tags/isis-fish-3.2.0.7/pom.xml (from rev 2651, isis-fish/trunk/pom.xml) =================================================================== --- isis-fish/tags/isis-fish-3.2.0.7/pom.xml (rev 0) +++ isis-fish/tags/isis-fish-3.2.0.7/pom.xml 2009-09-28 16:28:35 UTC (rev 2652) @@ -0,0 +1,770 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.5</version> + </parent> + + <groupId>ifremer</groupId> + <artifactId>isis-fish</artifactId> + <version>3.2.0.7</version> + +  + <dependencies> + +  + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia-service</artifactId> + <version>${topia.service.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinmatrix</artifactId> + <version>${lutinmatrix.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinwidget</artifactId> + <version>${lutinwidget.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-validator</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinj2r</artifactId> + <version>${lutinj2r.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>jfreechart</groupId> + <artifactId>jfreechart</artifactId> + <version>0.9.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jcommon</groupId> + <artifactId>jcommon</artifactId> + <version>0.7.0</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>${xmlrpc.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>openmap</groupId> + <artifactId>openmap</artifactId> + <version>${openmap.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.fife</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.3.4</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.42</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.118</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-jdk5</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-core</artifactId> + <version>${aspectwerkz.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>ssj</groupId> + <artifactId>ssj</artifactId> + <version>2.1.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>Blas</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>colt</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>interpreter</artifactId> + <version>1.6.8</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>language</artifactId> + <version>1.6.7</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>logger</artifactId> + <version>1.6.4</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>optimization</artifactId> + <version>20081007</version> + <scope>runtime</scope> + </dependency> +  + +  + <dependency> + <groupId>org.tmatesoft</groupId> + <artifactId>svnkit</artifactId> + <version>1.2.3.5521</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.trilead</groupId> + <artifactId>trilead-ssh2</artifactId> + <version>build213-svnkit-1.2</version> + <scope>runtime</scope> + </dependency> +  + + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.15</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.cpdetector</groupId> + <artifactId>cpdetector</artifactId> + <version>1.0.7</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.6.0</version> + </dependency> + </dependencies> + +  +  +  + <name>IsisFish</name> + <description>Simulateur de pecherie complexe.</description> + <inceptionYear>1999</inceptionYear> + + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/copyleft/gpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + +  +  +  + <packaging>jar</packaging> + + <properties> +  + <labs.id>8</labs.id> + +  + <labs.project>isis-fish</labs.project> + +  + <jaxx.version>1.5.1</jaxx.version> + <topia.version>2.1.6.1</topia.version> + <topia.service.version>1.0.3</topia.service.version> + <lutinmatrix.version>1.3</lutinmatrix.version> + <lutinutil.version>1.0.6</lutinutil.version> + <i18n.version>0.9</i18n.version> + <lutinwidget.version>0.14.1</lutinwidget.version> + <generator.version>0.64</generator.version> + <lutinj2r.version>0.4</lutinj2r.version> + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> + <openmap.version>4.6.4</openmap.version> + <aspectwerkz.version>2.0</aspectwerkz.version> + <xmlrpc.version>3.1.2</xmlrpc.version> + +  + <maven.test.forkMode>once</maven.test.forkMode> + +  + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + +  + <keystorepath>${codelutin.keystorepath}</keystorepath> + <keystorealias>CodeLutin</keystorealias> + <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + + <jnlpCodebase>${project.url}</jnlpCodebase> +  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> +  + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <excludeTemplates> + <value>org.codelutin.topia.generator.EntityEnumGenerator</value> + <value>org.codelutin.topia.generator.EntityProviderGenerator</value> + </excludeTemplates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>fr.ifremer.isisfish</defaultPackage> + <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% + </copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <copyOverwrite>true</copyOverwrite> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <extraImportList>jaxx.runtime.SwingUtil</extraImportList> + <addSourcesToClassPath>true</addSourcesToClassPath> + <addProjectClassPath>true</addProjectClassPath> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + <specificGoal>parserJava</specificGoal> + <includes> + <param>**\/**UI.java</param> + </includes> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <defaultLocale>fr</defaultLocale> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6</version> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link> + <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link> + <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + </plugin> + </plugins> + </reporting> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> +  + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>JnlpSun</id> + <phase>verify</phase> + <configuration> + <tasks> + <mkdir dir="${jnlp.build.directory}" /> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> + <filter token="lib-activation" value="activation-1.1.jar" /> + <filter token="lib-mail" value="mail-1.4.jar" /> + <filter token="url" value="${jnlpCodebase}" /> + </filterset> + </copy> + <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib" value="jxlayer-3.0.1.jar" /> + <filter token="url" value="${jnlpCodebase}" /> + </filterset> + </copy> + + <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> + <fileset dir="${project.build.directory}/lib"> + <include name="javahelp-2.0.02.jar" /> + <include name="activation-1.1.jar" /> + <include name="mail-1.4.jar" /> + <include name="jxlayer-3.0.1.jar" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>JnlpToSite</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> + <fileset dir="${jnlp.build.directory}"> + <include name="**" /> + </fileset> +  + <fileset dir="target"> + <include name="${project.build.finalName}-bin.zip" /> + </fileset> + + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20090204</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + <configuration> + <force>false</force> + <dependencies> + <excludes> + <exclude>javax.help:javahelp</exclude> + <exclude>javax.mail:mail</exclude> + <exclude>javax.activation:activation</exclude> + <exclude>org.swinglabs:jxlayer</exclude> + </excludes> + </dependencies> + <libPath>lib</libPath> + <extensions> + <sun>sun.jnlp</sun> + <jxlayer>jxlayer.jnlp</jxlayer> + </extensions> + <jnlp> + <outputFile>isis-fish-v3.jnlp</outputFile> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass /> + <storepass>${keystorepass}</storepass> + <storetype /> + <alias>${keystorealias}</alias> + <validity /> + <dnameCn /> + <dnameOu /> + <dnameO /> + <dnameL /> + <dnameSt /> + <dnameC /> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + +</project>

1 0

r2651 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 16:28:31 +0000 (Mon, 28 Sep 2009) New Revision: 2651 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.2.0.7 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-09-28 15:14:37 UTC (rev 2650) +++ isis-fish/trunk/pom.xml 2009-09-28 16:28:31 UTC (rev 2651) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.7-SNAPSHOT</version> + <version>3.2.0.7</version>  <dependencies> @@ -585,9 +585,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.7</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> </scm>

1 0

r2650 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by jcouteau＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: jcouteau Date: 2009-09-28 15:14:37 +0000 (Mon, 28 Sep 2009) New Revision: 2650 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: Add getRealMinBound and getRealMaxBounf methods Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-09-28 15:03:28 UTC (rev 2649) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-09-28 15:14:37 UTC (rev 2650) @@ -33,8 +33,7 @@ * * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ */ -public class MatrixContinuousDomain extends - ContinuousDomain<MatrixND, Double> { +public class MatrixContinuousDomain extends ContinuousDomain<MatrixND, Double> { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -47,7 +46,7 @@ /** Operation. (=,+,-,/) */ protected String operator; - + /** Value used to create the matrix */ protected double value; @@ -135,9 +134,9 @@ * In continuous domain, just return identifier. */ public MatrixND getValueForIdentifier(final Serializable identifier) { - return getValueForIdentifier((Double)identifier); + return getValueForIdentifier((Double) identifier); } - + /** * {@inheritDoc}. * @@ -173,7 +172,7 @@ } return temp; } - + /** * Get value used to create the matrix. * @@ -192,7 +191,7 @@ public void setValue(Double value) { this.value = value; } - + public MatrixContinuousDomain clone() { MatrixContinuousDomain cloned = new MatrixContinuousDomain(); cloned.setCardinality(this.cardinality); @@ -204,4 +203,42 @@ cloned.setValue(this.value); return cloned; } + + /** + * Get the minimum bound of the coefficient used to create the matrix. As + * the getMinBound for use in R always return 0. + * + * @return the real minimum bound + */ + public Double getRealMinBound() { + if (operator.equals("+")) { + return (1.0 + ((1.0 + coefficient) * ((2 * 0.0 - 1)))); + } else if (operator.equals("-")) { + return (1.0 + ((1.0 - coefficient) * ((2 * 0.0 - 1)))); + } else if (operator.equals("*")) { + return (1.0 + ((1.0 * coefficient) * ((2 * 0.0 - 1)))); + } else if (operator.equals("/")) { + return (1.0 + ((1.0 / coefficient) * ((2 * 0.0 - 1)))); + } else + return null; + } + + /** + * Get the maximal bound of the coefficient used to create the matrix. As + * the getMaxBound for use in R always return 1. + * + * @return the real maximum bound + */ + public Double getRealMaxBound() { + if (operator.equals("+")) { + return (1.0 + ((1.0 + coefficient) * ((2 * 1.0 - 1)))); + } else if (operator.equals("-")) { + return (1.0 + ((1.0 - coefficient) * ((2 * 1.0 - 1)))); + } else if (operator.equals("*")) { + return (1.0 + ((1.0 * coefficient) * ((2 * 1.0 - 1)))); + } else if (operator.equals("/")) { + return (1.0 + ((1.0 / coefficient) * ((2 * 1.0 - 1)))); + } else + return null; + } }

1 0

r2649 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 15:03:28 +0000 (Mon, 28 Sep 2009) New Revision: 2649 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Log: Fix a missing hashCode in month Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-09-28 15:03:06 UTC (rev 2648) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-09-28 15:03:28 UTC (rev 2649) @@ -89,7 +89,7 @@ /** * overload to return matrix if no matrix available. The matrix returned - * by this method can't be used directly because it conatins only the + * by this method can't be used directly because it contains only the * migration (departure != arrival) and not the coefficient that stay on * the same zone. This coefficient is calculated with over coefficient to * have 1 as sum of all coefficient.

1 0

r2648 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/types src/test/java/fr/ifremer/isisfish src/test/java/fr/ifremer/isisfish/types
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 15:03:06 +0000 (Mon, 28 Sep 2009) New Revision: 2648 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java Log: Fix a missing hashCode in month Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-28 14:37:45 UTC (rev 2647) +++ isis-fish/trunk/changelog.txt 2009-09-28 15:03:06 UTC (rev 2648) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Fix a missing hashCode() problem in month (cause problem in matrixND) * Add time unit (seconds) in simulation summary * Make compilation directory per simulation (caparmor concurrency problem) * Fix plan generator was not closing database after finishing sub job Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-09-28 14:37:45 UTC (rev 2647) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-09-28 15:03:06 UTC (rev 2648) @@ -108,7 +108,18 @@ return nextMonth; } - /* (non-Javadoc) + /* + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + monthNumber; + return result; + } + + /* * @see org.codelutin.topia.persistence.TopiaEntityAbstract#equals(java.lang.Object) */ @Override @@ -123,9 +134,8 @@ return false; } + /* - * (non-Javadoc) - * * @see java.lang.Object#toString() */ @Override @@ -218,4 +228,5 @@ return result; } + } Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2009-09-28 15:03:06 UTC (rev 2648) @@ -0,0 +1,83 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.types; + +import static org.codelutin.i18n.I18n._; + +import java.util.LinkedList; +import java.util.List; + +import org.codelutin.math.matrix.MatrixFactory; +import org.codelutin.math.matrix.MatrixND; +import org.junit.Assert; +import org.junit.Test; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MonthTest { + + /** + * Test that indexOf works on list of month. + */ + @Test + public void listTest() { + + List<Month> monthList = new LinkedList<Month>(); + monthList.add(new Month(0)); + monthList.add(new Month(1)); + monthList.add(new Month(2)); + + Assert.assertTrue(monthList.contains(Month.JANUARY)); + Assert.assertFalse(monthList.contains(Month.AUGUST)); + + Assert.assertEquals(0, monthList.indexOf(Month.JANUARY)); + Assert.assertEquals(-1, monthList.indexOf(Month.AUGUST)); + } + + @Test + public void maxtrixWithMonth() { + + List<Month> monthList = new LinkedList<Month>(); + monthList.add(new Month(0)); + monthList.add(new Month(1)); + monthList.add(new Month(2)); + + List<Month> monthList2 = new LinkedList<Month>(); + monthList2.add(Month.FEBRUARY); + + MatrixND tmp = MatrixFactory.getInstance().create( + "test", + new List[] { monthList }, + new String[] { _("isisfish.populationSeasonInfo.months") }); + + MatrixND result = MatrixFactory.getInstance().create( + "test", + new List[] { monthList2 }, + new String[] { _("isisfish.populationSeasonInfo.months") }); + + tmp.pasteSemantics(result); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2647 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: jcouteau Date: 2009-09-28 14:37:45 +0000 (Mon, 28 Sep 2009) New Revision: 2647 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Make difference between MatrixConituousDomain and EquationContinuousDomain Improve R objects (better names, better attributes) Save RData the good place Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-28 13:44:54 UTC (rev 2646) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-09-28 14:37:45 UTC (rev 2647) @@ -31,6 +31,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { @@ -58,8 +60,9 @@ String bsup = "Bsup<-c(%s)"; String bsupValues = ""; String attributes = "attributes(isis.factors)<-list(%s\"nomModel\"=\"isis-fish-externeR\",names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; + String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; String attributesValues = ""; - String isisfactors = "isis.factors<-data.frame(nomFacteur,Nominal,Continu,Binf,Bsup)"; + String isisfactors = "isis.factors<-data.frame(\"nomFacteur\"=nomFacteur,\"Nominal\"=Nominal,\"Continu\"=Continu,\"Binf\"=Binf,\"Bsup\"=Bsup)"; //Create the vectors List<Factor<?, ?>> factors = plan.getFactors(); @@ -85,14 +88,49 @@ TopiaEntity entity = db.findByTopiaId(topiaId); Object value = BeanUtils.getProperty(entity, propertyName);*/ - nominalValues += 0.0; + if (factor.getDomain() instanceof MatrixContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes - //Continu values, binf values, bsup values and discrete factors attributes - if (factor.getDomain() instanceof ContinuousDomain) { + nominalValues += 1.0; + //Continu values continuValues += "TRUE"; //Binf values + + binfValues += ((MatrixContinuousDomain) factor.getDomain()) + .getRealMinBound(); + + //Bsup values + bsupValues += ((MatrixContinuousDomain) factor.getDomain()) + .getRealMaxBound(); + + } else if (factor.getDomain() instanceof EquationContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes + + nominalValues += ((EquationContinuousDomain) factor.getDomain()) + .getReferenceValue(); + + //Continu values + continuValues += "TRUE"; + + //Binf values + binfValues += ((EquationContinuousDomain) factor.getDomain()) + .getValueForIdentifier(0.0); + + //Bsup values + bsupValues += ((EquationContinuousDomain) factor.getDomain()) + .getValueForIdentifier(1.0); + } else if (factor.getDomain() instanceof ContinuousDomain) { + //Continu values, binf values, bsup values and discrete factors attributes + + nominalValues += 0.0; + + //Continu values + continuValues += "TRUE"; + + //Binf values + binfValues += ((ContinuousDomain) factor.getDomain()) .getMinBound(); @@ -101,6 +139,10 @@ .getMaxBound(); } else { + + //FIXME créer une méthode pour getNominalValue + nominalValues += ""; + //Continu values continuValues += "FALSE"; @@ -110,36 +152,17 @@ //Bsup values bsupValues += ((DiscreteDomain) factor.getDomain()).getValues() .size(); - - //Attribute values - attributesValues += "\"" + factor.getName() + "\"=list("; - Collection values = ((DiscreteDomain) factor.getDomain()) - .getValues().values(); - for (Iterator j = values.iterator(); j.hasNext();) { - attributesValues += j + ","; - j.next(); - } - attributesValues = attributesValues.substring(0, - attributesValues.length() - 1); - attributesValues += "),"; } - if (attributesValues.length() != 0) { - attributesValues = attributesValues.substring(0, - attributesValues.length() - 1); - attributesValues += ","; - } - } String Rcall = ""; REngine engine = new RProxy(); try { - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); - log.info("load(\".RData\")"); - engine.voidEval("load(\".RData\")"); + //clear the engine (to be sure it's empty) + log.info("rm(list=ls())"); + engine.voidEval("rm(list=ls())"); Rcall = String.format(nomFacteur, factorNames); log.info(Rcall); @@ -164,13 +187,43 @@ log.info(isisfactors); engine.voidEval(isisfactors); - Rcall = String.format(attributes, attributesValues); + Rcall = String.format(attribute, "nomModel", "isis-fish-externeR"); log.info(Rcall); engine.voidEval(Rcall); - log.info("save.image()"); - engine.voidEval("save.image()"); + for (int i = 0; i < factors.size(); i++) { + Factor factor = factors.get(i); + if (factor.getDomain() instanceof DiscreteDomain) { + String attributeValues = "list("; + Collection values = ((DiscreteDomain) factor.getDomain()) + .getValues().values(); + for (Iterator j = values.iterator(); j.hasNext();) { + attributeValues += j + ","; + j.next(); + } + attributeValues = attributeValues.substring(0, + attributeValues.length() - 1); + attributeValues += ")"; + Rcall = String.format(attribute, factor.getName(), + attributeValues); + log.info(Rcall); + engine.voidEval(Rcall); + } + } + + //Set working directory to save the Isis R session + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + + log.info("save.image(file=\"" + outputdirectory.getName() + ".RData\")"); + engine.voidEval("save.image(file=\"" + outputdirectory.getName() + + ".RData\")"); + } catch (RException eee) { if (log.isErrorEnabled()) { log.error("R evaluation failed", eee);

1 0

r2646 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 13:44:54 +0000 (Mon, 28 Sep 2009) New Revision: 2646 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Make a isis build directory per simulation, and remove it at simulation end. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/changelog.txt 2009-09-28 13:44:54 UTC (rev 2646) @@ -1,5 +1,9 @@ isis-fish (3.2.0.7) stable; urgency=low + * Add time unit (seconds) in simulation summary + * Make compilation directory per simulation (caparmor concurrency problem) + * Fix plan generator was not closing database after finishing sub job + * Delete remote launcher result archive after use * Modify analyze plans starting to take extra rules * Set ssh key in autorized_keys when connected with password * Isis now start with 1Go of allocated memory Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-09-28 13:44:54 UTC (rev 2646) @@ -48,6 +48,7 @@ import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; @@ -235,13 +236,24 @@ * * Create directory if not exists. * + * Make a specific build directory for running simulation. + * * @return compilation directory */ public File getCompileDirectory() { File result = getOptionAsFile(Option.COMPILATION_DIRECTORY.key); + + // add a subdirectory for simulation context + SimulationContext simContext = SimulationContext.get(); + SimulationControl control = simContext.getSimulationControl(); + if (control != null) { + result = new File(result, control.getId()); + } + if (!result.exists()) { result.mkdirs(); } + return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-28 13:44:20 UTC (rev 2645) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-09-28 13:44:54 UTC (rev 2646) @@ -465,6 +465,13 @@ simulation.getInformation().setOptimizationUsage(cache); } + // cleanup specific context build directory + File simulationBuildDirectory = IsisFish.config.getCompileDirectory(); + if (log.isDebugEnabled()) { + log.debug("Delete simulation build directory : " + simulationBuildDirectory.getAbsolutePath()); + } + FileUtil.deleteRecursively(simulationBuildDirectory); + // context is used in Trace.printStatistiqueAndClear() SimulationContext.remove(); }

1 0

r2645 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org Sept. 28, 2009

Sept. 28, 2009

Author: chatellier Date: 2009-09-28 13:44:20 +0000 (Mon, 28 Sep 2009) New Revision: 2645 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java Log: Add timeunit in simulation summary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-28 12:09:13 UTC (rev 2644) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-28 13:44:20 UTC (rev 2645) @@ -118,7 +118,7 @@ + entry.getKey() + " : " + DurationFormatUtils.formatDuration(entry.getValue(), - "s'.'S") + "\n"; + "s'.'S") + "s\n"; } } @@ -157,7 +157,7 @@ if (total > 0) { result += "\t" + ruleName + " : " + DurationFormatUtils.formatDuration(total, "s'.'S"); - result += " (" + details + ")"; + result += "s (" + details + ")"; result += "\n"; } }

1 0