stephenh 2002/09/28 20:25:25
Modified: . maven.xml build-test.xml
Log:
Removed the rttest-specifc versions of Torque.properties and build-test.xml as I
could see no significant differences between them and there more prominent defaults.
Revision Changes Path
1.12 +3 -10 jakarta-turbine-torque/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven.xml 27 Sep 2002 23:04:58 -0000 1.11
+++ maven.xml 29 Sep 2002 03:25:25 -0000 1.12
@@ -122,7 +122,7 @@
description="runtime tests (set torque.testProfile in your build.properties)">
<ant antfile="build-test.xml"
- dir="${torque.distDir}"
+ target="test"
inheritAll="false"/>
</goal>
@@ -132,7 +132,6 @@
description="runtime tests using useClasspath property (set torque.testProfile
in your build.properties)">
<ant antfile="build-test.xml"
- dir="${torque.distDir}"
target="test-classpath"
inheritAll="false"/>
</goal>
@@ -178,12 +177,6 @@
<fileset dir="${rttest.dir}"/>
</copy>
- <!-- copy ant build files -->
- <copy
- tofile="${build.test}/rttest/build-test.xml"
- file="${src.dir}/rttest/build-test.xml"
- overwrite="yes"
- />
<copy
tofile="${build.test}/rttest/build-torque.xml"
file="${src.dir}/conf/build-torque.xml"
@@ -209,8 +202,8 @@
<!-- copy Torque.properties -->
<copy
- todir="${build.test}/rttest"
- file="src/rttest/Torque.properties"
+ tofile="${build.test}/rttest/Torque.properties"
+ file="src/conf/master/Torque.master"
filtering="yes"
/>
1.37 +2 -2 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build-test.xml 28 Sep 2002 02:47:23 -0000 1.36
+++ build-test.xml 29 Sep 2002 03:25:25 -0000 1.37
@@ -299,8 +299,8 @@
<!-- Copy test Torque.properties -->
<copy
- todir="${build.test}/rttest"
- file="src/rttest/Torque.properties"
+ tofile="${build.test}/rttest/Torque.properties"
+ file="src/conf/master/Torque.master"
filtering="yes"
/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
