db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject cvs commit: db-torque project-base.xml
Date Tue, 19 Jul 2005 13:32:00 GMT
tfischer    2005/07/19 06:32:00

  Modified:    src/maven-plugin project.xml
               src/generator project.xml
               xdocs    user-guide.xml changes.xml
               src/generator/src/conf build-torque.xml
               .        project-base.xml
  Log:
  change version to torque-3.2-rc1
  
  Revision  Changes    Path
  1.25      +2 -2      db-torque/src/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml	18 Jul 2005 04:47:21 -0000	1.24
  +++ project.xml	19 Jul 2005 13:31:59 -0000	1.25
  @@ -75,14 +75,14 @@
       <dependency>
         <groupId>torque</groupId>
         <artifactId>torque-gen</artifactId>
  -      <version>3.2-dev</version>
  +      <version>3.2-rc1</version>
         <url>http://db.apache.org/torque/generator/</url>
       </dependency>
   
       <dependency>
         <groupId>torque</groupId>
         <artifactId>torque-gen-templates</artifactId>
  -      <version>3.2-dev</version>
  +      <version>3.2-rc1</version>
         <url>http://db.apache.org/torque/generator/templates/</url>
       </dependency>
   
  
  
  
  1.22      +1 -1      db-torque/src/generator/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/project.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- project.xml	18 Jul 2005 03:59:44 -0000	1.21
  +++ project.xml	19 Jul 2005 13:31:59 -0000	1.22
  @@ -71,7 +71,7 @@
       <dependency>
         <groupId>torque</groupId>
         <artifactId>torque-gen-templates</artifactId>
  -      <version>3.2-dev</version>
  +      <version>3.2-rc1</version>
         <url>http://db.apache.org/torque/generator/templates/</url>
       </dependency>
   
  
  
  
  1.18      +16 -18    db-torque/xdocs/user-guide.xml
  
  Index: user-guide.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- user-guide.xml	30 Aug 2004 00:24:43 -0000	1.17
  +++ user-guide.xml	19 Jul 2005 13:31:59 -0000	1.18
  @@ -76,8 +76,7 @@
   </p>
   
   <source><![CDATA[
  -# Torque 3.2 is yet to be released and deployed, in the mean time you must build the plugin
from source.
  -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.2
  +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.2-rc1
   ]]></source>
   
   
  @@ -89,9 +88,9 @@
     If you prefer to use <a href="http://ant.apache.org/">Ant</a> you need access

     to the Torque generator distribution and associated libraries - these are 
     available from the 
  -  <a href="http://jakarta.apache.org/builds/jakarta-turbine/torque/release/3.1.1/">
  -  Downloads page</a> (the file to download is torque-gen-3.1.1.tar.gz or 
  -  torque-gen-3.1.1.zip, depending on your development platform).  Unpack the
  +  <a href="http://jakarta.apache.org/builds/jakarta-turbine/torque/release/3.2-rc1/">
  +  Downloads page</a> (the file to download is torque-gen-3.2-rc1.tar.gz or 
  +  torque-gen-3.2-rc1.zip, depending on your development platform).  Unpack the
     archive to reveal the following directory structure:
   </p>
   
  @@ -100,27 +99,26 @@
       docs/              <--- Contains a copy of the Torque documentation, 
                               including the API JavaDocs.
       lib/               <--- Contains the jar files required by the Torque 
  -                            generator.
  -    schema/            <--- Contains the schema for the table used by Torque's
  +                            generator, including the torque-gen-templates
  +                            jar containing the templates. If you want to 
  +                            modify the templates, you can unpack the 
  +                            templates jar, set the 
  +                            <code>torque.useClasspath</code> to 
  +                            <code>false</code> 
  +                            and the <codetorque.schema.dir</code>
  +                            to the correct directory in the
  +                            <code>build.properties</code>
  +    src/schema/        <--- Contains the schema for the table used by Torque's
                               IDBroker.
  -    templates/         <--- A copy of the Torque generator object model
  -                            Velocity templates.  To use these rather than the 
  -                            copy that is included in the torque-gen jar file
  -                            you need to set <code>torque.useClasspath</code>
to 
  -                            <code>false</code> in <code>build.properties</code>
  -                            (this is actually the default).
       build.properties   <--- The various properties that you use to configure
                               the Torque generator.
       build-torque.xml   <--- The Ant build file containing the various torque 
                               goals.
  -    commons-logging.properties
  -                       <--- Commons logging configuration file.
       default.properties <--- The default property values that are used to
                               configure the Torque generator.
       LICENSE.txt        <--- The License for the Torque generator.
  -    log4j.properties   <--- Log4j configuration file.
  -    simplelog.properties
  -                       <--- Commons logging simplelog configuration file.
  +    torque-gen-3.2-rc1.jar
  +                       <--- The generator jar.
   ]]></source>
   
   <p>
  
  
  
  1.171     +13 -1     db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- changes.xml	8 Jul 2005 17:53:34 -0000	1.170
  +++ changes.xml	19 Jul 2005 13:31:59 -0000	1.171
  @@ -27,7 +27,19 @@
   
     <body>
   
  -  <release version="3.2-dev" date="in CVS">
  +  <release version="3.2-rc1" date="in CVS">
  +    <action type="add" dev="tfischer">
  +      Added the build-torque.xml again to the generator release. 
  +      In order to use the same default directory structure 
  +      for maven and ant, the default directory for the schema files
  +      was changed from ${torque.home}/schema to ${torque.home}/src/schema
  +    </action>
  +    <action type="update" dev="tfischer">
  +      The generator templates are now packed in a separate jar file,
  +      torque-gen-templates.jar, which is included in the generator
  +      tar.gz and zip distributions. To build the jar from source,
  +      change into src/generator/src/templates and run maven jar:install.
  +    </action>
       <action type="update" dev="tfischer" issue="TRQS308">
         Changed runtime configuration checking. It is now required having set 
         the following properties:
  
  
  
  1.14      +1 -1      db-torque/src/generator/src/conf/build-torque.xml
  
  Index: build-torque.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/conf/build-torque.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build-torque.xml	18 Jul 2005 04:09:04 -0000	1.13
  +++ build-torque.xml	19 Jul 2005 13:32:00 -0000	1.14
  @@ -22,7 +22,7 @@
     <property file="${torque.contextProperties}"/>
     <property name="lib.dir" value="lib"/>
     <property name="torque.lib.dir" value="${lib.dir}"/>
  -  <property name="torque.jar" value="torque-gen-3.2-dev.jar"/>
  +  <property name="torque.jar" value="torque-gen-3.2-rc1.jar"/>
   
     <!--
       Build the classpath. Specifically point to each file we're including to avoid
  
  
  
  1.16      +1 -1      db-torque/project-base.xml
  
  Index: project-base.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/project-base.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project-base.xml	27 Jun 2005 21:34:10 -0000	1.15
  +++ project-base.xml	19 Jul 2005 13:32:00 -0000	1.16
  @@ -21,7 +21,7 @@
     <pomVersion>3</pomVersion>
     <groupId>torque</groupId>
     <name>Torque</name>
  -  <currentVersion>3.2-dev</currentVersion>
  +  <currentVersion>3.2-rc1</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://db.apache.org/</url>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message