evenisse 2004/08/26 04:42:26
Modified: jnlp plugin.jelly project.xml
jnlp/xdocs changes.xml properties.xml
Log:
MPJNLP-2. Add extension support.
Revision Changes Path
1.31 +10 -0 maven-plugins/jnlp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/plugin.jelly,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plugin.jelly 15 Aug 2004 11:34:26 -0000 1.30
+++ plugin.jelly 26 Aug 2004 11:42:25 -0000 1.31
@@ -161,6 +161,16 @@
<j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
<nativelib href="${lib.file.name}"/>
</j:if>
+ <j:if test="${dep.getProperty('jnlp.extension.jnlp')!=
null}">
+ <j:choose>
+ <j:when
test="${dep.getProperty('jnlp.extension.site')!= null})">
+ <extension name="${lib.file.name}"
href="http://${dep.getProperty('jnlp.extension.site')}/${dep.getProperty('jnlp.extension.dir')}/${dep.getProperty('jnlp.extension.jnlp')}"/>
+ </j:when>
+ <j:otherwise>
+ <extension name="${lib.file.name}"
href="${dep.getProperty('jnlp.extension.dir')}/${dep.getProperty('jnlp.extension.jnlp')}"/>
+ </j:otherwise>
+ </j:choose>
+ </j:if>
</j:forEach>
<j:set var="depVer" value="${pom.currentVersion}"/>
<j:if test="${context.getVariable('maven.jnlp.cert.version') !=
null}">
1.25 +8 -0 maven-plugins/jnlp/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 15 Aug 2004 11:34:26 -0000 1.24
+++ project.xml 26 Aug 2004 11:42:26 -0000 1.25
@@ -53,6 +53,14 @@
</roles>
</developer>
</developers>
+ <contributors>
+ <contributor>
+ <name>Martin Skopp</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Riege Software International</organization>
+ <timezone>+1</timezone>
+ </contributor>
+ </contributors>
<dependencies/>
<versions>
<version>
1.22 +1 -0 maven-plugins/jnlp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/xdocs/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 15 Aug 2004 11:34:26 -0000 1.21
+++ changes.xml 26 Aug 2004 11:42:26 -0000 1.22
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4.1-SNAPSHOT" date="in CVS">
+ <action dev="evenisse" type="add" issue="MPJNLP-2">Add extension
support.</action>
<action dev="dion" type="fix" issue="MPJNLP-13">Fix bad signed jar
name</action>
</release>
<release version="1.4" date="2004-07-12">
1.11 +35 -1 maven-plugins/jnlp/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 11 Jun 2004 09:19:53 -0000 1.10
+++ properties.xml 26 Aug 2004 11:42:26 -0000 1.11
@@ -312,7 +312,7 @@
</section>
<section name="Keystore settings">
<table>
- <tr><th>Property</th><th>Description</th><th>See</th></tr>
+
<tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr>
<tr>
<td>maven.jnlp.signjar.store</td>
<td>Yes</td>
@@ -439,6 +439,40 @@
</properties>
</dependency>
]]></source>
+
+ <p>
+ Or for using JNLP extension mechanism :
+ </p>
+
+ <source><![CDATA[
+ <dependency>
+ <id>jarid</id>
+ <version>jarversion</version>
+ <properties>
+ <jnlp.extension.site>hostname</jnlp.extension.site>
+ <jnlp.extension.dir>directory</jnlp.extension.dir>
+ <jnlp.extension.jnlp>jnlp-filename</jnlp.extension.jnlp>
+ </properties>
+ </dependency>
+ ]]></source>
+
+ <p>
+ The JNLP extension mechanism is useful e.g. as a workaround when
+ JAR files signed by different certificates are used, see
+ <a href="http://java.sun.com/products/javawebstart/faq.html#72";>Java Webstart
FAQ, How do I use JAR files that are signed by different certificates?)</a>.
+ </p>
+ <p>
+ When using JNLP extension feature, <tt>jnlp.extension.site</tt>
+ must not contain URL prefix - "http://"; is the only protocol
+ supported now.
+ Property <tt>jnlp.extension.site</tt> is a optional, if omited
+ a relative URL is constructed from <tt>jnlp.extension.dir</tt>
+ and <tt>jnlp.extension.jnlp</tt>. If JNLP file is stored in
+ the same directory as the generated JNLP file and one likes
+ to avoid absolute pathnames, one should use "." as value for
+ <tt>jnlp.extension.dir</tt>.
+ </p>
+
</section>
<section name="How to define the main jar?">
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
