You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2004/05/28 11:53:24 UTC
cvs commit: maven-plugins/jnlp/xdocs changes.xml properties.xml
evenisse 2004/05/28 02:53:24
Modified: jnlp plugin.jelly plugin.properties project.xml
jnlp/xdocs changes.xml properties.xml
Log:
MPJNLP-8. Added Support for JarDiff.
Revision Changes Path
1.25 +35 -2 maven-plugins/jnlp/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 4 Mar 2004 18:36:13 -0000 1.24
+++ plugin.jelly 28 May 2004 09:53:24 -0000 1.25
@@ -128,6 +128,9 @@
<j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
<j:set var="mainExists" value="true"/>
<j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+ <jar href="${dep.artifactId}.jar" main="true" version="${depVer}"/>
+ </j:when>
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
<jar href="${lib.file.name}" main="true" version="${depVer}"/>
</j:when>
@@ -138,6 +141,9 @@
</j:when>
<j:otherwise>
<j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+ <jar href="${dep.artifactId}.jar" version="${depVer}"/>
+ </j:when>
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
<jar href="${lib.file.name}" version="${depVer}"/>
</j:when>
@@ -159,6 +165,9 @@
<j:choose>
<j:when test="${mainExists=='false'}">
<j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+ <jar href="${pom.artifactId}.jar" main="true" version="${depVer}"/>
+ </j:when>
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
<jar href="${final.jar.name}" main="true" version="${depVer}"/>
</j:when>
@@ -169,6 +178,9 @@
</j:when>
<j:otherwise>
<j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+ <jar href="${pom.artifactId}.jar" version="${depVer}"/>
+ </j:when>
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
<jar href="${final.jar.name}" version="${depVer}"/>
</j:when>
@@ -299,20 +311,39 @@
<ant:echo>Found a store...signing jars</ant:echo>
<ant:echo>Signing jar files ...</ant:echo>
+ <j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
+ <j:set var="maven.final.signedname" value="${pom.artifactId}__V${pom.currentVersion}.jar"/>
+ </j:when>
+ <j:otherwise>
+ <ant:echo>Not Using JarDiff ...</ant:echo>
+ <j:set var="maven.final.signedname" value="${maven.final.name}.jar"/>
+ </j:otherwise>
+ </j:choose>
<ant:signjar
jar="${maven.jnlp.tmpdir}/${maven.final.name}.jar"
- signedjar="${maven.jnlp.dir}/${maven.final.name}.jar"
+ signedjar="${maven.jnlp.dir}/${maven.final.signedname}"
alias="${maven.jnlp.signjar.alias}"
+ storetype="${maven.jnlp.signjar.storetype}"
storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/>
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('jnlp.jar')=='true'}">
+ <j:choose>
+ <j:when test="${(context.getVariable('maven.jnlp.jardiff') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
+ <j:set var="lib.file.signedname" value="${dep.artifactId}__V${dep.version}.jar"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="lib.file.signedname" value="${lib.final.name}.jar"/>
+ </j:otherwise>
+ </j:choose>
<ant:signjar
jar="${maven.jnlp.tmpdir}/${lib.file.name}"
- signedjar="${maven.jnlp.dir}/${lib.file.name}"
+ signedjar="${maven.jnlp.dir}/${lib.file.signedname}"
alias="${maven.jnlp.signjar.alias}"
+ storetype="${maven.jnlp.signjar.storetype}"
storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/>
</j:if>
@@ -321,6 +352,7 @@
jar="${maven.jnlp.tmpdir}/${lib.file.name}"
signedjar="${maven.jnlp.dir}/${lib.file.name}"
alias="${maven.jnlp.signjar.alias}"
+ storetype="${maven.jnlp.signjar.storetype}"
storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/>
</j:if>
@@ -359,6 +391,7 @@
<ant:genkey alias="${maven.jnlp.signjar.alias}"
storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"
+ storetype="${maven.jnlp.signjar.storetype}"
validity="${maven.jnlp.signjar.validity}" >
<ant:dname>
<j:if test="${context.getVariable('maven.jnlp.signjar.dname.cn') != null}">
1.6 +2 -1 maven-plugins/jnlp/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 4 Mar 2004 18:36:13 -0000 1.5
+++ plugin.properties 28 May 2004 09:53:24 -0000 1.6
@@ -30,6 +30,7 @@
## maven.jnlp.description.short=${pom.shortDescription}
##maven.jnlp.offline.allowed=true
##maven.jnlp.permission=all or j2ee
+##maven.jnlp.jardiff=true
maven.jnlp.j2se.version=1.4
maven.jnlp.j2se.heapsize.initial=32m
@@ -44,7 +45,7 @@
##maven.jnlp.signjar.store
##maven.jnlp.signjar.storepass
## maven.jnlp.signjar.alias=${pom.artifactId}
-
+maven.jnlp.signjar.storetype=jks
maven.jnlp.signjar.validity=720
##maven.jnlp.signjar.dname.cn //Common name
##maven.jnlp.signjar.dname.ou //Organization unit
1.21 +1 -1 maven-plugins/jnlp/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 2 May 2004 14:16:25 -0000 1.20
+++ project.xml 28 May 2004 09:53:24 -0000 1.21
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-jnlp-plugin</id>
<name>Maven JNLP Plug-in</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<shortDescription>JNLP Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/jnlp/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
1.15 +4 -0 maven-plugins/jnlp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 30 Apr 2004 14:38:43 -0000 1.14
+++ changes.xml 28 May 2004 09:53:24 -0000 1.15
@@ -25,6 +25,10 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.4" date="In CVS">
+ <action dev="evenisse" type="add" due-to="Pelle Braendgaard" issue="MPJNLP-8">Added Support for JarDiff.</action>
+ <action dev="evenisse" type="add">Added maven.jnlp.signjar.storetype property.</action>
+ </release>
<release version="1.3" date="2004-03-10">
<action dev="evenisse" type="add" issue="MPJNLP-7">Added extra property maven.jnlp.cert.version to support certificate renewals.</action>
<action dev="evenisse" type="fix" issue="MPJNLP-6">Updated jarversions support to take SNAPSHOT jars into account.</action>
1.9 +16 -0 maven-plugins/jnlp/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jnlp/xdocs/properties.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- properties.xml 4 Mar 2004 18:36:13 -0000 1.8
+++ properties.xml 28 May 2004 09:53:24 -0000 1.9
@@ -289,6 +289,14 @@
</td>
<td>false</td>
</tr>
+ <tr>
+ <td>maven.jnlp.jardiff</td>
+ <td>Yes</td>
+ <td>
+ Use the jar diff option for the Sun's JNLP Download Servlet.
+ </td>
+ <td>false</td>
+ </tr>
</table>
</section>
<section name="Keystore settings">
@@ -309,6 +317,14 @@
The password for keystore integrity. Must be at least 6 characters long.
</td>
<td></td>
+ </tr>
+ <tr>
+ <td>maven.jnlp.signjar.storetype</td>
+ <td>Yes</td>
+ <td>
+ The keystore type.
+ </td>
+ <td>jks</td>
</tr>
<tr>
<td>maven.jnlp.signjar.alias</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org