You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2003/02/10 14:23:11 UTC
cvs commit: db-torque build-test.xml maven.xml project.properties
mpoeschl 2003/02/10 05:23:11
Modified: . build-test.xml maven.xml project.properties
Log:
update rttest to use the generator
Revision Changes Path
1.42 +6 -40 db-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/db-torque/build-test.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build-test.xml 29 Dec 2002 18:21:53 -0000 1.41
+++ build-test.xml 10 Feb 2003 13:23:10 -0000 1.42
@@ -5,7 +5,7 @@
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
<!-- Allow user defaults for this project -->
- <property file="build.properties" />
+ <property file="project.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
@@ -62,7 +62,7 @@
<copy
tofile="${build.test}/rttest/build-torque.xml"
- file="${src.dir}/conf/build-torque.xml"
+ file="${torque.generator.home}/src/conf/build-torque.xml"
overwrite="yes"
/>
</target>
@@ -275,51 +275,17 @@
<!-- Build classpath -->
<path id="classpath">
<pathelement location="${build.dest}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-configuration.jar}"/>
- <pathelement location="${commons-dbcp.jar}"/>
- <pathelement location="${commons-lang.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
- <pathelement location="${jcs.jar}"/>
- <pathelement location="${jdbc.jar}"/>
- <pathelement location="${jndi.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${stratum.jar}"/>
- <pathelement location="${tomcat-naming.jar}"/>
<pathelement location="${torque.destDir}"/>
<pathelement location="${torque.testDatabaseJar}"/>
- <pathelement location="${village.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
+ <fileset dir="${build.test}/rttest/lib">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<target
name="test-runtime"
depends="filterTokens">
- <echo>
- ${build.dest}
- ${commons-beanutils.jar}
- ${commons-collections.jar}
- ${commons-configuration.jar}
- ${commons-dbcp.jar}
- ${commons-lang.jar}
- ${commons-logging.jar}
- ${commons-pool.jar}
- ${jcs.jar}
- ${jdbc.jar}
- ${jndi.jar}
- ${log4j.jar}
- ${stratum.jar}
- ${tomcat-naming.jar}
- ${torque.testDatabaseJar}
- ${village.jar}
- ${xerces.jar}
- ${xmlParserAPIs.jar}
- </echo>
-
<!-- Copy test Torque.properties -->
<copy
tofile="${build.test}/rttest/Torque.properties"
@@ -387,7 +353,7 @@
unless="useClasspath">
-->
<copy todir="${test.templateDir}">
- <fileset dir="${src.dir}/templates"/>
+ <fileset dir="${torque.generator.home}/src/templates"/>
</copy>
</target>
1.15 +7 -25 db-torque/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/db-torque/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 28 Nov 2002 21:25:06 -0000 1.14
+++ maven.xml 10 Feb 2003 13:23:10 -0000 1.15
@@ -16,22 +16,11 @@
<!-- include them in the jar file -->
<!-- ================================================================== -->
<postGoal name="java:compile">
- <!-- copy database.dtd to the right place -->
- <copy
- file="${maven.src.dir}/dtd/database.dtd"
- todir="${maven.build.dest}/org/apache/torque/engine/database/transform"
- />
-
<!-- copy default.properties to the right place -->
<copy
file="${maven.src.dir}/conf/default.properties"
todir="${maven.build.dest}/org/apache/torque"
/>
-
- <!-- copy templates to the right place -->
- <copy todir="${maven.build.dest}">
- <fileset dir="${maven.src.dir}/templates" />
- </copy>
</postGoal>
<!-- ================================================================== -->
@@ -41,10 +30,6 @@
<!-- to include them in the binary dists -->
<!-- ================================================================== -->
<preGoal name="dist:build-bin">
- <!-- copy templates to the right place -->
- <copy todir="${maven.dist.bin.assembly.dir}/templates">
- <fileset dir="${maven.src.dir}/templates" />
- </copy>
<!-- copy schema files to the right place -->
<copy todir="${maven.dist.bin.assembly.dir}/schema">
@@ -80,11 +65,6 @@
prereqs="java:jar"
description="distribution without dependency jars">
- <!-- copy templates to the right place -->
- <copy todir="${maven.dist.bin.assembly.dir}/templates">
- <fileset dir="${maven.src.dir}/templates" />
- </copy>
-
<!-- copy schema files to the right place -->
<copy todir="${maven.dist.bin.assembly.dir}/schema">
<fileset dir="${maven.src.dir}/schema" />
@@ -181,7 +161,7 @@
<copy
tofile="${build.test}/rttest/build-torque.xml"
- file="${src.dir}/conf/build-torque.xml"
+ file="${torque.generator.home}/src/conf/build-torque.xml"
overwrite="yes"
/>
<copy
@@ -194,12 +174,17 @@
<deploy:copy-deps todir="${build.test}/rttest/lib"/>
<copy file="${maven.build.dir}/${maven.final.name}.jar"
todir="${build.test}/rttest/lib"/>
+ <copy todir="${build.test}/rttest/lib">
+ <fileset dir="${torque.generator.home}/target/">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
<copy file="${torque.testDatabaseJar}"
todir="${build.test}/rttest/lib"/>
<!-- copy templates -->
<copy todir="${build.test}/rttest/templates">
- <fileset dir="${src.dir}/templates"/>
+ <fileset dir="${torque.generator.home}/src/templates"/>
</copy>
<!-- copy Torque.properties -->
@@ -209,8 +194,5 @@
filtering="yes"
overwrite="yes"
/>
-
</goal>
-
-
</project>
1.7 +2 -0 db-torque/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/db-torque/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 6 Dec 2002 17:35:21 -0000 1.6
+++ project.properties 10 Feb 2003 13:23:10 -0000 1.7
@@ -6,6 +6,8 @@
# your build.properties file.
# -------------------------------------------------------------------
+torque.generator.home = src/generator
+
maven.checkstyle.format = turbine
# display the date on the site