Author: tchemit Date: 2009-10-01 22:54:16 +0200 (Thu, 01 Oct 2009) New Revision: 1544 Modified: trunk/jaxx-example/pom.xml Log: simplification de la configuration webstart (voir mavenpom) Modified: trunk/jaxx-example/pom.xml =================================================================== --- trunk/jaxx-example/pom.xml 2009-10-01 13:36:43 UTC (rev 1543) +++ trunk/jaxx-example/pom.xml 2009-10-01 20:54:16 UTC (rev 1544) @@ -67,17 +67,6 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - - <!-- jnlp --> - <keystorepath>${nuiton.keystorepath}</keystorepath> - <keystorealias>${nuiton.keystorealias}</keystorealias> - <keystorepass>${nuiton.keystorepass}</keystorepass> - - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - - <jnlp.url>${project.url}</jnlp.url> - <!--<jnlp.url>file://${basedir}/target/jnlp</jnlp.url>--> - </properties> <build> @@ -111,54 +100,32 @@ </archive> </configuration> </plugin> - + <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>launch-demo.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> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <includes> + <include>javax.help:javahelp</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer </title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + <!--<sign> + <verify>false</verify> + </sign>--> </configuration> </plugin> @@ -204,15 +171,18 @@ </executions> </plugin> + </plugins> + </build> + + <reporting> + <plugins> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> </plugin> - </plugins> - </build> + </reporting> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> @@ -230,90 +200,46 @@ </activation> <build> <plugins> + <!-- key store secrets availables --> <plugin> - - <artifactId>maven-antrun-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> - <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> <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" value="javahelp-${javahelp.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </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-${jxlayer.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-${javahelp.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - <copy file="${project.build.directory}/lib/jxlayer-${jxlayer.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - </tasks> - </configuration> + <id>get-jnlp-keystore</id> <goals> - <goal>run</goal> + <goal>share-server-secret</goal> </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> + <phase>package</phase> <configuration> - <tasks> - <mkdir dir="target/site" /> - <copy todir="target/site" verbose="${maven.verbose}" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> - </copy> - </tasks> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> </configuration> - <goals> - <goal>run</goal> - </goals> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> <execution> - <phase>package</phase> + <id>get-jnlp-key</id> <goals> - <goal>jnlp-inline</goal> + <goal>share-server-secret</goal> </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin> - </plugins> - </build> - </profile> - - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>webstart-profile</id> - <activation> - <property> - <name>doWebstart</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - + + <!-- make webstart --> <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> + <id>generate-jnlp</id> <phase>package</phase> <goals> <goal>jnlp-inline</goal> @@ -321,59 +247,6 @@ </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>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" value="javahelp-${javahelp.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </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-${jxlayer.version}.jar" /> - <filter token="url" value="${jnlp.url}" /> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-${javahelp.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - <copy file="${project.build.directory}/lib/jxlayer-${jxlayer.version}.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="target/site" /> - <copy todir="target/site" verbose="${maven.verbose}" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> </profile>