Author: tchemit Date: 2009-02-04 00:32:33 +0000 (Wed, 04 Feb 2009) New Revision: 1783 Modified: isis-fish/trunk/pom.xml Log: - nettoayge pom - utilisation nouveau patch pour le plugin webstart (on peut tester localement le jnlp via la variable jnlpCodebase). (par contre probleme de chargement de region, le fameux NPE dans la migration : encore un probleme de lutinutil Resource je pense...) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 22:29:34 UTC (rev 1782) +++ isis-fish/trunk/pom.xml 2009-02-04 00:32:33 UTC (rev 1783) @@ -349,7 +349,7 @@ <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> + <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version> <openmap.version>4.6.4</openmap.version> @@ -361,6 +361,10 @@ <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + + <!--jnlpCodebase>${project.url}</jnlpCodebase--> + <!-- to test jnlp file locally --> + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> </properties> <build> @@ -433,33 +437,6 @@ </configuration> </execution> </executions> - <!--dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>${lutinwidget.version}</version> - </dependency> - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>jfreechart</groupId> - <artifactId>jfreechart</artifactId> - <version>0.9.3</version> - </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinmatrix</artifactId> - <version>${lutinmatrix.version}</version> - </dependency> - <dependency> - <groupId>openmap</groupId> - <artifactId>openmap</artifactId> - <version>${openmap.version}</version> - </dependency> - </dependencies--> </plugin> <plugin> @@ -524,7 +501,6 @@ <executions> <execution> <id>copy-dependencies</id> - <!--phase>package</phase--> </execution> </executions> <configuration> @@ -538,7 +514,6 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <!--mainClass>${maven.jar.main.class}</mainClass--> <classpathPrefix>./lib/</classpathPrefix> </manifest> </archive> @@ -546,16 +521,7 @@ </plugin> </plugins> - <!--pluginManagement> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - </configuration> - </plugin> - </plugins> - </pluginManagement--> + </build> <!-- ************************************************************* --> @@ -615,7 +581,7 @@ <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}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" @@ -623,7 +589,7 @@ todir="${jnlp.build.directory}" failonerror="false"> <filterset> <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${project.url}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> @@ -649,13 +615,13 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> + <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 ? --> + <!-- should be better to use the deployed assembly in lutinbuilder ? --> <fileset dir="target"> <include name="${project.build.finalName}-bin.zip"/> </fileset> @@ -672,7 +638,7 @@ <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20081018</version> + <version>1.0-alpha-2-cl_20090204</version> <executions> <execution> <phase>verify</phase> @@ -728,49 +694,6 @@ </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> - <tasks> - <exec executable="${project.basedir}/doc/manual/prepareManual.sh" - dir="${project.basedir}/doc/manual/"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin--> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-3</version> @@ -789,62 +712,6 @@ </executions> </plugin> - <!-- Java Web Start --> - <!-- Creation du fichier principal jnlp sans les libs signees par Sun --> - <!--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> - <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>${maven.jar.main.class}</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--> - </plugins> </build> </profile>