You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/12 15:52:03 UTC
cvs commit: jakarta-turbine-3 build-test.xml build.xml default.properties deps.list
jvanzyl 02/02/12 06:52:03
Modified: . Tag: rundata_security_changes build-test.xml
build.xml default.properties deps.list
Log:
- using the <create-path> task to try and make managing changes easier, i will
get this fully working and then i will post a proposal.
i want to be able to generate a build system easily with maven so that
each project under turbine has the same setup and if we modify the build.xml
file then we can easily upgrade all projects.
i want to create separate builds for each of the stratum components and each
of the fulcrum services and i'm not doing it by hand. maintenance will also
get out of control. with decoupling comes the need for better management
tools, i hope this simple solution will help us keep track of everything.
Revision Changes Path
No revision
No revision
1.11.2.1 +3 -20 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- build-test.xml 24 Jan 2002 03:55:25 -0000 1.11
+++ build-test.xml 12 Feb 2002 14:52:03 -0000 1.11.2.1
@@ -9,29 +9,12 @@
<!-- Set default values for the build -->
<property file="default.properties" />
<property file="aspects.properties" />
-
+ <property file="classpath.properties"/>
+
<!-- Construct compile/run-time classpath -->
<path id="classpath">
- <pathelement location="${dom4j.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-util.jar}"/>
- <pathelement location="${fulcrum.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${cactus.jar}"/>
- <pathelement location="${cactus-ant.jar}"/>
- <pathelement location="${httpunit.jar}"/>
- <pathelement location="${httpclient.jar}"/>
- <pathelement location="${tidy.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${log4j.jar}"/>
+ <pathelement path="${classpath.list}}"/>
<pathelement location="${build.dest}"/>
-
- <!-- AspectJ Runtime Jar -->
- <pathelement location="${aspectjrt.jar}"/>
-
</path>
<!-- ================================================================== -->
1.20.2.3 +33 -51 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- build.xml 6 Feb 2002 14:44:21 -0000 1.20.2.2
+++ build.xml 12 Feb 2002 14:52:03 -0000 1.20.2.3
@@ -13,39 +13,11 @@
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
+
+ <!-- Create a classpath from the deps.list file using
+ the ${lib.repo} as the base directory -->
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- <property name="src.adapter.dir" value="${src.dir}/adapter"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="final.dir" value="../${final.name}/"/>
- <property name="src.aspects.dir" value="${src.dir}/aspects"/>
-
- <!-- Build classpath -->
- <path id="classpath">
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-util.jar}"/>
- <pathelement location="${dom4j.jar}"/>
- <pathelement location="${dvsl.jar}"/>
- <pathelement location="${fulcrum.jar}"/>
- <pathelement location="${jaf.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${regexp.jar}"/>
- <pathelement location="${torque.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-util.jar}"/>
- <pathelement location="${stratum.jar}"/>
-
- <!-- AspectJ Jars for non-invasive use of aspects -->
- <pathelement location="${aspectjrt.jar}"/>
- <pathelement location="${aspectjtools.jar}"/>
-
- <!-- Required for auto jar updating -->
+ <path id="tool-classpath">
<pathelement location="tdk.jar"/>
</path>
@@ -59,7 +31,7 @@
<taskdef
name="httpget"
className="org.apache.tdk.task.Get">
- <classpath refid="classpath"/>
+ <classpath refid="tool-classpath"/>
</taskdef>
<!-- If you need proxy support you'll have to manually add:
@@ -86,27 +58,33 @@
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
<echo message="lib.repo = ${lib.repo}"/>
+
+ <taskdef
+ name="create-classpath"
+ classname="org.apache.tdk.task.CreatePath">
+ <classpath refid="tool-classpath"/>
+ </taskdef>
+
+ <create-path
+ pathId="classpath"
+ pathDescriptor="deps.list"
+ basedir="${lib.repo}"
+ />
+
+ <property name="classpath" refid="classpath"/>
+
+ <echo message="Classpath created from deps.list:"/>
+ <echo message="${classpath}"/>
- <echo message="commons-beanutils.jar = ${commons-beanutils.jar}"/>
- <echo message="commons-collections.jar = ${commons-collections.jar}"/>
- <echo message="commons-util.jar = ${commons-util.jar}"/>
- <echo message="dom4j.jar = ${dom4j.jar}"/>
- <echo message="fulcrum.jar = ${fulcrum.jar}"/>
- <echo message="jaf.jar = ${jaf.jar}"/>
- <echo message="log4j.jar = ${log4j.jar}"/>
- <echo message="regexp.jar = ${regexp.jar}"/>
- <echo message="servlet.jar = ${servlet.jar}"/>
- <echo message="stratum.jar = ${stratum.jar}"/>
- <echo message="torque.jar = ${torque.jar}"/>
- <echo message="velocity.jar = ${velocity.jar}"/>
- <echo message="xerces.jar = ${xerces.jar}"/>
</target>
<!-- ================================================================== -->
<!-- U S A G E -->
<!-- ================================================================== -->
- <target name="usage">
+ <target
+ name="usage">
+
<echo message="use -projecthelp to see the available targets"/>
</target>
@@ -116,12 +94,13 @@
<target
name="compile"
+ depends="env"
description="--> compiles the source code">
<mkdir dir="${build.dest}"/>
<javac
- srcdir="${src.java.dir}/org:${src.dir}/tool/org"
+ srcdir="${srcdir}"
destdir="${build.dest}"
excludes="**/package.html"
debug="${debug}"
@@ -348,7 +327,7 @@
<javadoc
sourcepath="${build.src}"
- packagenames="${package}.*,org.apache.fulcrum.*,org.apache.torque.*"
+ packagenames="${package}.*"
destdir="${javadoc.destdir}"
author="true"
private="true"
@@ -363,10 +342,13 @@
</target>
<!-- ================================================================== -->
- <!-- CLEAN -->
+ <!-- C L E A N -->
<!-- ================================================================== -->
- <target name="clean" description="--> cleans up the build directory">
+ <target
+ name="clean"
+ description="--> cleans up the build directory">
+
<delete dir="${build.dir}"/>
</target>
1.12.2.2 +7 -24 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- default.properties 6 Feb 2002 14:44:21 -0000 1.12.2.1
+++ default.properties 12 Feb 2002 14:52:03 -0000 1.12.2.2
@@ -23,25 +23,14 @@
optimize = off
deprecation = off
-# Please see the BUILDING.txt file for information
-# on the locations of where to find each of these
-# jar files
+src.java.dir =${src.dir}/java
+src.test.dir =${src.dir}/test
+src.adapter.dir = ${src.dir}/adapter
+final.name = ${project}-${version}
+final.dir =../${final.name}
+src.aspects.dir = ${src.dir}/aspects
-velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
-log4j.jar = ${lib.repo}/log4j-1.1.3.jar
-servlet.jar = ${lib.repo}/servlet-2.2.jar
-fulcrum.jar = ${lib.repo}/fulcrum-1.0.jar
-regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
-torque.jar = ${lib.repo}/torque-3.0-dev.jar
-jaf.jar = ${lib.repo}/activation-1.0.1.jar
-xerces.jar = ${lib.repo}/xerces-1.4.4.jar
-commons-collections.jar = ${lib.repo}/commons-collections.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
-stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
-dom4j.jar = ${lib.repo}/dom4j-1.1.jar
-commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
-httpclient.jar = ${lib.repo}/httpclient.jar
-dvsl.jar = ${lib.repo}/velocity-dvsl-0.31.jar
+srcdir = ${src.java.dir}/org:${src.dir}/tool/org
# -------------------------------------------------------------------
# D O C U M E N T A T I O N
@@ -56,12 +45,6 @@
test.dir = ${src.dir}/test
test.reportsDirectory = test-reports
rttest.dir = ${src.dir}/rttest
-
-junit.jar = ${lib.repo}/junit-3.7.jar
-cactus.jar = ${lib.repo}/cactus.jar
-cactus-ant.jar = ${lib.repo}/cactus-ant.jar
-httpunit.jar = ${lib.repo}/httpunit.jar
-tidy.jar = ${lib.repo}/tidy.jar
tomcat.home.40 = ${tdk.home}
webapp.dir = ${rttest.dir}/testapp
1.2.2.3 +13 -6 jakarta-turbine-3/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/deps.list,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- deps.list 8 Feb 2002 18:00:46 -0000 1.2.2.2
+++ deps.list 12 Feb 2002 14:52:03 -0000 1.2.2.3
@@ -1,20 +1,27 @@
+---------------------------------------------------
+-- B U I L D
+---------------------------------------------------
activation-1.0.1.jar
-cactus-ant.jar
-cactus.jar
commons-beanutils.jar
commons-collections.jar
commons-util-0.1-dev.jar
dom4j-1.1.jar
velocity-dvsl-0.31.jar
fulcrum-1.0.jar
-httpclient.jar
-httpunit.jar
jakarta-regexp-1.3-dev.jar
-junit-3.7.jar
log4j-1.1.3.jar
servlet-2.2.jar
stratum-0.1-dev.jar
-tidy.jar
torque-3.0-dev.jar
velocity-1.3-dev.jar
xerces-1.4.4.jar
+
+---------------------------------------------------
+-- T E S T I N G
+---------------------------------------------------
+cactus-ant.jar
+cactus.jar
+httpclient.jar
+httpunit.jar
+junit-3.7.jar
+tidy.jar
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>