Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed for MAVEN-518 (artifacts are used for path, not dependencies).

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113606 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse 2003-07-07 13:29:04 +00:00
parent 2d6f5841f6
commit ada5da40bd
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
jnlp/plugin.jelly
View File

@ -84,20 +84,21 @@
maximum-heap-size="${maven.jnlp.j2se.heapsize.max}"/> maximum-heap-size="${maven.jnlp.j2se.heapsize.max}"/>
<j:set var="mainExists" value="false"/> <j:set var="mainExists" value="false"/>
<j:forEach var="lib" items="${pom.dependencies}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:if test="${lib.getProperty('jnlp.jar')=='true'}"> <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('jnlp.jar')=='true'}">
<j:choose> <j:choose>
<j:when test="${lib.getProperty('jnlp.main.jar')=='true'}"> <j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
<j:set var="mainExists" value="true"/> <j:set var="mainExists" value="true"/>
<jar href="${lib.artifact}" main="true"/> <jar href="${lib.file.name}" main="true"/>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<jar href="${lib.artifact}"/> <jar href="${lib.file.name}"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</j:if> </j:if>
<j:if test="${lib.getProperty('jnlp.native.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
<nativelib href="${lib.artifact}"/> <nativelib href="${lib.file.name}"/>
</j:if> </j:if>
</j:forEach> </j:forEach>
<j:choose> <j:choose>
@ -161,19 +162,18 @@
outputDir="${maven.jnlp.tmpdir}" outputDir="${maven.jnlp.tmpdir}"
/> />
<j:forEach var="dep" items="${pom.dependencies}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('jnlp.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
<!-- FIXME: Should use artifacts and artifact.path -->
<jarfile:updateManifest <jarfile:updateManifest
inputJar="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}" inputJar="${lib.file.parent}/${lib.file.name}"
manifest="${plugin.resources}/jnlp.manifest" manifest="${plugin.resources}/jnlp.manifest"
outputDir="${maven.jnlp.tmpdir}" outputDir="${maven.jnlp.tmpdir}"
/> />
</j:if> </j:if>
<j:if test="${dep.getProperty('jnlp.native.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
<!-- FIXME: Should use artifacts and artifact.path -->
<jarfile:updateManifest <jarfile:updateManifest
inputJar="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}" inputJar="${lib.file.parent}/${lib.file.name}"
manifest="${plugin.resources}/jnlp.manifest" manifest="${plugin.resources}/jnlp.manifest"
outputDir="${maven.jnlp.tmpdir}" outputDir="${maven.jnlp.tmpdir}"
/> />
@ -193,19 +193,20 @@
storepass="${maven.jnlp.signjar.storepass}" storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/> keystore="${maven.jnlp.signjar.store}"/>
<j:forEach var="lib" items="${pom.dependencies}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:if test="${lib.getProperty('jnlp.jar')=='true'}"> <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('jnlp.jar')=='true'}">
<ant:signjar <ant:signjar
jar="${maven.jnlp.tmpdir}/${lib.artifact}" jar="${maven.jnlp.tmpdir}/${lib.file.name}"
signedjar="${maven.jnlp.dir}/${lib.artifact}" signedjar="${maven.jnlp.dir}/${lib.file.name}"
alias="${maven.jnlp.signjar.alias}" alias="${maven.jnlp.signjar.alias}"
storepass="${maven.jnlp.signjar.storepass}" storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/> keystore="${maven.jnlp.signjar.store}"/>
</j:if> </j:if>
<j:if test="${lib.getProperty('jnlp.native.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
<ant:signjar <ant:signjar
jar="${maven.jnlp.tmpdir}/${lib.artifact}" jar="${maven.jnlp.tmpdir}/${lib.file.name}"
signedjar="${maven.jnlp.dir}/${lib.artifact}" signedjar="${maven.jnlp.dir}/${lib.file.name}"
alias="${maven.jnlp.signjar.alias}" alias="${maven.jnlp.signjar.alias}"
storepass="${maven.jnlp.signjar.storepass}" storepass="${maven.jnlp.signjar.storepass}"
keystore="${maven.jnlp.signjar.store}"/> keystore="${maven.jnlp.signjar.store}"/>
@ -214,18 +215,19 @@
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<ant:copy todir="${maven.jnlp.dir}" flatten="true"> <ant:copy todir="${maven.jnlp.dir}" flatten="true">
<ant:fileset dir="${maven.repo.local}"> <j:forEach var="lib" items="${pom.artifacts}">
<j:forEach var="dep" items="${pom.dependencies}"> <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('jnlp.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.jar')=='true'}">
<!-- FIXME: Should use artifacts and artifact.path --> <ant:fileset dir="${lib.file.parent}">
<ant:include name="${dep.artifactDirectory}/jars/${dep.artifact}"/> <ant:include name="${lib.file.name}"/>
</ant:fileset>
</j:if> </j:if>
<j:if test="${dep.getProperty('jnlp.native.jar')=='true'}"> <j:if test="${dep.getProperty('jnlp.native.jar')=='true'}">
<!-- FIXME: Should use artifacts and artifact.path --> <ant:fileset dir="${lib.file.parent}">
<ant:include name="${dep.artifactDirectory}/jars/${dep.artifact}"/> <ant:include name="${lib.file.name}"/>
</ant:fileset>
</j:if> </j:if>
</j:forEach> </j:forEach>
</ant:fileset>
<ant:fileset dir="${maven.build.dir}"> <ant:fileset dir="${maven.build.dir}">
<ant:include name="${maven.final.name}.jar"/> <ant:include name="${maven.final.name}.jar"/>
</ant:fileset> </ant:fileset>

5
jnlp/xdocs/changes.xml
View File

@ -8,6 +8,11 @@
<body> <body>
<release version="1.2" date="in CVS"> <release version="1.2" date="in CVS">
<action dev="evenisse" type="fix">
Fixes for MAVEN-518.
Artifact processing in the plugin
was slightly changed and now it supports jar overriding mechanism
</action>
<action dev="evenisse" type="fix" due-to="James Macgill"> <action dev="evenisse" type="fix" due-to="James Macgill">
Fix Maven-343. Support large jar files. Fix Maven-343. Support large jar files.
</action> </action>