jvanzyl 2002/06/06 08:04:01
Modified: src/templates/build/plugins/core build-init.xml build.xml
src/templates/build/plugins/docs build.xml
src/templates/build/plugins/iutest build.xml
src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/metrics build.xml
src/templates/build/plugins/reactor build.xml
src/templates/build/plugins/struts build.xml
src/templates/build/plugins/test build.xml
Removed: src/templates/build build.init.target
Log:
Changing all the init sequences to use the jars.list because there's
a task that will deal with this. I see a better way of doing this
but for now it keeps our dependencies in a single spot.
Revision Changes Path
1.7 +7 -2
jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml
Index: build-init.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-init.xml 6 Jun 2002 14:09:00 -0000 1.6
+++ build-init.xml 6 Jun 2002 15:04:00 -0000 1.7
@@ -6,7 +6,7 @@
Based on src/templates/build/build-init-target v1.37
author: dion
- version: $Id: build-init.xml,v 1.6 2002/06/06 14:09:00 jvanzyl Exp $
+ version: $Id: build-init.xml,v 1.7 2002/06/06 15:04:00 jvanzyl Exp $
-->
<project name="maven-init" default="verify-project">
@@ -47,9 +47,14 @@
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
- reference="maven-classpath"
+ reference="pre-maven-classpath"
baseDir="${lib.repo}"
/>
+
+ <path id="maven-classpath">
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </path>
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
1.16 +17 -6 jakarta-turbine-maven/src/templates/build/plugins/core/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 6 Jun 2002 13:30:38 -0000 1.15
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.16
@@ -7,15 +7,26 @@
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
1.12 +18 -7 jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 6 Jun 2002 06:04:45 -0000 1.11
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.12
@@ -6,19 +6,30 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- 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
load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
1.6 +17 -6
jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 6 Jun 2002 06:04:44 -0000 1.5
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.6
@@ -6,15 +6,26 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
1.16 +18 -7 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 6 Jun 2002 09:44:03 -0000 1.15
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.16
@@ -6,19 +6,30 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- 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
load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
1.7 +18 -7
jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 6 Jun 2002 06:04:45 -0000 1.6
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.7
@@ -6,19 +6,30 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- 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
load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
1.5 +17 -6
jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 5 Jun 2002 00:50:24 -0000 1.4
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.5
@@ -6,15 +6,26 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
1.9 +17 -6
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 6 Jun 2002 06:04:44 -0000 1.8
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.9
@@ -6,15 +6,26 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
1.7 +18 -7 jakarta-turbine-maven/src/templates/build/plugins/test/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/test/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 6 Jun 2002 06:04:44 -0000 1.6
+++ build.xml 6 Jun 2002 15:04:00 -0000 1.7
@@ -6,19 +6,30 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up init properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/init.properties"/>
-
- <!-- define maven classpath for the build -->
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="${maven.home}/plugins/core/jars.list"
+ reference="pre-maven-classpath"
+ baseDir="${lib.repo}"
+ />
+
<path id="maven-classpath">
- <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ <path refid="pre-maven-classpath"/>
+ <pathelement location="${lib.repo}/maven.jar"/>
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- 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
load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
