vmassol 2004/07/15 02:41:37
Modified: j2ee/xdocs changes.xml
j2ee plugin.jelly
Log:
Removed dependency on non-public goal <code>war:init</code> and computed the name of
the WAR file by using the <code>maven.war.final.name</code> property from the WAR
plugin.
Revision Changes Path
1.18 +5 -0 maven-plugins/j2ee/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/j2ee/xdocs/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changes.xml 9 Jul 2004 13:00:18 -0000 1.17
+++ changes.xml 15 Jul 2004 09:41:37 -0000 1.18
@@ -26,6 +26,11 @@
</properties>
<body>
<release version="1.5.1-SNAPSHOT" date="in CVS">
+ <action dev="vmassol" type="fix">
+ Removed dependency on non-public goal <code>war:init</code> and computed
+ the name of the WAR file by using the <code>maven.war.final.name</code>
+ property from the WAR plugin.
+ </action>
<action dev="dion" type="update">Remove pom.getPluginContext code and replace
with maven:get</action>
</release>
<release version="1.5" date="2004-05-15">
1.15 +4 -2 maven-plugins/j2ee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/j2ee/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 9 Jul 2004 13:22:59 -0000 1.14
+++ plugin.jelly 15 Jul 2004 09:41:37 -0000 1.15
@@ -36,7 +36,7 @@
<!-- ================================================================ -->
<!-- V A L I D A T E A W A R -->
<!-- ================================================================ -->
- <goal name="j2ee:validate-war" prereqs="war:init"
+ <goal name="j2ee:validate-war"
description="Check that a war file is valid">
<ant:taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
@@ -51,10 +51,12 @@
</ant:taskdef>
<maven:get var="warBuildDir" plugin="maven-war-plugin"
property="maven.war.build.dir"/>
+ <maven:get var="warFinalName" plugin="maven-war-plugin"
property="maven.war.final.name"/>
- <ant:warvalidator warFileName="${warBuildDir}/${pom.artifactId}.war">
+ <ant:warvalidator warFileName="${warBuildDir}/${maven.war.final.name}">
<ant:formatter type="plain" usefile="false"/>
</ant:warvalidator>
+
</goal>
<define:taglib uri="j2ee">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
