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/13 16:41:00 UTC
cvs commit: jakarta-turbine-3 build-test.xml deps.list tdk.jar
jvanzyl 02/02/13 07:41:00
Modified: . Tag: rundata_security_changes build-test.xml
deps.list tdk.jar
Log:
- removing the hardcoding of the copying of the jars used for testing, the
JARs to use for testing are now picked off from a properties file.
Revision Changes Path
No revision
No revision
1.11.2.2 +40 -16 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.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- build-test.xml 12 Feb 2002 14:52:03 -0000 1.11.2.1
+++ build-test.xml 13 Feb 2002 15:41:00 -0000 1.11.2.2
@@ -10,19 +10,46 @@
<property file="default.properties" />
<property file="aspects.properties" />
<property file="classpath.properties"/>
-
- <!-- Construct compile/run-time classpath -->
- <path id="classpath">
- <pathelement path="${classpath.list}}"/>
- <pathelement location="${build.dest}"/>
+
+ <path id="tool-classpath">
+ <pathelement location="tdk.jar"/>
</path>
+ <target
+ name="init">
+
+ <taskdef
+ name="create-path"
+ classname="org.apache.tdk.task.CreatePath">
+ <classpath refid="tool-classpath"/>
+ </taskdef>
+
+ <taskdef
+ name="create-patternset"
+ classname="org.apache.tdk.task.CreatePatternSet">
+ <classpath refid="tool-classpath"/>
+ </taskdef>
+
+ <create-path
+ rid="classpath"
+ descriptor="deps.list"
+ basedir="${lib.repo}"
+ />
+
+ <create-patternset
+ rid="runtime.test.set"
+ descriptor="runtime-test.resources"
+ />
+
+ </target>
+
<!-- ================================================================== -->
<!-- C O M P I L E T E S T S -->
<!-- ================================================================== -->
<target
name="compile"
+ depends="init"
description="==> compiles the test source code">
<ant antfile="build.xml" target="compile"/>
@@ -106,7 +133,8 @@
</target>
<target
- name="turbine-servlet-tests">
+ name="turbine-servlet-tests"
+ depends="init">
<junit
printsummary="no"
@@ -214,16 +242,12 @@
with the testapp -->
<mkdir dir="${build.dir}/rttest/lib"/>
- <copy file="${cactus.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${commons-beanutils.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${commons-collections.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${commons-util.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${dom4j.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${fulcrum.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${junit.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${log4j.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${stratum.jar}" todir="${build.dir}/rttest/lib"/>
- <copy file="${velocity.jar}" todir="${build.dir}/rttest/lib"/>
+
+ <copy todir="${build.dir}/rttest/lib">
+ <fileset dir="${lib.repo}">
+ <patternset refid="runtime.test.set"/>
+ </fileset>
+ </copy>
<antcall target="copy-aspectj-runtime"/>
1.2.2.6 +1 -1 jakarta-turbine-3/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/deps.list,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- deps.list 13 Feb 2002 04:42:18 -0000 1.2.2.5
+++ deps.list 13 Feb 2002 15:41:00 -0000 1.2.2.6
@@ -5,8 +5,8 @@
commons-collections.jar
commons-util-0.1-dev.jar
dom4j-1.1.jar
-velocity-dvsl-0.31.jar
fulcrum-1.0.jar
+velocity-dvsl-0.31.jar
jakarta-regexp-1.3-dev.jar
log4j-1.1.3.jar
servlet-2.2.jar
1.1.2.6 +30 -32 jakarta-turbine-3/tdk.jar
<<Binary file>>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>