- MPJNLP-6. Updated jarversions support to take SNAPSHOT jars into account.
- Remove tabs. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse
@@ -33,13 +33,13 @@
|
||||
<!-- ================== -->
|
||||
<!-- Generate JNLP file -->
|
||||
<!-- ================== -->
|
||||
<maven:property name="maven.jnlp.description" defaultValue="${pom.description}"/>
|
||||
<maven:property name="maven.jnlp.description.short" defaultValue="${pom.shortDescription}"/>
|
||||
<maven:property name="maven.jnlp.http.codebase" defaultValue="${pom.url}"/>
|
||||
<maven:property name="maven.jnlp.signjar.alias" defaultValue="${pom.artifactId}"/>
|
||||
<maven:property name="maven.jnlp.signjar.dname.o" defaultValue="${pom.organization.name}"/>
|
||||
<maven:property name="maven.jnlp.title" defaultValue="${pom.name}"/>
|
||||
<j:set var="final.jar.name" value="${maven.final.name}.jar"/>
|
||||
<maven:property name="maven.jnlp.description" defaultValue="${pom.description}"/>
|
||||
<maven:property name="maven.jnlp.description.short" defaultValue="${pom.shortDescription}"/>
|
||||
<maven:property name="maven.jnlp.http.codebase" defaultValue="${pom.url}"/>
|
||||
<maven:property name="maven.jnlp.signjar.alias" defaultValue="${pom.artifactId}"/>
|
||||
<maven:property name="maven.jnlp.signjar.dname.o" defaultValue="${pom.organization.name}"/>
|
||||
<maven:property name="maven.jnlp.title" defaultValue="${pom.name}"/>
|
||||
<j:set var="final.jar.name" value="${maven.final.name}.jar"/>
|
||||
|
||||
<j:file name="${maven.jnlp.dir}/${pom.artifactId}.jnlp" prettyPrint="true"
|
||||
xmlns="dummy">
|
||||
@@ -101,19 +101,19 @@
|
||||
<j:choose>
|
||||
<j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
|
||||
<j:set var="mainExists" value="true"/>
|
||||
<j:choose>
|
||||
<j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
|
||||
<jar href="${lib.file.name}" main="true" version="${dep.version}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${lib.file.name}" main="true"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${lib.file.name}" main="true" version="${dep.version}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${lib.file.name}" main="true"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
|
||||
<jar href="${lib.file.name}" version="${dep.version}"/>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${lib.file.name}" version="${dep.version}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${lib.file.name}" />
|
||||
@@ -128,24 +128,24 @@
|
||||
</j:forEach>
|
||||
<j:choose>
|
||||
<j:when test="${mainExists=='false'}">
|
||||
<j:choose>
|
||||
<j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
|
||||
<jar href="${final.jar.name}" main="true" version="${pom.currentVersion}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${final.jar.name}" main="true" version="${pom.currentVersion}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${final.jar.name}" main="true"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${context.getVariable('maven.jnlp.usejarversions') != null}">
|
||||
<jar href="${final.jar.name}" version="${pom.currentVersion}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${final.jar.name}" version="${pom.currentVersion}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${final.jar.name}" />
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
<!-- This is close to what it WILL look like, but for now it is the ugly ass thing below it-->
|
||||
@@ -185,36 +185,38 @@
|
||||
|
||||
<j:if test="${context.getVariable('maven.jnlp.usejarversions') != null}">
|
||||
|
||||
<ant:echo>Creating ${maven.jnlp.dir}/version.xml ...</ant:echo>
|
||||
|
||||
<!-- ================== -->
|
||||
<!-- Generate version.xml file -->
|
||||
<!-- ================== -->
|
||||
<j:file name="${maven.jnlp.dir}/version.xml" prettyPrint="true"
|
||||
xmlns="dummy">
|
||||
<jnlp-versions>
|
||||
<j:forEach var="lib" items="${pom.artifacts}">
|
||||
<j:set var="dep" value="${lib.dependency}"/>
|
||||
<j:if test="${dep.getProperty('jnlp.jar')=='true' || dep.getProperty('jnlp.native.jar')=='true'}">
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${lib.file.name}</name>
|
||||
<version-id>${dep.version}</version-id>
|
||||
</pattern>
|
||||
<file>${lib.file.name}</file>
|
||||
</resource>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${final.jar.name}</name>
|
||||
<version-id>${pom.currentVersion}</version-id>
|
||||
</pattern>
|
||||
<file>${final.jar.name}</file>
|
||||
</resource>
|
||||
</jnlp-versions>
|
||||
</j:file>
|
||||
</j:if>
|
||||
<ant:echo>Creating ${maven.jnlp.dir}/version.xml ...</ant:echo>
|
||||
|
||||
<!-- ================== -->
|
||||
<!-- Generate version.xml file -->
|
||||
<!-- ================== -->
|
||||
<j:file name="${maven.jnlp.dir}/version.xml" prettyPrint="true"
|
||||
xmlns="dummy">
|
||||
<jnlp-versions>
|
||||
<j:forEach var="lib" items="${pom.artifacts}">
|
||||
<j:set var="dep" value="${lib.dependency}"/>
|
||||
<j:if test="${(dep.getProperty('jnlp.jar')=='true' or dep.getProperty('jnlp.native.jar')=='true') and (dep.version.indexOf('SNAPSHOT') lt 0)}">
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${lib.file.name}</name>
|
||||
<version-id>${dep.version}</version-id>
|
||||
</pattern>
|
||||
<file>${lib.file.name}</file>
|
||||
</resource>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<j:if test="${pom.currentVersion.indexOf('SNAPSHOT') lt 0}">
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${final.jar.name}</name>
|
||||
<version-id>${pom.currentVersion}</version-id>
|
||||
</pattern>
|
||||
<file>${final.jar.name}</file>
|
||||
</resource>
|
||||
</j:if>
|
||||
</jnlp-versions>
|
||||
</j:file>
|
||||
</j:if>
|
||||
|
||||
|
||||
<!-- =========================== -->
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
|
||||
<body>
|
||||
<release version="1.3" date="In CVS">
|
||||
<action dev="evenisse" type="fix">
|
||||
MPJNLP-6. Updated jarversions support to take SNAPSHOT jars into account.
|
||||
</action>
|
||||
<action dev="evenisse" type="fix">
|
||||
MPJNLP-1.
|
||||
</action>
|
||||
|
||||
Reference in New Issue
Block a user