Author: tchemit Date: 2008-10-16 15:02:52 +0000 (Thu, 16 Oct 2008) New Revision: 936 Added: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/images/Validation-screenshot.png lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-example/src/main/jnlp/jxlayer.jnlp lutinjaxx/trunk/jaxx-example/src/site/resources/ lutinjaxx/trunk/jaxx-example/src/site/resources/jaxx.png Removed: lutinjaxx/trunk/jaxx-example/Calculator/src/main/jnlp/ lutinjaxx/trunk/jaxx-example/Components/src/main/jnlp/ lutinjaxx/trunk/jaxx-example/Counter/src/main/jnlp/ lutinjaxx/trunk/jaxx-example/LabelStyle/src/main/jnlp/ lutinjaxx/trunk/jaxx-example/Validation/src/main/jnlp/ lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/Validation.jaxx.rst lutinjaxx/trunk/jaxx-example/src/main/jnlp/template.vm Modified: lutinjaxx/trunk/jaxx-example/ lutinjaxx/trunk/jaxx-example/Calculator/pom.xml lutinjaxx/trunk/jaxx-example/Calculator/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-example/Components/pom.xml lutinjaxx/trunk/jaxx-example/Components/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-example/Counter/pom.xml lutinjaxx/trunk/jaxx-example/Counter/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-example/LabelStyle/pom.xml lutinjaxx/trunk/jaxx-example/LabelStyle/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-example/Validation/pom.xml lutinjaxx/trunk/jaxx-example/pom.xml lutinjaxx/trunk/jaxx-example/src/main/jnlp/sun.jnlp Log: make examples works :) Property changes on: lutinjaxx/trunk/jaxx-example ___________________________________________________________________ Name: svn:ignore - target + target velocity.log Modified: lutinjaxx/trunk/jaxx-example/Calculator/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/Calculator/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Calculator/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -18,24 +18,13 @@ <groupId>org.codelutin.jaxx-example</groupId> <artifactId>Calculator</artifactId> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> - <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>Calculator example</name> - <version>0.5-SNAPSHOT</version> + <!--version>0.5-SNAPSHOT</version--> <inceptionYear>2008</inceptionYear> <description>Jaxx Calculator example</description> - <!--url>${example.home.url}</url--> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -44,33 +33,11 @@ <packaging>jar</packaging> <build> - <finalName>${project.artifactId}</finalName> <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - - <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> </plugins> </build> @@ -82,4 +49,5 @@ <developerConnection>${scm.developerConnection.example}</developerConnection> <url>${scm.url.example}</url> </scm> + </project> \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-example/Calculator/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-example/Calculator/src/site/fr/rst/index.rst 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Calculator/src/site/fr/rst/index.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -27,4 +27,4 @@ .. |webstart| image:: images/webstart.gif -.. _following link: bin/launch-Calculator.jnlp +.. _following link: ./launch-Calculator.jnlp Modified: lutinjaxx/trunk/jaxx-example/Components/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/Components/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Components/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -18,16 +18,6 @@ <groupId>org.codelutin.jaxx-example</groupId> <artifactId>Components</artifactId> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> - <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> @@ -35,7 +25,6 @@ <version>0.5-SNAPSHOT</version> <inceptionYear>2008</inceptionYear> <description>Jaxx Components example</description> - <url>${example.home.url}</url> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -44,34 +33,11 @@ <packaging>jar</packaging> <build> - <finalName>${project.artifactId}</finalName> <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> - - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> </plugin> - </plugins> </build> </project> \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-example/Components/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-example/Components/src/site/fr/rst/index.rst 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Components/src/site/fr/rst/index.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -30,4 +30,4 @@ .. |webstart| image:: images/webstart.gif -.. _following link: bin/launch-Components.jnlp +.. _following link: ./launch-Components.jnlp Modified: lutinjaxx/trunk/jaxx-example/Counter/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/Counter/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Counter/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -18,23 +18,13 @@ <groupId>org.codelutin.jaxx-example</groupId> <artifactId>Counter</artifactId> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>Counter example</name> - <version>0.5-SNAPSHOT</version> + <!--version>0.5-SNAPSHOT</version--> <inceptionYear>2008</inceptionYear> <description>Jaxx Counter example</description> - <!--url>${example.home.url}</url--> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -43,34 +33,11 @@ <packaging>jar</packaging> <build> - <finalName>${project.artifactId}</finalName> <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - - <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> </build> Modified: lutinjaxx/trunk/jaxx-example/Counter/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-example/Counter/src/site/fr/rst/index.rst 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Counter/src/site/fr/rst/index.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -25,4 +25,4 @@ .. |webstart| image:: images/webstart.gif -.. _following link: http://buix.labs.libre-entreprise.org/lutinjaxx/maven-jaxx-plugin/examples/l... \ No newline at end of file +.. _following link: ./launch-Counter.jnlp \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-example/LabelStyle/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/LabelStyle/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/LabelStyle/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -18,15 +18,6 @@ <groupId>org.codelutin.jaxx-example</groupId> <artifactId>LabelStyle</artifactId> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> @@ -34,7 +25,6 @@ <version>0.5-SNAPSHOT</version> <inceptionYear>2008</inceptionYear> <description>Jaxx LabelStyle example</description> - <url>${example.home.url}</url> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -43,33 +33,11 @@ <packaging>jar</packaging> <build> - <finalName>${project.artifactId}</finalName> <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - - <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> </plugins> </build> Modified: lutinjaxx/trunk/jaxx-example/LabelStyle/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-example/LabelStyle/src/site/fr/rst/index.rst 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/LabelStyle/src/site/fr/rst/index.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -25,4 +25,4 @@ .. |webstart| image:: images/webstart.gif -.. _following link: http://buix.labs.libre-entreprise.org/lutinjaxx/maven-jaxx-plugin/examples/l... +.. _following link: ./launch-LabelStyle.jnlp Modified: lutinjaxx/trunk/jaxx-example/Validation/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/Validation/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Validation/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -18,24 +18,13 @@ <groupId>org.codelutin.jaxx-example</groupId> <artifactId>Validation</artifactId> - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jaxx-core</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> - <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Validattion example</name> + <name>Validation example</name> <version>0.5-SNAPSHOT</version> <inceptionYear>2008</inceptionYear> - <description>Jaxx Validattion (with xwork validation) example</description> - <!--url>${example.home.url}</url--> + <description>Jaxx Validation (with xwork validation) example</description> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -43,98 +32,15 @@ <packaging>jar</packaging> - <properties> - <maven.jar.main.class>examples.${project.artifactId}.${project.artifactId}</maven.jar.main.class> - </properties> <build> - <finalName>${project.artifactId}</finalName> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <configuration> - <src>${basedir}/src/main/java</src> - <force>true</force> - </configuration> - <dependencies> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.1</version> - </dependency> - </dependencies> - <!--executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions--> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> + <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> </build> - <!--repositories> - <repository> - <id>dowload-javanet-repository</id> - <name>JavaNetRepository</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories--> - <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> Deleted: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/Validation.jaxx.rst =================================================================== --- lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/Validation.jaxx.rst 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/Validation.jaxx.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -1,28 +0,0 @@ -===================== -Examples/LabelStyles2 -===================== - -This example program creates a number of components which are used to control the appearance of a JLabel. -Everything is performed through data binding; there are no script tags or explicit event handlers anywhere. - -Screen shot ------------ - -.. image:: images/Validation-screenshot.gif - -Set it in action ----------------- - -|webstart| - -To run this example in `Java Web Start`_, click the `following link`_. - - -Source code ------------ - -.. _Java Web Start: http://java.sun.com/products/javawebstart/ - -.. |webstart| image:: images/webstart.png - -.. _following link: http://buix.labs.libre-entreprise.org/lutinjaxx/maven-jaxx-plugin/examples/l... Copied: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/images/Validation-screenshot.png (from rev 927, lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/images/Validation-screenshot.jaxx.png) =================================================================== (Binary files differ) Property changes on: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/images/Validation-screenshot.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/index.rst (from rev 927, lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/Validation.jaxx.rst) =================================================================== --- lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/index.rst 2008-10-16 15:02:52 UTC (rev 936) @@ -0,0 +1,28 @@ +=================== +Examples/Validation +=================== + +This example program creates a number of components which are used to control the appearance of a JLabel. +Everything is performed through data binding; there are no script tags or explicit event handlers anywhere. + +Screen shot +----------- + +.. image:: images/Validation-screenshot.png + +Set it in action +---------------- + +|webstart| + +To run this example in `Java Web Start`_, click the `following link`_. + + +Source code +----------- + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. |webstart| image:: images/webstart.gif + +.. _following link: ./launch-Validation.jnlp Property changes on: lutinjaxx/trunk/jaxx-example/Validation/src/site/fr/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: lutinjaxx/trunk/jaxx-example/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-example/pom.xml 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/pom.xml 2008-10-16 15:02:52 UTC (rev 936) @@ -34,6 +34,7 @@ <module>LabelStyle</module> <module>Validation</module> </modules> + <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> @@ -41,7 +42,6 @@ <version>0.5-SNAPSHOT</version> <inceptionYear>2008</inceptionYear> <description>Jaxx Example super pom</description> - <url>${example.home.url}</url> <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> @@ -51,38 +51,107 @@ <properties> + <!-- this property must be defined here, since it can be override by a profile --> + <maven.jar.main.class>examples.${project.artifactId}.${project.artifactId}</maven.jar.main.class> - <example.home.url>${site.home.url}/lutinjaxx/maven-jaxx-plugin/examples</example.home.url> - <!-- jnlp --> - <keystorepath>${keystorepath}</keystorepath> + <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> - <!-- override this property to define scm url property --> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + + <!-- scm (for sons) --> <scm.url.example> http://${labs.host}/plugins/scmsvn/viewcvs.php/lutinjaxx/trunk/jaxx-example/${pom.artifactId}/?root=${labs.project} </scm.url.example> - <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> <scm.developerConnection.example> scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/jaxx-example/${pom.artifactId} </scm.developerConnection.example> - <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> <scm.connection.example> scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/jaxx-example/${pom.artifactId} </scm.connection.example> </properties> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> + <build> - <pluginManagement> <plugins> <plugin> + + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> + <execution> + <id>JnlpSun</id> + <phase>compile</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-2.0.02.jar"/> + <filter token="url" value="${project.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-3.0.1.jar"/> + <filter token="url" value="${project.url}"/> + </filterset> + </copy> + <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}/lib" failonerror="false"/> + <copy file="${project.build.directory}/lib/jxlayer-3.0.1.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="${maven.site.gen.dir}/resources"/> + <copy todir="${maven.site.gen.dir}/resources" 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> + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.5-SNAPSHOT</version> @@ -121,62 +190,16 @@ </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>pre-site</phase> - <configuration> - <tasks> - <copy file="${project.basedir}/../src/main/jnlp/sun.jnlp" - todir="${project.basedir}/target/jnlp" failonerror="false"> - <filterset> - <filter token="help" value="javahelp-2.0.02.jar"/> - <filter token="url" value="${project.url}"/> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" - todir="${project.basedir}/target/jnlp/lib" failonerror="false"/> - </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/bin"/> - <copy todir="${maven.site.gen.dir}/resources/bin" verbose="${maven.verbose}" - failonerror="false" overwrite="false"> - <fileset dir="${project.build.directory}/jnlp"> - <include name="**"/> - </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</version> + <version>1.0-alpha-2-cl_20081016</version> <executions> <execution> - <phase>pre-site</phase> + <phase>package</phase> <goals> - <goal>jnlp</goal> + <goal>jnlp-inline</goal> </goals> </execution> </executions> @@ -184,13 +207,19 @@ <dependencies> <excludes> <exclude>javax.help:javahelp</exclude> + <exclude>org.swinglabs:jxlayer</exclude> </excludes> </dependencies> <libPath>lib</libPath> - <templateDirectory>${project.basedir}/../src/main/jnlp</templateDirectory> + <extensions> + <sun>sun.jnlp</sun> + <jxlayer>jxlayer.jnlp</jxlayer> + </extensions> <jnlp> <outputFile>launch-${project.artifactId}.jnlp</outputFile> <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> </jnlp> <sign> @@ -206,7 +235,7 @@ <dnameL/> <dnameSt/> <dnameC/> - <verify>false</verify> + <verify>true</verify> <keystoreConfig> <delete>false</delete> <gen>false</gen> @@ -221,16 +250,21 @@ </plugin> </plugins> + </pluginManagement> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + + </plugins> </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <scm> - <connection>${scm.connection.son}</connection> - <developerConnection>${scm.developerConnection.son}</developerConnection> - <url>${scm.url.son}</url> - </scm> </project> \ No newline at end of file Copied: lutinjaxx/trunk/jaxx-example/src/main/jnlp/jxlayer.jnlp (from rev 927, lutinjaxx/trunk/jaxx-example/src/main/jnlp/sun.jnlp) =================================================================== --- lutinjaxx/trunk/jaxx-example/src/main/jnlp/jxlayer.jnlp (rev 0) +++ lutinjaxx/trunk/jaxx-example/src/main/jnlp/jxlayer.jnlp 2008-10-16 15:02:52 UTC (rev 936) @@ -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 Modified: lutinjaxx/trunk/jaxx-example/src/main/jnlp/sun.jnlp =================================================================== --- lutinjaxx/trunk/jaxx-example/src/main/jnlp/sun.jnlp 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/src/main/jnlp/sun.jnlp 2008-10-16 15:02:52 UTC (rev 936) @@ -6,7 +6,7 @@ <offline-allowed/> </information> <resources> - <jar href="lib/@help@"/> + <jar href="lib/@lib@"/> </resources> <component-desc/> </jnlp> \ No newline at end of file Deleted: lutinjaxx/trunk/jaxx-example/src/main/jnlp/template.vm =================================================================== --- lutinjaxx/trunk/jaxx-example/src/main/jnlp/template.vm 2008-10-16 15:02:13 UTC (rev 935) +++ lutinjaxx/trunk/jaxx-example/src/main/jnlp/template.vm 2008-10-16 15:02:52 UTC (rev 936) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jnlp - spec="1.0+" - codebase="$project.Url/bin" href="$outputFile"> - <information> - <title>$informationTitle</title> - <vendor>$informationVendor</vendor> - <homepage href="$informationHomepage" /> - <description>$informationDescription</description> - <offline-allowed /> - </information> - <resources> - <j2se version="1.5+" max-heap-size="512m"/> - $dependencies - <extension name="sun" href="sun.jnlp"/> - </resources> - <security> - <all-permissions /> - </security> - <application-desc main-class="$mainClass" /> -</jnlp> Copied: lutinjaxx/trunk/jaxx-example/src/site/resources/jaxx.png (from rev 927, lutinjaxx/trunk/src/site/resources/jaxx.png) =================================================================== (Binary files differ) Property changes on: lutinjaxx/trunk/jaxx-example/src/site/resources/jaxx.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo +