Author: ltheussl
Date: Fri Jun 9 16:11:57 2006
New Revision: 413190
URL: http://svn.apache.org/viewvc?rev=413190&view=rev
Log:
PR: MPDIST-26
Allow distribution of artifact types other than jar.
New property maven.dist.bin.artifact.type, deprecated property
maven.dist.bin.artifact.
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/plugin.properties
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=413190&r1=413189&r2=413190&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Fri Jun 9 16:11:57 2006
@@ -34,7 +34,6 @@
<goal
name="dist:prepare-bin-filesystem"
- prereqs="jar:jar"
description="Builds the binary distribution file system.">
<!--
@@ -60,6 +59,30 @@
<ant:include name="NOTICE*"/>
</ant:fileset>
</ant:copy>
+
+ <j:set var="binArtifactType" value="${maven.dist.bin.artifact.type}"/>
+ <j:choose>
+ <j:when test="${binArtifactType == 'rar'}">
+ <attainGoal name="rar:rar"/>
+ <j:set var="maven.dist.bin.artifact" value="${maven.rar.final.name}"/>
+ </j:when>
+ <j:when test="${binArtifactType == 'ear'}">
+ <attainGoal name="ear:ear"/>
+ <j:set var="maven.dist.bin.artifact" value="${maven.ear.final.name}"/>
+ </j:when>
+ <j:when test="${binArtifactType == 'war'}">
+ <attainGoal name="war:war"/>
+ <j:set var="maven.dist.bin.artifact" value="${maven.war.final.name}"/>
+ </j:when>
+ <j:when test="${binArtifactType == 'ejb'}">
+ <attainGoal name="ejb:ejb"/>
+ <j:set var="maven.dist.bin.artifact" value="${maven.ejb.final.name}"/>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="jar:jar"/>
+ <j:set var="maven.dist.bin.artifact" value="${maven.jar.final.name}"/>
+ </j:otherwise>
+ </j:choose>
<!-- Copy artifact -->
<ant:copy todir="${maven.dist.bin.assembly.dir}">
Modified: maven/maven-1/plugins/trunk/dist/plugin.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.properties?rev=413190&r1=413189&r2=413190&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.properties Fri Jun 9 16:11:57 2006
@@ -26,7 +26,8 @@
maven.dist.bin.assembly.dir=${maven.dist.assembly.dir}/bin/${maven.final.name}
maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}
maven.dist.dir=${maven.build.dir}/distributions
-maven.dist.bin.artifact=${maven.final.name}.jar
+#maven.dist.bin.artifact=${maven.final.name}.jar
maven.dist.crlf.filter=**/*.txt
maven.dist.lf.filter=
maven.dist.bin.include.site=true
+maven.dist.bin.artifact.type=jar
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=413190&r1=413189&r2=413190&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Fri Jun 9 16:11:57 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPDIST-26">Allow distribution
of artifact types other than jar. New property maven.dist.bin.artifact.type,
deprecated property maven.dist.bin.artifact.</action>
<action dev="ltheussl" type="add" issue="MPDIST-19">New property
<code>maven.dist.bin.include.site</code> to optionally include the site docs in
the binary distribution.</action>
<action dev="ltheussl" type="fix" issue="MPDIST-12">build-src goal does
not use <code>pom.build.sourceDirectory</code>.</action>
<action dev="aheritier" type="update">Fix compatibility with the version
of ant plugin newer or equal to 1.10.</action>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/properties.xml?rev=413190&r1=413189&r2=413190&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Fri Jun 9 16:11:57
2006
@@ -65,7 +65,20 @@
<tr>
<td>maven.dist.bin.artifact</td>
<td>yes - default is <code>${maven.final.name}.jar</code>.</td>
- <td>The name of the binary artifact to include in distribution,
relative to target dir.</td>
+ <td>
+ <strong>DEPRECATED</strong>: this property is not used anymore.
+ The name of the binary artifact depends on its type
+ and is given by
+ <code>${maven.[jar,ear,rar,war,ejb].final.name}</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.dist.bin.artifact.type</td>
+ <td>yes - default is <code>jar</code>.</td>
+ <td>
+ The type of artifact to be included in the binary distribution.
+ Possible values are jar, rar, war, ear and ejb.
+ </td>
</tr>
<tr>
<td>maven.dist.bin.include.site</td>
