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/src/xml periodicity-schema.xml
Date Thu, 03 Oct 2002 20:37:47 GMT
prickett    2002/10/03 13:37:46

  Modified:    periodicity build-legacy.xml build-torque.xml maven.xml
               periodicity/conf/build build.jars.properties
                        build.om.properties
               periodicity/src/xml periodicity-schema.xml
  Log:
  Added target om to the build-legacy file to create the Object Model
  
  Removed unnecessary references from build.jars.properties because dependencies
  are now largely determined by maven
  
  Changed useClasspath to false
  
  Added the following properties to the build.om.properties
      torque.contextProperties
      torque.template.om
      torque.templatePath
  
  Removed the defaultIdMethod attribute from the table tags in the
  periodicity-schema.xml file
  
  Revision  Changes    Path
  1.2       +29 -22    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build-legacy.xml	3 Oct 2002 04:07:57 -0000	1.1
  +++ build-legacy.xml	3 Oct 2002 20:37:46 -0000	1.2
  @@ -16,10 +16,10 @@
     <property name="final.dir" value="./${final-name}"/>
     <property name="build.properties" value="build.properties"/>
     <property name="build.sysclasspath" value="first"/>
  -  <property file="${build.properties}"/>
     <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">
  @@ -37,7 +37,34 @@
     </target>
   
     <target name="extract-torque-files">
  -    <unjar src="${torque.jar}" dest="${torque.home}"/>
  +    <mkdir dir="${maven.torque.dir}"/>
  +    <unjar src="${torque.jar}" dest="${maven.torque.dir}"/>
  +  </target>  
  +  
  +  <target name="om" depends="extract-torque-files">
  +    <ant antfile="build-torque.xml" target="om"/>
  +  </target>  
  +  
  +  
  +  <target name="generate-peers" depends="mv-src">
  +    <antcall target="extract-torque-files"/>
  +    <taskdef
  +      name="torque-om"
  +      classname="org.apache.torque.task.TorqueDataModelTask">
  +      <classpath refid="classpath"/>
  +    </taskdef>  
  +    
  +    <torque-om
  +      contextProperties="./conf/build/build.om.properties"
  +      basePathToDbProps="sql/base/"
  +      targetPackage="${targetPackage}.om"
  +      sqlDbMap="${build.src}/sql/sqldb.map"
  +      useClasspath="true"
  +      targetDatabase="${database}">
  +      <fileset dir="./src/xml">
  +        <include name="periodicity-schema.xml"/>
  +      </fileset>
  +    </torque-om>  
     </target>  
   
     <target name="generate-sql" depends="update-id-xml">
  @@ -62,26 +89,6 @@
       </torque-sql>
     </target>
   
  -  <target name="generate-peers" depends="mv-src">
  -    <antcall target="extract-torque-files"/>
  -    <taskdef
  -      name="torque-om"
  -      classname="org.apache.torque.task.TorqueDataModelTask">
  -      <classpath refid="classpath"/>
  -    </taskdef>  
  -    
  -    <torque-om
  -      contextProperties="./conf/build/build.om.properties"
  -      basePathToDbProps="sql/base/"
  -      targetPackage="${targetPackage}.om"
  -      sqlDbMap="${build.src}/sql/sqldb.map"
  -      useClasspath="true"
  -      targetDatabase="${database}">
  -      <fileset dir="./src/xml">
  -        <include name="periodicity-schema.xml"/>
  -      </fileset>
  -    </torque-om>  
  -  </target>  
   
     <target name="test-vobjects">
       <junit printsummary="yes" haltonfailure="yes">
  
  
  
  1.2       +1 -3      jakarta-commons-sandbox/periodicity/build-torque.xml
  
  Index: build-torque.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/build-torque.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build-torque.xml	3 Oct 2002 04:07:57 -0000	1.1
  +++ build-torque.xml	3 Oct 2002 20:37:46 -0000	1.2
  @@ -17,9 +17,7 @@
       still work propertly. Then we can go on and do the rest of the mappings via
       old.properties.
      -->
  -  <property name="build.properties" value="conf/build/build.om.properties"/>
  -  <property name="torque.contextProperties" value="${build.properties}"/>
  -  <property file="${torque.contextProperties}"/>
  +  <property file="conf/build/build.om.properties"/>
     <property name="lib.dir" value="${maven.home}/repository"/>
     <property name="torque.lib.dir" value="${lib.dir}"/>
     <property name="torque.jar" value="torque-3.0-b5-dev.jar"/>
  
  
  
  1.2       +1 -1      jakarta-commons-sandbox/periodicity/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	3 Oct 2002 04:07:57 -0000	1.1
  +++ maven.xml	3 Oct 2002 20:37:46 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <project default="java:jar">
     <preGoal name="java:compile">
  -    <ant antfile="build-torque.xml"
  +    <ant antfile="build-legacy.xml"
            target="om"/>
     </preGoal>
   </project>  
  
  
  
  1.4       +7 -16     jakarta-commons-sandbox/periodicity/conf/build/build.jars.properties
  
  Index: build.jars.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.jars.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.jars.properties	13 May 2002 06:07:08 -0000	1.3
  +++ build.jars.properties	3 Oct 2002 20:37:46 -0000	1.4
  @@ -1,16 +1,7 @@
  -lib.repo=./lib
  -velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
  -xerces.jar = ${lib.repo}/xercesImpl-2.0.0.jar
  -xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
  -village.jar = ${lib.repo}/village-1.5.3-dev.jar
  -log4j.jar = ${lib.repo}/log4j-1.1.3.jar
  -commons-collections.jar = ${lib.repo}/commons-collections.jar
  -commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
  -jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
  -junit.jar = ${lib.repo}/junit-3.7.jar
  -periodicity.tasks.jar= ${lib.repo}/periodicity-tasks.jar
  -servlet.jar= ${lib.repo}/servlet-2.2.jar
  -stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
  -torque.jar=${lib.repo}/torque-3.0-b2-dev.jar
  -tdk.jar= ${lib.repo}/tdk.jar
  -turbine.jar=${lib.repo}/turbine-2.2-b2-dev.jar
  +# -------------------------------------------------------------------
  +#
  +# J A R  L O C A T I O N S
  +#
  +# -------------------------------------------------------------------
  +
  +torque.jar=${maven.home}/repository/torque/jars/torque-SNAPSHOT.jar
  
  
  
  1.3       +7 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.om.properties	3 Oct 2002 04:07:57 -0000	1.2
  +++ build.om.properties	3 Oct 2002 20:37:46 -0000	1.3
  @@ -99,7 +99,7 @@
   torque.basePrefix = Base
   torque.complexObjectModel = true
   torque.overloadKeySetters = true
  -torque.useClasspath = true 
  +torque.useClasspath = false 
   torque.useManagers = false
   
   
  @@ -128,11 +128,13 @@
   
   torque.sameJavaName = false
   
  -# ---------------------------------------------------------------------------
  +# ------------------------------------------------------------------------
   #
  -# S Q L  D I R E C T O R Y
  +# M I S C E L L A N E O U S
   #
  -# ---------------------------------------------------------------------------
  +# ------------------------------------------------------------------------
   
   torque.schema.dir=src/xml
  -torque.sql.dir=${maven.build.dest}
  +torque.contextProperties=conf/build/build.om.properties
  +torque.template.om=om/Control.vm
  +torque.templatePath=${maven.build.dir}/torque
  
  
  
  1.5       +3 -2      jakarta-commons-sandbox/periodicity/src/xml/periodicity-schema.xml
  
  Index: periodicity-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/xml/periodicity-schema.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- periodicity-schema.xml	14 Mar 2002 09:30:24 -0000	1.4
  +++ periodicity-schema.xml	3 Oct 2002 20:37:46 -0000	1.5
  @@ -3,7 +3,8 @@
    "http://jakarta.apache.org/turbine/dtd/database.dtd">
   
   <database name="periodicity" defaultIdMethod="idbroker">
  -   <table name="periodicity_vevents" idMethod="idbroker" description="Events">
  +   <table name="periodicity_vevents" 
  +          description="Events">
         <column name="id"
                 required="true"
                 primaryKey="true"
  @@ -142,7 +143,7 @@
                 size="80"
                 description="End Time Time Zone ID"/>
      </table>
  -   <table name="periodicity_todos" defaultIdMethod="idbroker">
  +   <table name="periodicity_todos">
         <column name="id"
                 required="true"
                 primaryKey="true"
  
  
  

--
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