michal 2003/07/01 07:58:52
Modified: src/plugins-build/war plugin.jelly
src/plugins-build/war/xdocs changes.xml goals.xml
Log:
Fixes for MAVEN-518.
Artifact processing in the plugin was slightly changed and now it supports jar
overriding mechanism
Revision Changes Path
1.21 +14 -11 maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 1 Jul 2003 08:43:51 -0000 1.20
+++ plugin.jelly 1 Jul 2003 14:58:52 -0000 1.21
@@ -49,21 +49,24 @@
</ant:fileset>
</j:if>
- <j:forEach var="dep" items="${pom.dependencies}">
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:set var="bundle" value="false"/>
<j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
<ant:echo>
DEPRECATION WARNING:
- Use : war.bundle instead of war.bundle.jar
+ Use : war.bundle instead of war.bundle.jar
</ant:echo>
- <ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
- <ant:include name="${dep.artifact}"/>
- </ant:lib>
+ <j:set var="bundle" value="true"/>
</j:if>
- <j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
- <ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
- <ant:include name="${dep.artifact}"/>
+ <j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar'}">
+ <j:set var="bundle" value="true"/>
+ </j:if>
+ <j:if test="${bundle == 'true'}">
+ <ant:lib dir="${lib.file.parent}">
+ <ant:include name="${lib.file.name}"/>
</ant:lib>
- </j:if>
+ </j:if>
</j:forEach>
<j:if test="${sourcesPresent == 'true'}">
@@ -131,7 +134,7 @@
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
<ant:copy todir="${webapp.build.lib}"
-
file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
+ file="${lib.path}"/>
</j:if>
<j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
<ant:echo>
@@ -139,7 +142,7 @@
Use : war.bundle instead of war.bundle.jar
</ant:echo>
<ant:copy todir="${webapp.build.lib}"
- file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
+ file="${lib.path}"/>
</j:if>
</j:forEach>
1.6 +7 -4 maven/src/plugins-build/war/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 1 Jul 2003 08:43:51 -0000 1.5
+++ changes.xml 1 Jul 2003 14:58:52 -0000 1.6
@@ -8,15 +8,18 @@
<body>
<release version="1.4" date="in CVS">
- <action dev="dion" type="fix" due-to="Ben Hogan">
- Allow war file to be updated
- </action>
<action dev="michal" type="fix">
- Iterating artifacts not depedencies
+ Fixes for MAVEN-518.
+ Artifact processing in the plugin
+ was slightly changed and now
+ it supports jar overriding mechanism
</action>
<action dev="michal" type="add">
Added deploy, deploy-snapshot and install-snapshot goals
</action>
+ <action dev="dion" type="fix" due-to="Ben Hogan">
+ Allow war file to be updated
+ </action>
</release>
<release version="1.3" date="2002-04-08">
1.2 +12 -0 maven/src/plugins-build/war/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 24 Jan 2003 03:46:24 -0000 1.1
+++ goals.xml 1 Jul 2003 14:58:52 -0000 1.2
@@ -20,6 +20,18 @@
<description>Install the war in the local repository</description>
</goal>
<goal>
+ <name>war:install-snapshot</name>
+ <description>Install the snapshot version of the war in the local
repository</description>
+ </goal>
+ <goal>
+ <name>war:deploy</name>
+ <description>Deploy the war to the remote repository(ies)</description>
+ </goal>
+ <goal>
+ <name>war:deploy-snapshot</name>
+ <description>Deploy the snapshot version of the war to the remote
repository(ies)</description>
+ </goal>
+ <goal>
<name>war:war</name>
<description>Build a war file</description>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
