Author: tchemit Date: 2009-02-03 22:29:34 +0000 (Tue, 03 Feb 2009) New Revision: 1782 Added: isis-fish/trunk/src/main/jnlp/ isis-fish/trunk/src/main/jnlp/jxlayer.jnlp isis-fish/trunk/src/main/jnlp/sun.jnlp Removed: isis-fish/trunk/src/main/resources/jnlp/sun.jnlp Modified: isis-fish/trunk/pom.xml Log: preparation release lutinproject 3.4 reusinage de webstart Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 16:44:23 UTC (rev 1781) +++ isis-fish/trunk/pom.xml 2009-02-03 22:29:34 UTC (rev 1782) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>ifremer</groupId> @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>${lutinutil.version}</version> <scope>compile</scope> </dependency> @@ -152,7 +152,7 @@ <version>3.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> @@ -166,7 +166,7 @@ <version>3.1</version> <scope>runtime</scope> </dependency> - + <!-- encore utilise pour les pre-scripts --> <dependency> <groupId>org.beanshell</groupId> @@ -341,21 +341,26 @@ <!-- nom du projet du labs --> <labs.project>isis-fish</labs.project> + <maven.test.forkMode>once</maven.test.forkMode> + <!-- Custom version --> <jaxx.version>1.1-SNAPSHOT</jaxx.version> <generator.version>0.63</generator.version> - <topia.version>2.1.1</topia.version> - <lutinwidget.version>0.12</lutinwidget.version> + <topia.version>2.1.3-SNAPSHOT</topia.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> + <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> + <lutinwidget.version>0.12</lutinwidget.version> + <generator.version>0.64-SNAPSHOT</generator.version> <openmap.version>4.6.4</openmap.version> <!--Main class in JAR --> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <!-- jnlp --> - <keystorepath>../../../CodeLutinKeystore</keystorepath> + <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> </properties> <build> @@ -363,11 +368,11 @@ <!-- Sans le forkMode one, les classpath sont mauvais --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + </configuration> </plugin> <plugin> @@ -460,7 +465,17 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir> @@ -482,11 +497,34 @@ </executions> </plugin> + <!-- Always process jrst files, but only called on pre-site phase --> <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <id>copy-dependencies</id> + <!--phase>package</phase--> </execution> </executions> <configuration> @@ -500,7 +538,7 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> + <!--mainClass>${maven.jar.main.class}</mainClass--> <classpathPrefix>./lib/</classpathPrefix> </manifest> </archive> @@ -508,6 +546,16 @@ </plugin> </plugins> + <!--pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + </configuration> + </plugin> + </plugins> + </pluginManagement--> </build> <!-- ************************************************************* --> @@ -531,34 +579,183 @@ <build> <plugins> + <!-- always add license and third-party files to classpath --> <plugin> - <!-- todo utiliser ce qui a ete refait dans observe ou jaxx par exemple --> + <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>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </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> + <phase>verify</phase> <configuration> <tasks> - <copy file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> + <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="mail" value="mail-1.4.jar"/> - <filter token="activation" value="activation-1.1.jar"/> + <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="${project.url}"/> </filterset> </copy> - <copy file="${project.build.directory}/lib/mail-1.4.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - <copy file="${project.build.directory}/lib/activation-1.1.jar" - todir="${project.basedir}/target/resources/jnlp/"/> + <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="${project.url}"/> + </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> + + <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> + <!-- should be better to use the deployed jnlp in lutinbuilder ? --> + <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_20081018</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> + + + <!--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}/lib/mail-1.4.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/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> @@ -570,9 +767,9 @@ <goals> <goal>run</goal> </goals> - </execution--> + </execution> </executions> - </plugin> + </plugin--> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -594,7 +791,7 @@ <!-- Java Web Start --> <!-- Creation du fichier principal jnlp sans les libs signees par Sun --> - <plugin> + <!--plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>1.0-alpha-2-cl_20081018</version> @@ -613,9 +810,9 @@ <exclude>javax.activation:activation</exclude> </excludes> </dependencies> - <jnlp> - <!--<resources>${project.basedir}/src/jnlp</resources>--> - <outputFile>isis-fish-v3.jnlp</outputFile> + <jnlp--> + <!--<resources>${project.basedir}/src/jnlp</resources>--> + <!--outputFile>isis-fish-v3.jnlp</outputFile> <mainClass>${maven.jar.main.class}</mainClass> </jnlp> @@ -646,7 +843,7 @@ <gzip>true</gzip> <verbose>false</verbose> </configuration> - </plugin> + </plugin--> </plugins> </build> Added: isis-fish/trunk/src/main/jnlp/jxlayer.jnlp =================================================================== --- isis-fish/trunk/src/main/jnlp/jxlayer.jnlp (rev 0) +++ isis-fish/trunk/src/main/jnlp/jxlayer.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="jxlayer.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Copied: isis-fish/trunk/src/main/jnlp/sun.jnlp (from rev 1781, isis-fish/trunk/src/main/resources/jnlp/sun.jnlp) =================================================================== --- isis-fish/trunk/src/main/jnlp/sun.jnlp (rev 0) +++ isis-fish/trunk/src/main/jnlp/sun.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="sun.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib-mail@"/> + <jar href="lib/@lib-activation@"/> + <jar href="lib/@lib-javahelp@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Property changes on: isis-fish/trunk/src/main/jnlp/sun.jnlp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/resources/jnlp/sun.jnlp =================================================================== --- isis-fish/trunk/src/main/resources/jnlp/sun.jnlp 2009-02-03 16:44:23 UTC (rev 1781) +++ isis-fish/trunk/src/main/resources/jnlp/sun.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="sun.jnlp"> - <information> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <offline-allowed /> - </information> - <resources> - -<jar href="@mail@"/> -<jar href="@activation@"/> - - </resources> - <component-desc/> -</jnlp> \ No newline at end of file