dion 2002/06/03 00:07:48
Modified: src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/struts Control.vm build.xml
Log:
Reworked struts plug-in to use the new parse-less init processing
Revision Changes Path
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 3 Jun 2002 03:44:55 -0000 1.8
+++ build.xml 3 Jun 2002 07:07:48 -0000 1.9
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<project name="maven" default="war" basedir="$antBasedir">
+<project name="maven-j2ee" default="war" basedir="..">
<!-- ================================================================== -->
<!-- I N I T -->
1.2 +9 -7
jakarta-turbine-maven/src/templates/build/plugins/struts/Control.vm
Index: Control.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/struts/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 22 May 2002 06:55:28 -0000 1.1
+++ Control.vm 3 Jun 2002 07:07:48 -0000 1.2
@@ -1,5 +1,12 @@
+##
+## author: dion
+## version: $Id: Control.vm,v 1.2 2002/06/03 07:07:48 dion Exp $
+##
+## Long term we need to remove this file. It provides:
+## 1) a list of files for the bootstrap to copy (installation of plugin)
+## 2) targets for the delegator (part of install, or done in a maven script)
## -------------------------------------------------------
-## Control file for Maven j2ee plug-in
+## Control file for Maven struts plug-in
## -------------------------------------------------------
## -------------------------------------------------------
@@ -9,11 +16,6 @@
$buildElements.add("plugins/$plugin/default.properties")
## -------------------------------------------------------
-## Make the list of build-j2ee.xml delegators
+## Make the list of build.xml delegators
## -------------------------------------------------------
$delegators.put("validate-struts-war", "plugins/$plugin/build.xml")
-
-## -------------------------------------------------------
-## Make the list of build-j2ee.xml callbacks
-## -------------------------------------------------------
-$callbacks.put( "$plugin", [ "pre-validate-struts-war", "post-validate-struts-war"]
)
1.4 +27 -9
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 31 May 2002 16:10:53 -0000 1.3
+++ build.xml 3 Jun 2002 07:07:48 -0000 1.4
@@ -1,25 +1,43 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<project name="$project.id" default="war" basedir="$antBasedir">
+<project name="maven-struts" default="validate-struts-war" basedir="..">
-#parse("build.init.target")
+ <!-- ================================================================== -->
+ <!-- I N I T -->
+ <!-- ================================================================== -->
+ <target name="init">
+ <!-- Pick up tool default properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/default.properties"/>
+
+ <!-- define maven classpath for the build -->
+ <path id="maven-classpath">
+ <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ </path>
+
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <taskdef resource="maven-taskdefs.properties">
+ <classpath refid="maven-classpath" />
+ </taskdef>
+
+ <!-- call common build file initialization to verify project, update jars
+ etc -->
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="verify-project" inheritAll="true" inheritRefs="true"
+ exportAll="true"/>
+ </target>
<!-- ================================================================== -->
<!-- L O C A L I N I T -->
<!-- ================================================================== -->
<target name="local-init" depends="init">
- <!-- Pick up tool specific defaults -->
- <property file="${maven.home}/plugins/$plugin/default.properties"/>
+ <!-- Pick up j2ee defaults -->
<property file="${maven.home}/plugins/j2ee/default.properties"/>
+ <!-- Pick up struts defaults -->
+ <property file="${maven.home}/plugins/struts/default.properties"/>
</target>
<target name="validate-struts-war" depends="local-init">
- <taskdef name="struts10warvalidator"
- classname="org.apache.maven.struts.Struts10WarValidator">
- <classpath refid="maven-classpath"/>
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
<struts10warvalidator
warFileName="${maven.build.dir}/${maven.j2ee.war.name}.war">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
