db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject cvs commit: jakarta-turbine-torque/xdocs schema-reference.xml
Date Wed, 08 Jan 2003 16:43:59 GMT
henning     2003/01/08 08:43:59

  Modified:    profile  axion.profile db2400.profile dobbs.oracle.profile
                        dobbs.postgresql.profile dobbs.sapdb.profile
                        hsqldb.profile jmcnally.profile kschrader.profile
                        mysql.profile oracle.profile postgres.profile
                        sybase.profile
               src/conf build-torque.xml build.properties
               src/dtd  database.dtd
               src/java/org/apache/torque Torque.java
               src/java/org/apache/torque/adapter DB.java DBDB2400.java
                        DBFactory.java
               src/java/org/apache/torque/oid IDBroker.java
               src/java/org/apache/torque/pool ConnectionPool.java
               src/java/org/apache/torque/util BasePeer.java
               src/rttest id-table-schema.xml
               src/schema id-table-schema.xml
               src/templates/sql/base/sybase db.props
               xdocs    schema-reference.xml
  Log:
  These are just comment and doc changes. Replace many legacy turbine
  references with torque related files and sometimes simply replace
  "turbine" with "torque".
  
  Fixed a few typoes.
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-turbine-torque/profile/axion.profile
  
  Index: axion.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/axion.profile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- axion.profile	25 Sep 2002 14:37:17 -0000	1.3
  +++ axion.profile	8 Jan 2003 16:43:54 -0000	1.4
  @@ -64,7 +64,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:axiondb:sqltest:target/test
  
  
  
  1.6       +1 -1      jakarta-turbine-torque/profile/db2400.profile
  
  Index: db2400.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/db2400.profile,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- db2400.profile	19 Aug 2002 14:53:24 -0000	1.5
  +++ db2400.profile	8 Jan 2003 16:43:54 -0000	1.6
  @@ -64,7 +64,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:as400://testhost/torquetest
  
  
  
  1.8       +1 -1      jakarta-turbine-torque/profile/dobbs.oracle.profile
  
  Index: dobbs.oracle.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/dobbs.oracle.profile,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dobbs.oracle.profile	19 Aug 2002 14:53:24 -0000	1.7
  +++ dobbs.oracle.profile	8 Jan 2003 16:43:54 -0000	1.8
  @@ -62,7 +62,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:oracle:thin:@linuxdb:1521:dev
  
  
  
  1.10      +1 -1      jakarta-turbine-torque/profile/dobbs.postgresql.profile
  
  Index: dobbs.postgresql.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/dobbs.postgresql.profile,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- dobbs.postgresql.profile	19 Aug 2002 14:53:24 -0000	1.9
  +++ dobbs.postgresql.profile	8 Jan 2003 16:43:54 -0000	1.10
  @@ -62,7 +62,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:postgresql://127.0.0.1:5432/template1
  
  
  
  1.10      +1 -1      jakarta-turbine-torque/profile/dobbs.sapdb.profile
  
  Index: dobbs.sapdb.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/dobbs.sapdb.profile,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- dobbs.sapdb.profile	19 Aug 2002 14:53:24 -0000	1.9
  +++ dobbs.sapdb.profile	8 Jan 2003 16:43:54 -0000	1.10
  @@ -62,7 +62,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:sapdb://edobbs/TDK?sqlmode=oracle
  
  
  
  1.7       +1 -1      jakarta-turbine-torque/profile/hsqldb.profile
  
  Index: hsqldb.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/hsqldb.profile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- hsqldb.profile	5 Dec 2002 07:59:24 -0000	1.6
  +++ hsqldb.profile	8 Jan 2003 16:43:54 -0000	1.7
  @@ -62,7 +62,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:hsqldb:sqltest
  
  
  
  1.7       +1 -1      jakarta-turbine-torque/profile/jmcnally.profile
  
  Index: jmcnally.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/jmcnally.profile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jmcnally.profile	9 Dec 2002 21:11:47 -0000	1.6
  +++ jmcnally.profile	8 Jan 2003 16:43:54 -0000	1.7
  @@ -63,7 +63,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:mysql://localhost:3306/mysql
  
  
  
  1.5       +1 -1      jakarta-turbine-torque/profile/kschrader.profile
  
  Index: kschrader.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/kschrader.profile,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- kschrader.profile	19 Aug 2002 14:53:24 -0000	1.4
  +++ kschrader.profile	8 Jan 2003 16:43:54 -0000	1.5
  @@ -63,7 +63,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:oracle:thin:@cpddev2.engin.umich.edu:1521:cpddev2
  
  
  
  1.20      +1 -1      jakarta-turbine-torque/profile/mysql.profile
  
  Index: mysql.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/mysql.profile,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mysql.profile	5 Dec 2002 07:59:24 -0000	1.19
  +++ mysql.profile	8 Jan 2003 16:43:54 -0000	1.20
  @@ -68,7 +68,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:mysql://localhost:3306/mysql
  
  
  
  1.15      +1 -1      jakarta-turbine-torque/profile/oracle.profile
  
  Index: oracle.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/oracle.profile,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- oracle.profile	5 Dec 2002 07:59:24 -0000	1.14
  +++ oracle.profile	8 Jan 2003 16:43:54 -0000	1.15
  @@ -63,7 +63,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
  
  
  
  1.16      +1 -1      jakarta-turbine-torque/profile/postgres.profile
  
  Index: postgres.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/postgres.profile,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- postgres.profile	5 Dec 2002 07:59:24 -0000	1.15
  +++ postgres.profile	8 Jan 2003 16:43:54 -0000	1.16
  @@ -63,7 +63,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:postgresql://127.0.0.1:5432/template1
  
  
  
  1.8       +1 -1      jakarta-turbine-torque/profile/sybase.profile
  
  Index: sybase.profile
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/profile/sybase.profile,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sybase.profile	19 Aug 2002 14:53:24 -0000	1.7
  +++ sybase.profile	8 Jan 2003 16:43:54 -0000	1.8
  @@ -62,7 +62,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   # -------------------------------------------------------------------
   
   torque.database.createUrl = jdbc:sybase:Tds:localhost:5000/master
  
  
  
  1.66      +2 -2      jakarta-turbine-torque/src/conf/build-torque.xml
  
  Index: build-torque.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build-torque.xml,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- build-torque.xml	7 Jan 2003 21:52:51 -0000	1.65
  +++ build-torque.xml	8 Jan 2003 16:43:57 -0000	1.66
  @@ -153,7 +153,7 @@
     <!-- G E N E R A T E  P R O J E C T  S Q L                            -->
     <!-- ================================================================ -->
     <!-- Generate the SQL for your project, These are in addition         -->
  -  <!-- to the base Turbine tables! The tables you require for your      -->
  +  <!-- to the base Torque tables! The tables you require for your       -->
     <!-- project should be specified in project-schema.xml.               -->
     <!-- ================================================================ -->
   
  @@ -476,7 +476,7 @@
     <!-- G E N E R A T E  P R O J E C T  P E E R  B A S E D  O M          -->
     <!-- ================================================================ -->
     <!-- Generate the Peer-based object model for your project.           -->
  -  <!-- These are in addition to the base Turbine OM!                    -->
  +  <!-- These are in addition to the base Torque OM!                     -->
     <!-- ================================================================ -->
   
     <target
  
  
  
  1.19      +2 -2      jakarta-turbine-torque/src/conf/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.properties,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.properties	5 Oct 2002 18:00:03 -0000	1.18
  +++ build.properties	8 Jan 2003 16:43:57 -0000	1.19
  @@ -34,7 +34,7 @@
   #
   # -------------------------------------------------------------------
   # This is the target database, only considered when generating
  -# the SQL for your Turbine project. Your possible choices are:
  +# the SQL for your Torque project. Your possible choices are:
   #
   #   axion, cloudscape, db2, db2400, hypersonic, interbase, mssql,
   #   mysql, oracle, postgresql, sapdb, sybase
  @@ -105,7 +105,7 @@
   # JDBC connection settings. This is used by the JDBCToXML task that
   # will create an XML database schema from JDBC metadata. These
   # settings are also used by the SQL Ant task to initialize your
  -# Turbine system with the generated SQL.
  +# Torque system with the generated SQL.
   #
   # sameJavaName
   #   If true, the JDBC task will set the javaName attribute for the tables 
  
  
  
  1.14      +2 -2      jakarta-turbine-torque/src/dtd/database.dtd
  
  Index: database.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/dtd/database.dtd,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- database.dtd	20 Jun 2002 23:55:14 -0000	1.13
  +++ database.dtd	8 Jan 2003 16:43:57 -0000	1.14
  @@ -7,7 +7,7 @@
   For: database.defaultIdMethod and table.idMethod
   
   Do not use autoincrement or sequence. They are deprecated in favor of
  -using native which will use the Turbine Connection pool to determine
  +using native which will use the Connection pool to determine
   which database it is talking to (yes, it knows that) and then use
   whatever native database methodology for insert increments that it can.
   Otherwise, you should use idbroker or none. none is good if you have a
  
  
  
  1.76      +3 -3      jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
  
  Index: Torque.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- Torque.java	14 Dec 2002 14:33:13 -0000	1.75
  +++ Torque.java	8 Jan 2003 16:43:57 -0000	1.76
  @@ -114,7 +114,7 @@
   
       /**
        * A prefix for <code>Manager</code> properties in
  -     * TurbineResource.properties.
  +     * the configuration.
        */
       public static final String MANAGER_PREFIX = "managed_class.";
   
  @@ -409,7 +409,7 @@
        * Creates a mapping between classes and their manager classes.
        *
        * The mapping is built according to settings present in
  -     * TurbineResources.properties.  The entries should have the
  +     * properties file.  The entries should have the
        * following form:
        *
        * <pre>
  
  
  
  1.31      +3 -3      jakarta-turbine-torque/src/java/org/apache/torque/adapter/DB.java
  
  Index: DB.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DB.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DB.java	7 Jan 2003 21:52:51 -0000	1.30
  +++ DB.java	8 Jan 2003 16:43:57 -0000	1.31
  @@ -61,13 +61,13 @@
   import java.sql.Timestamp;
   
   /**
  - * <code>DB</code> defines the interface for a Turbine database
  + * <code>DB</code> defines the interface for a Torque database
    * adapter.  Support for new databases is added by subclassing
    * <code>DB</code> and implementing its abstract interface, and by
    * registering the new database adapter and its corresponding
    * JDBC driver in the service configuration file.
    *
  - * <p>The Turbine database adapters exist to present a uniform
  + * <p>The Torque database adapters exist to present a uniform
    * interface to database access across all available databases.  Once
    * the necessary adapters have been written and configured,
    * transparent swapping of databases is theoretically supported with
  
  
  
  1.4       +2 -2      jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2400.java
  
  Index: DBDB2400.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2400.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DBDB2400.java	7 May 2002 17:28:49 -0000	1.3
  +++ DBDB2400.java	8 Jan 2003 16:43:57 -0000	1.4
  @@ -55,7 +55,7 @@
    */
   
   /**
  - * Turbine Database Adapter for DB2/400 on the IBM AS400 platform.
  + * Torque Database Adapter for DB2/400 on the IBM AS400 platform.
    *
    * @author <a href="mailto:sweaver@rippe.com">Scott Weaver</a>
    * @version $Id$
  
  
  
  1.35      +3 -3      jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java
  
  Index: DBFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- DBFactory.java	11 Nov 2002 11:38:24 -0000	1.34
  +++ DBFactory.java	8 Jan 2003 16:43:57 -0000	1.35
  @@ -126,12 +126,12 @@
       }
   
       /**
  -     * Creates a new instance of the Turbine database adapter associated
  +     * Creates a new instance of the Torque database adapter associated
        * with the specified JDBC driver or adapter key.
        *
        * @param driver The fully-qualified name of the JDBC driver to
        * create a new adapter instance for or a shorter form adapter key.
  -     * @return An instance of a Turbine database adapter.
  +     * @return An instance of a Torque database adapter.
        * @throws InstantiationException throws if the JDBC driver could not be
        *      instantiated
        */
  
  
  
  1.21      +4 -6      jakarta-turbine-torque/src/java/org/apache/torque/oid/IDBroker.java
  
  Index: IDBroker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/oid/IDBroker.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- IDBroker.java	26 Nov 2002 23:46:56 -0000	1.20
  +++ IDBroker.java	8 Jan 2003 16:43:58 -0000	1.21
  @@ -73,9 +73,7 @@
   
   //!!
   // NOTE:
  -// This is another class that is coupled to Turbine. I removed
  -// the use of TurbineResources but a configuration of some sort
  -// must be set. It would also be nice to decouple this from
  +// It would be nice to decouple this from
   // Torque. This is a great stand-alone utility.
   
   /**
  @@ -225,8 +223,8 @@
               houseKeeperThread = new Thread(this);
               // Indicate that this is a system thread. JVM will quit only when
               // there are no more active user threads. Settings threads spawned
  -            // internally Turbine as daemons allows commandline applications
  -            // using Turbine terminate in an orderly manner.
  +            // internally by Torque as daemons allows commandline applications
  +            // using Torque terminate in an orderly manner.
               houseKeeperThread.setDaemon(true);
               houseKeeperThread.start();
           }
  
  
  
  1.17      +3 -3      jakarta-turbine-torque/src/java/org/apache/torque/pool/ConnectionPool.java
  
  Index: ConnectionPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/pool/ConnectionPool.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ConnectionPool.java	8 Jan 2003 15:49:34 -0000	1.16
  +++ ConnectionPool.java	8 Jan 2003 16:43:58 -0000	1.17
  @@ -198,7 +198,7 @@
           monitor = new Monitor();
           // Indicate that this is a system thread. JVM will quit only when there
           // are no more active user threads. Settings threads spawned internally
  -        // by Turbine as daemons allows commandline applications using Turbine
  +        // by Torque as daemons allows commandline applications using Torque
           // to terminate in an orderly manner.
           monitor.setDaemon(true);
           monitor.start();
  @@ -354,7 +354,7 @@
           // The connection pool was empty to start with--don't call this
           // routine if there's no connection to pop!
           // TODO: Propose general Turbine assertion failure exception? -PGO
  -        throw new Exception("Assertaion failure: Attempted to pop "
  +        throw new Exception("Assertion failure: Attempted to pop "
                   + "connection from empty pool!");
       }
   
  
  
  
  1.58      +6 -5      jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
  
  Index: BasePeer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- BasePeer.java	12 Dec 2002 14:53:28 -0000	1.57
  +++ BasePeer.java	8 Jan 2003 16:43:59 -0000	1.58
  @@ -121,7 +121,7 @@
       /** Classes that implement this class should override this value. */
       public static final String TABLE_NAME = "TABLE_NAME";
   
  -    /** The Turbine default MapBuilder. */
  +    /** The Torque default MapBuilder. */
       public static final String DEFAULT_MAP_BUILDER =
           "org.apache.torque.util.db.map.TurbineMapBuilder";
   
  @@ -232,7 +232,7 @@
        * used as the argument for initTableColumns
        *
        * @param tableName The propery name for the database in the
  -     * Turbineresources file.
  +     * configuration file.
        * @param dbName The name of the database.
        * @return A Schema.
        */
  @@ -308,7 +308,6 @@
   
       /**
        * Convenience method to create a String array of criteria keys.
  -     * Primary use is with TurbineUserPeer.
        *
        * @param tableName Name of table.
        * @param columnNames A String[].
  @@ -2082,8 +2081,10 @@
   
       /**
        * This method returns the MapBuilder specified in the
  -     * TurbineResources.properties file. By default, this is
  +     * configuration file. By default, this is
        * org.apache.torque.util.db.map.TurbineMapBuilder.
  +     * FIXME! With the decoupled Torque there seem to be no
  +     * default map builder anymore.
        *
        * @return A MapBuilder.
        * @throws TorqueException Any exceptions caught during processing will be
  
  
  
  1.3       +2 -2      jakarta-turbine-torque/src/rttest/id-table-schema.xml
  
  Index: id-table-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/rttest/id-table-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- id-table-schema.xml	29 Jan 2002 04:50:28 -0000	1.2
  +++ id-table-schema.xml	8 Jan 2003 16:43:59 -0000	1.3
  @@ -8,7 +8,7 @@
   <!--                                                                      -->
   <!-- ==================================================================== -->
   <!-- This is the XML schema use by Torque to generate the SQL for         -->
  -<!-- ID_TABLE table used by the id broker mechanism in Turbine.           -->
  +<!-- ID_TABLE table used by the id broker mechanism in Torque.            -->
   <!-- ==================================================================== -->
   <!-- @author: <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>   
  -->
   <!-- @version $Id$ -->
  
  
  
  1.7       +2 -2      jakarta-turbine-torque/src/schema/id-table-schema.xml
  
  Index: id-table-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/schema/id-table-schema.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- id-table-schema.xml	31 Dec 2002 10:25:02 -0000	1.6
  +++ id-table-schema.xml	8 Jan 2003 16:43:59 -0000	1.7
  @@ -7,7 +7,7 @@
   <!--                                                                      -->
   <!-- ==================================================================== -->
   <!-- This is the XML schema use by Torque to generate the SQL for         -->
  -<!-- ID_TABLE table used by the id broker mechanism in Turbine.           -->
  +<!-- ID_TABLE table used by the id broker mechanism in Torque.            -->
   <!-- ==================================================================== -->
   <!-- @author: <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>    
  -->
   <!-- @version $Id$ -->
  
  
  
  1.3       +1 -1      jakarta-turbine-torque/src/templates/sql/base/sybase/db.props
  
  Index: db.props
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/sybase/db.props,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- db.props	20 May 2002 17:55:15 -0000	1.2
  +++ db.props	8 Jan 2003 16:43:59 -0000	1.3
  @@ -33,7 +33,7 @@
   #
   # This is the autoincrement value if using native methods for
   # incrementing keys.  Most likely IDENTITIY wrt Sybase ASE.
  -# Leaving the value blank should be used when Turbine's IDBroker
  +# Leaving the value blank should be used when Torque's IDBroker
   # is used to autoincrement keys.
   #
   # Default: [blank]
  
  
  
  1.5       +3 -3      jakarta-turbine-torque/xdocs/schema-reference.xml
  
  Index: schema-reference.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/xdocs/schema-reference.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- schema-reference.xml	4 Apr 2002 18:39:25 -0000	1.4
  +++ schema-reference.xml	8 Jan 2003 16:43:59 -0000	1.5
  @@ -107,12 +107,12 @@
            <table>
              <tr>
                <td>idbroker</td>
  -             <td>This allows turbine to generate the IDs through its IDBroker
  +             <td>This allows Torque to generate the IDs through its IDBroker
                    Service</td>
              </tr>
              <tr>
                <td>native</td>
  -             <td>Turbine will determine how the database will auto-generate
  +             <td>Torque will determine how the database will auto-generate
                    IDs</td>
              </tr>
              <tr>
  @@ -168,7 +168,7 @@
        <subsection name="Attribute: baseClass">
          <p>
            The base class to use when generating the Object Model.
  -         This class does not have to extend org.apache.turbine.om.BaseObject.
  +         This class does not have to extend org.apache.torque.om.BaseObject.
          </p>
        </subsection>
        <subsection name="Attribute: basePeer">
  
  
  

Mime
View raw message