dion 2002/06/06 08:28:52
Modified: src/templates/build/plugins/struts build.xml
Log:
Fixed callback issue
Revision Changes Path
1.10 +31 -20
jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 6 Jun 2002 15:04:00 -0000 1.9
+++ build.xml 6 Jun 2002 15:28:52 -0000 1.10
@@ -50,6 +50,27 @@
<property file="${maven.home}/plugins/j2ee/default.properties"/>
<!-- Pick up struts defaults -->
<property file="${maven.home}/plugins/struts/default.properties"/>
+ <!-- validate-struts-war -->
+ <condition property="maven.struts.callback.pre-validate-struts-war.ok">
+ <and>
+ <available
file="${maven.struts.callback.pre-validate-struts-war.buildFile}"/>
+ <not>
+ <equals
arg1="${maven.struts.callback.pre-validate-struts-war.buildTarget}"
+
arg2="$${maven.struts.callback.pre-validate-struts-war.buildTarget}" />
+ </not>
+ </and>
+ </condition>
+
+ <condition property="maven.struts.callback.post-validate-struts-war.ok">
+ <and>
+ <available
file="${maven.struts.callback.post-validate-struts-war.buildFile}"/>
+ <not>
+ <equals
arg1="${maven.struts.callback.post-validate-struts-war.buildTarget}"
+
arg2="$${maven.struts.callback.post-validate-struts-war.buildTarget}" />
+ </not>
+ </and>
+ </condition>
+
</target>
<!-- ================================================================== -->
@@ -96,16 +117,11 @@
</target>
<!-- process any user defined pre validation callback -->
- <target name="pre-validate-struts-war-callback">
- <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
- <property name="buildFile"
- value="${maven.struts.callback.pre-validate-struts-war.buildFile}" />
- <property name="buildTarget"
- value="${maven.struts.callback.pre-validate-struts-war.buildTarget}" />
- <property name="buildTargetName"
- value="maven.struts.callback.pre-validate-struts-war.buildTarget" />
- </maven-ant>
+ <target name="pre-validate-struts-war-callback"
+ if="maven.struts.callback.pre-validate-struts-war.ok">
+ <maven-ant antfile="${maven.struts.callback.pre-validate-struts-war.buildFile}"
+ target="${maven.struts.callback.pre-validate-struts-war.buildTarget}"
+ inheritRefs="true" exportAll="false" exportRefs="false"/>
</target>
<!-- perform the validation with a custom task -->
@@ -117,16 +133,11 @@
</target>
<!-- process any user defined post validation callback -->
- <target name="post-validate-struts-war-callback">
- <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="callback" inheritRefs="true" exportRefs="false" exportAll="false">
- <property name="buildFile"
- value="${maven.struts.callback.post-validate-struts-war.buildFile}" />
- <property name="buildTarget"
- value="${maven.struts.callback.post-validate-struts-war.buildTarget}" />
- <property name="buildTargetName"
- value="maven.struts.callback.post-validate-struts-war.buildTarget" />
- </maven-ant>
+ <target name="post-validate-struts-war-callback"
+ if="maven.struts.callback.post-validate-struts-war.ok">
+ <maven-ant
antfile="${maven.struts.callback.post-validate-struts-war.buildFile}"
+ target="${maven.struts.callback.post-validate-struts-war.buildTarget}"
+ inheritRefs="true" exportAll="false" exportRefs="false"/>
</target>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
