Author: tchemit Date: 2010-05-11 17:41:52 +0200 (Tue, 11 May 2010) New Revision: 1894 Url: http://nuiton.org/repositories/revision/jaxx/1894 Log: make jnlp works for all Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/RunDemo.java trunk/jaxx-tutorial/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-05-11 14:43:50 UTC (rev 1893) +++ trunk/jaxx-demo/pom.xml 2010-05-11 15:41:52 UTC (rev 1894) @@ -95,7 +95,7 @@ <properties> - <maven.jar.main.class>jaxx.demo.config.RunDemo</maven.jar.main.class> + <main.class>jaxx.demo.RunDemo</main.class> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> @@ -138,6 +138,7 @@ <configuration> <archive> <manifest> + <mainClass>${main.class}</mainClass> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> @@ -145,32 +146,7 @@ </archive> </configuration> </plugin> - - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <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> - </configuration> - </plugin> - + </plugins> </pluginManagement> @@ -320,7 +296,7 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20091001</version> + <version>${jnlp.version}</version> </plugin> </plugins> </reporting> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-05-11 14:43:50 UTC (rev 1893) +++ trunk/jaxx-tutorial/pom.xml 2010-05-11 15:41:52 UTC (rev 1894) @@ -116,31 +116,6 @@ <goals> <goal>jnlp-inline</goal> </goals> - <configuration> - <jnlp> - <mainClass>${main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - <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> - </configuration> </execution> </executions> </plugin> @@ -163,7 +138,7 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20100511</version> + <version>${jnlp.version}</version> </plugin> </plugins> </reporting> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-05-11 14:43:50 UTC (rev 1893) +++ trunk/jaxx-tutorial-config/pom.xml 2010-05-11 15:41:52 UTC (rev 1894) @@ -94,13 +94,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <!-- jaxx configuration --> - - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.autoImportCss>true</jaxx.autoImportCss> - <!-- to generate jnlp launcher while releasing jaxx --> <jnlp.skip>false</jnlp.skip> Modified: trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/RunDemo.java =================================================================== --- trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/RunDemo.java 2010-05-11 14:43:50 UTC (rev 1893) +++ trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/RunDemo.java 2010-05-11 15:41:52 UTC (rev 1894) @@ -63,7 +63,7 @@ // display it JFrame parentUI = new JFrame(); - helper.displayUI(parentUI, true); + helper.displayUI(parentUI, false); // will force quit after quitting config ui parentUI.dispose(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 14:43:50 UTC (rev 1893) +++ trunk/pom.xml 2010-05-11 15:41:52 UTC (rev 1894) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -394,6 +396,7 @@ <javahelp.version>2.0.02</javahelp.version> + <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> </properties> <build> @@ -420,9 +423,34 @@ </plugin> <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20100511</version> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${jnlp.version}</version> + <configuration> + <jnlp> + <mainClass>${main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + <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> + </configuration> </plugin> </plugins> @@ -441,7 +469,8 @@ <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm>