dion 2002/06/03 06:44:00
Modified: src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/struts build.xml
Log:
Fix missing callbacks and depends attributes
Revision Changes Path
1.10 +145 -75 jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 3 Jun 2002 07:07:48 -0000 1.9
+++ build.xml 3 Jun 2002 13:44:00 -0000 1.10
@@ -33,47 +33,33 @@
<target name="local-init" depends="init">
<!-- Pick up tool specific defaults -->
<property file="${maven.home}/plugins/j2ee/default.properties"/>
-
- <!-- Check all requirements are available -->
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- W A R -->
+ <!-- ================================================================== -->
+
+ <!-- build a war file -->
+ <target name="war" depends="local-init, war-init, war-error,
+ pre-war-callback, war-build, post-war-callback"
+ description="o Create a war file" />
+
+ <!-- check to make sure all files and properties are available -->
+ <target name="war-init">
<condition property="maven.j2ee.war.ready">
<and>
<not>
- <equals arg1="${maven.j2ee.war.name}"
- arg2="$${maven.j2ee.war.name}" />
+ <equals arg1="${maven.j2ee.war.name}" arg2="$${maven.j2ee.war.name}"/>
</not>
<available file="${maven.j2ee.war.src}" type="dir"/>
<available file="${maven.j2ee.war.content}" type="dir"/>
<available file="${maven.j2ee.war.webxml}" type="file"/>
</and>
</condition>
-
- <condition property="maven.j2ee.ear.ready">
- <and>
- <not>
- <equals arg1="${maven.j2ee.ear.name}"
- arg2="$${maven.j2ee.ear.name}" />
- </not>
- <available file="${maven.j2ee.ear.appxml}" type="file"/>
- </and>
- </condition>
-
- <condition property="maven.j2ee.ejb.ready">
- <and>
- <not>
- <equals arg1="${maven.j2ee.ejb.name}"
- arg2="$${maven.j2ee.ejb.name}" />
- </not>
- <available file="${maven.j2ee.ejb.conf.dir}" type="dir"/>
- </and>
- </condition>
- </target>
-
- <target name="war" depends="local-init,war-error,war-init,
- pre-war-callback, war-build, post-war-callback"
- description="o Create a war file" />
+ </target>
+ <!-- print failure message if files and properties not available -->
<target name="war-error" unless="maven.j2ee.war.ready">
- <!-- extend this list with requirements as needed -->
<fail>
+------------------------------------------------------------------------------
|
@@ -95,10 +81,7 @@
</fail>
</target>
- <target name="war-init" if="maven.j2ee.war.ready">
- <!-- nothing to do as of yet -->
- </target>
-
+ <!-- process any user specified pre-war callback -->
<target name="pre-war-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -107,11 +90,12 @@
<property name="buildTarget"
value="${maven.j2ee.callback.pre-war.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.pre-war.buildFile" />
+ value="maven.j2ee.callback.pre-war.buildTarget" />
</maven-ant>
</target>
- <target name="war-build" if="maven.j2ee.war.ready">
+ <!-- build the war file from the various sources -->
+ <target name="war-build">
<!-- make sure the source is compiled -->
<ant antfile="${maven.home}/plugins/core/build.xml" target="jar" />
@@ -150,6 +134,7 @@
</war>
</target>
+ <!-- process any user specified post-war callback -->
<target name="post-war-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -158,29 +143,100 @@
<property name="buildTarget"
value="${maven.j2ee.callback.post-war.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.post-war.buildFile" />
+ value="maven.j2ee.callback.post-war.buildTarget" />
</maven-ant>
</target>
- <target name="validate-war" depends="local-init">
- <taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
- <classpath refid="maven-classpath"/>
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
-
+ <!-- ================================================================== -->
+ <!-- V A L I D A T E - W A R -->
+ <!-- ================================================================== -->
+ <target name="validate-war" depends="local-init,validate-war-init,
+ validate-war-error, pre-validate-war-callback, validate,
+ post-validate-war-callback" />
+
+ <!-- validate a war file -->
+ <target name="validate-war-init">
+ <condition property="maven.j2ee.war-validator.ready">
+ <available file="${maven.build.dir}/${maven.j2ee.war.name}.war" />
+ </condition>
+ </target>
+
+ <!-- fail if the war file doesn't exist -->
+ <target name="validate-war-error" unless="maven.j2ee.war-validator.ready">
+ <fail>
+ +------------------------------------------------------------------------------
+ |
+ | ERROR: One of the required properties for maven:validate-war was not provided.
+ |
+ | Please ensure that the property maven.j2ee.war.name is defined:
+ |
+ | maven.j2ee.war.name = ${maven.j2ee.war.name}
+ |
+ | Please ensure that the following file exists:
+ |
+ | ${maven.build.dir}/${maven.j2ee.war.name}.war
+ +------------------------------------------------------------------------------
+ </fail>
+ </target>
+
+ <!-- process any user specified pre-validate war callback -->
+ <target name="pre-validate-war-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.j2ee.callback.pre-validate-war.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.j2ee.callback.pre-validate-war.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.j2ee.callback.pre-validate-war.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <!-- perform the validation using our custom task -->
+ <target name="validate">
+
<warvalidator warFileName="${maven.build.dir}/${maven.j2ee.war.name}.war">
<formatter type="plain" usefile="false"/>
</warvalidator>
</target>
+
+ <!-- process any user specified post-validate war callback -->
+ <target name="post-validate-war-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.j2ee.callback.post-validate-war.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.j2ee.callback.post-validate-war.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.j2ee.callback.post-validate-war.buildTarget" />
+ </maven-ant>
+ </target>
- <!--
- EAR processing
- -->
- <target name="ear" depends="local-init,ear-error,war,ear-init,
- pre-ear-callback,ear-build,post-ear-callback"
+ <!-- ================================================================== -->
+ <!-- E A R -->
+ <!-- ================================================================== -->
+
+ <!-- produce an ear file -->
+ <target name="ear" depends="local-init, ear-init, ear-error, war,
+ pre-ear-callback, ear-build, post-ear-callback"
description="o Create an ear file" />
+ <!-- check files and properties are available -->
+ <target name="ear-init">
+ <condition property="maven.j2ee.ear.ready">
+ <and>
+ <not>
+ <equals arg1="${maven.j2ee.ear.name}"
+ arg2="$${maven.j2ee.ear.name}" />
+ </not>
+ <available file="${maven.j2ee.ear.appxml}" type="file"/>
+ </and>
+ </condition>
+ </target>
+
+ <!-- fail if files and properties aren't available -->
<target name="ear-error" unless="maven.j2ee.ear.ready">
<!-- extend this list with requirements as needed -->
<fail>
@@ -199,10 +255,7 @@
</fail>
</target>
- <target name="ear-init" if="maven.j2ee.ear.ready">
- <!-- nothing to do as of yet -->
- </target>
-
+ <!-- process any user specified pre ear callback -->
<target name="pre-ear-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -211,11 +264,12 @@
<property name="buildTarget"
value="${maven.j2ee.callback.pre-ear.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.pre-ear.buildFile" />
+ value="maven.j2ee.callback.pre-ear.buildTarget" />
</maven-ant>
</target>
- <target name="ear-build" if="maven.j2ee.ear.ready">
+ <!-- run the ear task -->
+ <target name="ear-build">
<echo>Building EAR ${maven.j2ee.ear.name}</echo>
<ear earfile="${maven.build.dir}/${maven.j2ee.ear.name}.ear"
@@ -244,6 +298,7 @@
</ear>
</target>
+ <!-- process any user specified post ear callback -->
<target name="post-ear-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -252,19 +307,37 @@
<property name="buildTarget"
value="${maven.j2ee.callback.post-ear.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.post-ear.buildFile" />
+ value="maven.j2ee.callback.post-ear.buildTarget" />
</maven-ant>
</target>
- <!--
- ejb processing
- -->
- <target name="ejb" depends="local-init,ejb-error,ejb-init,pre-ejb-callback,
- ejb-build,post-ejb-callback"
+ <!-- ================================================================== -->
+ <!-- E J B -->
+ <!-- ================================================================== -->
+
+ <!-- produce an ejb jar -->
+ <target name="ejb" depends="local-init, ejb-init, ejb-error, pre-ejb-callback,
+ ejb-build, post-ejb-callback"
description="Create an ejb file" />
+
+ <!-- check to make sure required files and properties are available -->
+ <target name="ejb-init">
+ <condition property="maven.j2ee.ejb.ready">
+ <and>
+ <not>
+ <equals arg1="${maven.j2ee.ejb.name}"
+ arg2="$${maven.j2ee.ejb.name}" />
+ </not>
+ <available file="${maven.j2ee.ejb.conf.dir}" type="dir"/>
+ </and>
+ </condition>
+
+ <property name="maven.j2ee.ejb.target-base"
+ value="${maven.build.dir}/ejb/"/>
+ </target>
+ <!-- fail the ejb jar if required files and properties are not available -->
<target name="ejb-error" unless="maven.j2ee.ejb.ready">
- <!-- extend this list with requirements as needed -->
<fail>
+------------------------------------------------------------------------------
|
@@ -280,14 +353,8 @@
+------------------------------------------------------------------------------
</fail>
</target>
-
-
-
- <target name="ejb-init" if="maven.j2ee.ejb.ready">
- <property name="maven.j2ee.ejb.target-base"
- value="${maven.build.dir}/ejb/"/>
- </target>
-
+
+ <!-- process any user defined pre ejb jar callback -->
<target name="pre-ejb-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -296,14 +363,15 @@
<property name="buildTarget"
value="${maven.j2ee.callback.pre-ejb.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.pre-ejb.buildFile" />
+ value="maven.j2ee.callback.pre-ejb.buildTarget" />
</maven-ant>
</target>
- <target name="ejb-build" depends="ejb-jar, ejb-remote, ejb-local"
- if="maven.j2ee.ejb.ready"/>
+ <!-- produce the ejb jar a remote and local jar -->
+ <target name="ejb-build" depends="ejb-jar, ejb-remote, ejb-local"/>
- <target name="ejb-jar" if="maven.j2ee.ejb.ready">
+ <!-- produce an ejb jar file by running the jar task -->
+ <target name="ejb-jar">
<!-- ejb jar is always built -->
<echo>Building EJB jar for ${maven.j2ee.ejb.name}</echo>
@@ -344,9 +412,9 @@
</jar>
</target>
+ <!-- produce an ejb jar with local interfaces -->
<target name="ejb-local" if="maven.j2ee.ejb.local.includes">
- <!-- ejb jar is always built -->
<echo>Building EJB local interface jar for ${maven.j2ee.ejb.name}</echo>
<!-- in case excludes hasn't been set -->
@@ -384,6 +452,7 @@
</jar>
</target>
+ <!-- produce an ejb jar with remote references -->
<target name="ejb-remote" if="maven.j2ee.ejb.remote.includes">
<!-- ejb jar is always built -->
@@ -423,6 +492,7 @@
</jar>
</target>
+ <!-- process any user defined post ejb jar callback -->
<target name="post-ejb-callback">
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="callback" inheritAll="true" inheritRefs="true">
@@ -431,7 +501,7 @@
<property name="buildTarget"
value="${maven.j2ee.callback.post-ejb.buildTarget}" />
<property name="buildTargetName"
- value="maven.j2ee.callback.post-ejb.buildFile" />
+ value="maven.j2ee.callback.post-ejb.buildTarget" />
</maven-ant>
</target>
1.5 +72 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 3 Jun 2002 07:07:48 -0000 1.4
+++ build.xml 3 Jun 2002 13:44:00 -0000 1.5
@@ -36,13 +36,82 @@
<!-- Pick up struts defaults -->
<property file="${maven.home}/plugins/struts/default.properties"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- V A L I D A T E - S T R U T S - W A R -->
+ <!-- ================================================================== -->
- <target name="validate-struts-war" depends="local-init">
-
+ <!-- validate a struts war file -->
+ <target name="validate-struts-war" depends="local-init,
+ validate-struts-war-init, validate-struts-war-error,
+ pre-validate-struts-war-callback, validate,
+ post-validate-struts-war-callback"/>
+
+ <!-- make sure properties and files are available -->
+ <target name="validate-struts-war-init">
+ <condition property="maven.struts.validate-struts-war.ready">
+ <and>
+ <not>
+ <equals arg1="${maven.j2ee.war.name}" arg2="$${maven.j2ee.war.name}"/>
+ </not>
+ <available file="${maven.build.dir}/${maven.j2ee.war.name}.war"
+ type="file"/>
+ </and>
+ </condition>
+ </target>
+
+ <!-- fail if properties and files aren't available -->
+ <target name="validate-struts-war-error"
+ unless="maven.struts.validate-struts-war.ready">
+ <fail>
+ +------------------------------------------------------------------------------
+ |
+ | ERROR: One of the required properties for maven:validate-struts-war was
+ | not provided.
+ |
+ | Please ensure that the property maven.j2ee.war.name is defined:
+ |
+ | maven.j2ee.war.name = ${maven.j2ee.war.name}
+ |
+ | and the following file exists:
+ |
+ | ${maven.build.dir}/${maven.j2ee.war.name}.war
+ +------------------------------------------------------------------------------
+ </fail>
+ </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" inheritAll="true" inheritRefs="true">
+ <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>
+
+ <!-- perform the validation with a custom task -->
+ <target name="validate">
<struts10warvalidator
warFileName="${maven.build.dir}/${maven.j2ee.war.name}.war">
<formatter type="plain" usefile="false"/>
</struts10warvalidator>
-
</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" inheritAll="true" inheritRefs="true">
+ <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>
+
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
