Author: tchemit Date: 2008-10-07 16:17:27 +0000 (Tue, 07 Oct 2008) New Revision: 1525 Modified: isis-fish/branches/arbo-maven/changelog isis-fish/branches/arbo-maven/pom.xml Log: refactor pom + update changelog Modified: isis-fish/branches/arbo-maven/changelog =================================================================== --- isis-fish/branches/arbo-maven/changelog 2008-10-07 15:32:45 UTC (rev 1524) +++ isis-fish/branches/arbo-maven/changelog 2008-10-07 16:17:27 UTC (rev 1525) @@ -1,3 +1,9 @@ +isis-fish (3.2.0.1) chemit + + * use maven 2 directory layout + * use org.codelutin:lutinproject 3.0 + * passageto UTF-8 + isis-fish (3.2.0.0) poussin * complete refactoring option, vcs Modified: isis-fish/branches/arbo-maven/pom.xml =================================================================== --- isis-fish/branches/arbo-maven/pom.xml 2008-10-07 15:32:45 UTC (rev 1524) +++ isis-fish/branches/arbo-maven/pom.xml 2008-10-07 16:17:27 UTC (rev 1525) @@ -3,501 +3,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> <version>3.0</version> </parent> - <!--A unique name for this project--> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <name>IsisFish</name> - <!--ejb, jar, war...--> - <packaging>jar</packaging> - - <!--Version--> - <version>3.2.0.0-SNAPSHOT</version> - - <!--Description--> - <description>Simulateur de pecherie complexe.</description> - <inceptionYear>1999</inceptionYear> - - <!--Tracking--> - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> - </issueManagement> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/copyleft/gpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <distributionManagement> - <site> - <id>labs</id> - <url> - scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/ - </url> - </site> - </distributionManagement> - - <scm> - <url> - http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=${pom.artifactId} - </url> - <connection> - scm:cvs:pserver:anonymous at cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </connection> - <developerConnection> - scm:cvs:ext:${username}@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </developerConnection> - </scm> - - <build> - <plugins> - <!--<plugin>--> - <!--<groupId>lutinplugin</groupId>--> - <!--<artifactId>maven-jrst-plugin</artifactId>--> - <!--<version>0.8</version>--> - <!--<executions>--> - <!--<execution>--> - <!--<id>jrst</id>--> - <!--<phase>test</phase> --> - <!-- test works better than pre:site --> - <!--<goals>--> - <!--<goal>jrst</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> - <!--<configuration>--> - <!--<directoryIn>${basedir}/src/site</directoryIn>--> - <!--<directoryOut>${basedir}/target/generated-site/xdoc</directoryOut>--> - <!--<verbose>${maven.verbose}</verbose>--> - <!--</configuration>--> - <!--</plugin>--> - - <!--plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputEncoding>ISO-8859-1</outputEncoding> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - <generateReports>false</generateReports> - <xdocDirectory>${basedir}/target/generated-site/xdoc/fr/rst</xdocDirectory> - </configuration> - </plugin--> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <link>http://java.sun.com/j2se/api/index.html</link> - <link> - http://topia.labs.libre-entreprise.org/apidocs/ - </link> - <link> - http://lutinmatrix.labs.libre-entreprise.org/apidocs/ - </link> - <link> - http://lutinutil.labs.libre-entreprise.org/apidocs/ - </link> - <minmemory>128m</minmemory> - <maxmemory>512</maxmemory> - <excludePackageNames> - fr.*:org.* - </excludePackageNames> - </configuration> - </plugin> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>changelog-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>changes-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jxr-maven-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-clover-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetjdk>1.5</targetjdk> - <rulesets> - <ruleset>/rulesets/basic.xml</ruleset> - <ruleset>/rulesets/controversial.xml</ruleset> - </rulesets> - <format>xml</format> - <linkXref>true</linkXref> - <minimumTokens>100</minimumTokens> - </configuration> - </plugin> - --> - <!--Attaching processor plugin to the Build Lifecycle--> -<!-- <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-processor-plugin</artifactId> -<! - - - <version>0.12</version> -- - > - <executions> - <execution> - <id>Processor</id> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <srcDir>${basedir}/src</srcDir> - <destDir>${maven.src.dir}</destDir> - <! - -destDir>${basedir}/target/src-build</destDir - - > - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> --> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>src/main/xmi</srcDirZuml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> - <fullPackagePath> - fr.ifremer.isisfish - </fullPackagePath> - <extractedPackages> - fr.ifremer.isisfish - </extractedPackages> - <!--Config generator--> - <srcGenDest> - target/generated-sources/objectmodel/ - </srcGenDest> - <includes>**/*.objectmodel</includes> - <templates> - org.codelutin.topia.generator.TopiaMetaGenerator - </templates> - <destDirGen>target/generated-sources/java</destDirGen> - <defaultPackage> - fr.ifremer.isisfish - </defaultPackage> - - <copyVersionDir> - 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</groupId> - <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> -<!-- - <version>[0.2,]</version> ---> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <src>src/main/uimodel</src> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> - <scope>compile</scope> - </dependency> -<!-- - <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <scope>compile</scope> - <version>1.1.0</version> - </dependency> ---> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - <version>0.5-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>CopyGenJavaVersSrcBuild</id> - <phase>process-sources</phase> - <configuration> - <tasks> - <copy - todir="${basedir}/target/generated-sources/java" - verbose="${maven.verbose}" - overwrite="false"> - <fileset - dir="${basedir}/target/generated-sources/java"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> - <execution> - <id>JnlpSun</id> - <phase>package</phase> - <configuration> - <tasks> - <copy - file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> - <filterset> - <filter token="mail" - value="mail-1.3.3.jar"/> - <filter token="activation" - value="activation-1.0.2.jar"/> - </filterset> - </copy> - <copy - file="${project.build.directory}/dependency/mail-1.3.3.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - <copy - file="${project.build.directory}/dependency/activation-1.0.2.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <!--execution> - <id>MakeManualScreenShots</id> - <phase>package</phase> - <configuration> - <tasks> - <exec executable="${project.basedir}/doc/manual/prepareManual.sh" - dir="${project.basedir}/doc/manual/"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution--> - </executions> - </plugin> - - <!-- Java Web Start --> - <!-- Creation du fichier principal jnlp sans les libs signees par Sun --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-1</version> - <executions> - <execution> - <phase>deploy</phase> - <goals> - <goal>jnlp</goal> - </goals> - </execution> - </executions> - <configuration> - <dependencies> - <excludes> - <exclude>javax.mail:mail</exclude> - <exclude> - javax.activation:activation - </exclude> - </excludes> - </dependencies> - <jnlp> - <!--<resources>${project.basedir}/src/jnlp</resources>--> - <outputFile>isis-fish-v3.jnlp</outputFile> - <mainClass> - fr.ifremer.isisfish.IsisFish - </mainClass> - </jnlp> - - <sign> - <keystore>${keystorepath}</keystore> - <keypass/> - <storepass>${keystorepass}</storepass> - <storetype/> - <alias>${keystorealias}</alias> - <validity/> - - <dnameCn/> - <dnameOu/> - <dnameO/> - <dnameL/> - <dnameSt/> - <dnameC/> - - <verify>true</verify> - </sign> - - <keystore> - <delete>false</delete> - <gen>false</gen> - </keystore> - - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> -<!-- <executions> - <execution> - <id>copy-dependencies</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/dependency - </outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots> - false - </overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> --> - </plugin> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir> - ${maven.gen.dir}/java/ - </basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/*Option*.java</param> - <param>**\/*Config*.java</param> - <param>**\/*UI.java</param> - </includes> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass> - fr.ifremer.isisfish.IsisFish - </mainClass> - <!-- <manifestFile>/path/to/MANIFEST.MF</manifestFile> --> - <addClasspath>true</addClasspath> - <addExtensions/> - <classpathPrefix/> - <!-- - <manifestEntries> - <Class-Path>./</Class-Path> - </manifestEntries> - --> - </manifest> - </archive> - </configuration> - </plugin> - - </plugins> - </build> - - - <!--Librairies--> + <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>jdesktop</groupId> <artifactId>jdic</artifactId> <version>20061102</version> @@ -584,18 +107,10 @@ </dependency> --> <!--Jaxx--> -<!-- <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <version>1.1.0</version> - <scope>compile</scope> - </dependency> ---> - <dependency> <groupId>org.codelutin</groupId> <artifactId>jaxx-core</artifactId> - <version>0.5-SNAPSHOT</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> @@ -936,6 +451,346 @@ </dependencies> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>IsisFish</name> + <version>3.2.0.0-SNAPSHOT</version> + <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> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>jar</packaging> + + <properties> + <!-- id du projet du labs --> + <labs.id>8</labs.id> + <!--labs.project>isis-fish</labs.project--> + <!-- current version --> + <current.version>3.2.0.0-SNAPSHOT</current.version> + + <jaxx.version>0.5-SNAPSHOT</jaxx.version> + + <!--Main class in JAR --> + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + + <!-- for the moment skip tests --> + <maven.test.skip>true</maven.test.skip> + + <!-- jnlp --> + <keystorepath>../../../CodeLutinKeystore</keystorepath> + <keystorealias>CodeLutin</keystorealias> + <keystorepass>codelutin</keystorepass> + + </properties> + + <build> + <plugins> + + <!--Attaching processor plugin to the Build Lifecycle--> +<!-- <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-processor-plugin</artifactId> +<! - - + <version>0.12</version> +- - > + <executions> + <execution> + <id>Processor</id> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <srcDir>${basedir}/src</srcDir> + <destDir>${maven.src.dir}</destDir> + <! - -destDir>${basedir}/target/src-build</destDir - - > + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> --> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>0.51-SNAPSHOT</version> + <executions> + <execution> + <id>Generator</id> + <phase>process-sources</phase> + <configuration> + <srcDirZuml>src/main/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <!--Config generator--> + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>fr.ifremer.isisfish</defaultPackage> + <copyVersionDir>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</groupId> + <artifactId>topia</artifactId> + <version>2.0.27-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <!--phase>generate-sources</phase--> + <goals> + <goal>generate</goal> + </goals> + <!--configuration> + <src>src/main/uimodel</src> + </configuration--> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> + <execution> + <id>JnlpSun</id> + <phase>package</phase> + <configuration> + <tasks> + <copy + file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" + todir="${project.basedir}/target/resources/jnlp/"> + <filterset> + <filter token="mail" value="mail-1.4.jar"/> + <filter token="activation" value="activation-1.1.jar"/> + </filterset> + </copy> + <copy + file="${project.build.directory}/dependency/mail-1.4.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + <copy + file="${project.build.directory}/dependency/activation-1.1.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <!--execution> + <id>MakeManualScreenShots</id> + <phase>package</phase> + <configuration> + <tasks> + <exec executable="${project.basedir}/doc/manual/prepareManual.sh" + dir="${project.basedir}/doc/manual/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution--> + </executions> + </plugin> + + <!-- Java Web Start --> + <!-- Creation du fichier principal jnlp sans les libs signees par Sun --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-1</version> + <executions> + <execution> + <phase>deploy</phase> + <goals> + <goal>jnlp</goal> + </goals> + </execution> + </executions> + <configuration> + <dependencies> + <excludes> + <exclude>javax.mail:mail</exclude> + <exclude> + javax.activation:activation + </exclude> + </excludes> + </dependencies> + <jnlp> + <!--<resources>${project.basedir}/src/jnlp</resources>--> + <outputFile>isis-fish-v3.jnlp</outputFile> + <mainClass> + fr.ifremer.isisfish.IsisFish + </mainClass> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass/> + <storepass>${keystorepass}</storepass> + <storetype/> + <alias>${keystorealias}</alias> + <validity/> + + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> + + <verify>true</verify> + </sign> + + <keystore> + <delete>false</delete> + <gen>false</gen> + </keystore> + + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> +<!-- <executions> + <execution> + <id>copy-dependencies</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory> + ${project.build.directory}/dependency + </outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots> + false + </overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> --> + </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + <specificGoal>parserJava</specificGoal> + <!--includes> + <param>**\/*UI.java</param> + </includes--> + <excludes> + <param>fr\/ifremer\/isisfish\/entities\/**a</param> + </excludes> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass> + fr.ifremer.isisfish.IsisFish + </mainClass> + <!-- <manifestFile>/path/to/MANIFEST.MF</manifestFile> --> + <addClasspath>true</addClasspath> + <addExtensions/> + <classpathPrefix/> + <!-- + <manifestEntries> + <Class-Path>./</Class-Path> + </manifestEntries> + --> + </manifest> + </archive> + </configuration> + </plugin> + + </plugins> + </build> + + + <!--Librairies--> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + <!-- | | P L A T E F O R M S P E C I F I C D E P E N D E N C I E S @@ -957,32 +812,6 @@ <family>windows</family> </os> </activation> - <properties> - <!--Source base dir--> - <maven.src.dir> - ${basedir}/target/generated-sources - </maven.src.dir> - - <!--Test--> - <maven.test.skip>true</maven.test.skip> - - <!--Compile with ?--> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - - <!--Main class in JAR --> - <maven.jar.main.class> - fr.ifremer.isisfish.IsisFish - </maven.jar.main.class> - - <!--Verbose--> - <maven.verbose>false</maven.verbose> - - <!-- jnlp --> - <keystorepath>../../../CodeLutinKeystore</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - </properties> <dependencies> <dependency> <groupId>jdesktop</groupId> @@ -997,33 +826,7 @@ <os> <family>unix</family> </os> - </activation> - <properties> - <!--Source base dir--> - <maven.src.dir> - ${basedir}/target/generated-sources - </maven.src.dir> - - <!--Test--> - <maven.test.skip>true</maven.test.skip> - - <!--Compile with ?--> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - - <!--Main class in JAR --> - <maven.jar.main.class> - fr.ifremer.isisfish.IsisFish - </maven.jar.main.class> - - <!--Verbose--> - <maven.verbose>false</maven.verbose> - - <!-- jnlp --> - <keystorepath>../../../CodeLutinKeystore</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - </properties> + </activation> <dependencies> <dependency> <groupId>jdesktop</groupId>