dion 2003/01/27 20:57:07
Modified: src/plugins-build/j2ee plugin.jelly
Log:
Clean up usage of other plugins' properties
Revision Changes Path
1.3 +9 -3 jakarta-turbine-maven/src/plugins-build/j2ee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/j2ee/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 26 Jan 2003 06:13:30 -0000 1.2
+++ plugin.jelly 28 Jan 2003 04:57:07 -0000 1.3
@@ -23,8 +23,11 @@
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
</classpath>
</taskdef>
+
+ <j:set var="warBuildDir"
+
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
- <warvalidator warFileName="${maven.war.build.dir}/${pom.artifactId}.war">
+ <warvalidator warFileName="${warBuildDir}/${pom.artifactId}.war">
<formatter type="plain" usefile="false"/>
</warvalidator>
</goal>
@@ -36,8 +39,11 @@
description="Create an EAR file from the project">
<echo>Building EAR ${pom.artifactId}</echo>
- <mkdir dir="${maven.war.build.dir}" />
- <ear earfile="${maven.war.build.dir}/${pom.artifactId}.ear"
+ <j:set var="warBuildDir"
+
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
+
+ <mkdir dir="${warBuildDir}" />
+ <ear earfile="${warBuildDir}/${pom.artifactId}.ear"
appxml="${maven.j2ee.ear.appxml}">
<!-- include the actual project files -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
