db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: db-torque build-test.xml default.properties
Date Wed, 30 Apr 2003 22:16:11 GMT
mpoeschl    2003/04/30 15:16:11

  Modified:    .        build-test.xml default.properties
  Log:
  cleanup build for runtime tests
  
  Revision  Changes    Path
  1.43      +2 -58     db-torque/build-test.xml
  
  Index: build-test.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/build-test.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- build-test.xml	10 Feb 2003 13:23:10 -0000	1.42
  +++ build-test.xml	30 Apr 2003 22:16:10 -0000	1.43
  @@ -20,19 +20,7 @@
   
     <target
       name="test-prepare"
  -    depends="filterTokens,test-libs,test-templates">
  -
  -    <!-- Use the profile as the build.properties file
  -         in the dist directory so that it is customizable
  -         by each tester. -->
  -
  -    <echo message="Copying profile into distribution directory: ${torque.testProfile}"/>
  -
  -    <copy
  -      tofile="${torque.distDir}/build.properties"
  -      file="${torque.testProfile}"
  -      overwrite="yes"
  -    />
  +    depends="filterTokens,test-libs">
   
       <!-- copy test schemas -->
       <copy
  @@ -54,17 +42,6 @@
           <include name="*.ref.xml"/>
         </fileset>
       </copy>
  -
  -    <!-- copy test sources -->
  -    <copy todir="${torque.distDir}/src/java">
  -      <fileset dir="${rttest.dir}"/>
  -    </copy>
  -
  -    <copy
  -      tofile="${build.test}/rttest/build-torque.xml"
  -      file="${torque.generator.home}/src/conf/build-torque.xml"
  -      overwrite="yes"
  -    />
     </target>
   
     <target
  @@ -321,41 +298,9 @@
       <mkdir dir="${test.libDir}"/>
       <mkdir dir="${build.test}/logs"/>
   
  -    <copy file="${build.dir}/${torque.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-beanutils.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-collections.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-configuration.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-dbcp.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-lang.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-logging.jar}" todir="${test.libDir}"/>
  -    <copy file="${commons-pool.jar}" todir="${test.libDir}"/>
  -    <copy file="${jcs.jar}" todir="${test.libDir}"/>
  -    <copy file="${jdbc.jar}" todir="${test.libDir}"/>
  -    <copy file="${jndi.jar}" todir="${test.libDir}"/>
  -    <copy file="${log4j.jar}" todir="${test.libDir}"/>
  -    <copy file="${stratum.jar}" todir="${test.libDir}"/>
       <copy file="${tomcat-naming.jar}" todir="${test.libDir}"/>
       <copy file="${torque.testDatabaseJar}" todir="${test.libDir}"/>
       <copy file="${velocity.jar}" todir="${test.libDir}"/>
  -    <copy file="${village.jar}" todir="${test.libDir}"/>
  -    <copy file="${xerces.jar}" todir="${test.libDir}"/>
  -    <copy file="${xmlParserAPIs.jar}" todir="${test.libDir}"/>
  -  </target>
  -
  -  <!-- copy templates if they are not loaded from the classpath -->
  -  <target
  -    name="test-templates">
  -<!--
  -    FIXME!!
  -    the id-table-init-sql loads ${templatePath}/sql/id-table/project.props
  -    so the templates must be copied for now
  -
  -    unless="useClasspath">
  --->
  -    <copy todir="${test.templateDir}">
  -      <fileset dir="${torque.generator.home}/src/templates"/>
  -    </copy>
  -
     </target>
   
     <!-- ============================================================== -->
  @@ -364,7 +309,7 @@
   
     <target
       name="sql-test"
  -    depends="test-libs,test-templates">
  +    depends="test-libs">
   
       <filter token="DATABASE_DEFAULT" value="${torque.sqlTest.defaultDatabase}"/>
       <filter token="DATABASE_URL" value="${torque.sqlTest.databaseUrl}"/>
  @@ -412,7 +357,6 @@
         antfile="${torque.buildFile}"
         target="insert-sql">
       </ant>
  -
     </target>
   
   </project>
  
  
  
  1.56      +0 -34     db-torque/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/db-torque/default.properties,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- default.properties	18 Apr 2003 07:42:42 -0000	1.55
  +++ default.properties	30 Apr 2003 22:16:10 -0000	1.56
  @@ -6,13 +6,6 @@
   # your ${user.home}/build.properties file.
   # -------------------------------------------------------------------
   
  -name = Torque
  -project = torque
  -version = 3.1-alpha1
  -package = org.apache.${project}
  -final.name = ${project}-${version}
  -torque.jar = ${final.name}.jar
  -
   build.dir = ./target
   build.dest = ${build.dir}/classes
   build.test = ${build.dir}/test
  @@ -33,16 +26,6 @@
   torque.testSchema = src/rttest/bookstore-schema.xml
   lib.repo = ${maven.home}/repository
   
  -docs.src = ./xdocs
  -docs.dest = ./docs
  -javadoc.destdir = ./docs/api
  -jakarta.site2 = ../jakarta-site2
  -
  -year = 1999-2003
  -debug = on
  -optimize = off
  -deprecation = off
  -
   # You must set values for the JAR file properties listed here, or in
   # your ${user.home}/build.properties or local build.properties file in
   # order to build Torque:
  @@ -50,22 +33,5 @@
   # WARNING!!!!!!!
   # if you make changes to these properties also make sure to
   # change the src/conf/build-torque.xml file!!!!!
  -# also make sure to sync with the jars.list!!!!
  -commons-beanutils.jar = ${lib.repo}/commons-beanutils/jars/commons-beanutils-1.6.1.jar
  -commons-collections.jar = ${lib.repo}/commons-collections/jars/commons-collections-2.1.jar
  -commons-configuration.jar = ${lib.repo}/commons-configuration/jars/commons-configuration-SNAPSHOT.jar
  -commons-dbcp.jar = ${lib.repo}/commons-dbcp/jars/commons-dbcp-SNAPSHOT.jar
  -commons-lang.jar = ${lib.repo}/commons-lang/jars/commons-lang-1.0.1.jar
  -commons-logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.2.jar
  -commons-pool.jar = ${lib.repo}/commons-pool/jars/commons-pool-1.0.jar
  -jcs.jar = ${lib.repo}/jcs/jars/jcs-1.0-dev.jar
  -jdbc.jar = ${lib.repo}/jdbc/jars/jdbc-2.0.jar
  -jndi.jar = ${lib.repo}/jndi/jars/jndi-1.2.1.jar
  -junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
  -log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.7.jar
  -stratum.jar = ${lib.repo}/stratum/jars/stratum-1.0-b3.jar
   tomcat-naming.jar = ${lib.repo}/tomcat/jars/tomcat-naming-1.0.jar
   velocity.jar = ${lib.repo}/velocity/jars/velocity-1.3.jar
  -village.jar = ${lib.repo}/village/jars/village-2.0-dev-20021111.jar
  -xerces.jar = ${lib.repo}/xerces/jars/xercesImpl-2.0.2.jar
  -xmlParserAPIs.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.0.2.jar
  
  
  

Mime
View raw message