commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prick...@apache.org
Subject cvs commit: jakarta-commons-sandbox/periodicity/conf/build build.om.properties
Date Fri, 04 Oct 2002 16:11:34 GMT
prickett    2002/10/04 09:11:34

  Modified:    periodicity build-legacy.xml maven.xml
               periodicity/conf/build build.om.properties
  Log:
  Moved property file definitions from build-legacy.xml to maven.xml.
  
  Moved the definition of maven.torque.dir to build.om.properties and
  renamed it to torque.dir
  
  Added a maven goal named sql.
  
  Added a property named torque.sql.dir to build.om.properties
  
  Revision  Changes    Path
  1.4       +3 -6      jakarta-commons-sandbox/periodicity/build-legacy.xml
  
  Index: build-legacy.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/build-legacy.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-legacy.xml	3 Oct 2002 21:59:46 -0000	1.3
  +++ build-legacy.xml	4 Oct 2002 16:11:34 -0000	1.4
  @@ -1,8 +1,4 @@
   <project name="Periodicity" default="core" basedir=".">
  -  <property file="./conf/build/build.om.properties"/>
  -  <property file="./conf/build/build.db.properties"/>
  -  <property file="./conf/build/build.jars.properties"/>
  -  <property name="maven.torque.dir" value="${maven.build.dir}/torque"/>
   
     <path id="classpath">
       <fileset dir="${maven.home}/repository">
  @@ -11,11 +7,12 @@
     </path>
   
     <target name="extract-torque-files">
  -    <mkdir dir="${maven.torque.dir}"/>
  -    <unjar src="${torque.jar}" dest="${maven.torque.dir}"/>
  +    <mkdir dir="${torque.dir}"/>
  +    <unjar src="${torque.jar}" dest="${torque.dir}"/>
     </target>  
     
     <target name="om" depends="extract-torque-files">
       <ant antfile="build-torque.xml" target="om"/>
     </target>  
  +
   </project>  
  
  
  
  1.3       +10 -0     jakarta-commons-sandbox/periodicity/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	3 Oct 2002 20:37:46 -0000	1.2
  +++ maven.xml	4 Oct 2002 16:11:34 -0000	1.3
  @@ -1,9 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <project default="java:jar">
  +
  +  <property file="./conf/build/build.om.properties"/>
  +  <property file="./conf/build/build.db.properties"/>
  +  <property file="./conf/build/build.jars.properties"/>
  +
     <preGoal name="java:compile">
       <ant antfile="build-legacy.xml"
            target="om"/>
     </preGoal>
  +
  +  <goal name="sql">
  +    <ant antfile="build-torque.xml" target="sql"/>
  +  </goal>  
  +  
   </project>  
     
   
  
  
  
  1.6       +3 -1      jakarta-commons-sandbox/periodicity/conf/build/build.om.properties
  
  Index: build.om.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.om.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.om.properties	3 Oct 2002 22:28:58 -0000	1.5
  +++ build.om.properties	4 Oct 2002 16:11:34 -0000	1.6
  @@ -108,8 +108,10 @@
   #
   # ------------------------------------------------------------------------
   
  +torque.dir=${maven.build.dir}/torque
   torque.schema.dir=src/xml
   torque.contextProperties=conf/build/build.om.properties
   torque.template.om=om/Control.vm
  -torque.templatePath=${maven.build.dir}/torque
  +torque.templatePath=${torque.dir}
   torque.java.dir=${maven.build.dir}/generated_java_code
  +torque.sql.dir=${maven.build.dir}/sql
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message