jvanzyl     01/05/28 16:11:02

  Modified:    src/java/org/apache/turbine/torque Tag: T_2_1_BRANCH
                        TorqueDataDTDTask.java TorqueDataDumpTask.java
                        TorqueDataSQLTask.java TorqueJDBCTransformTask.java
                        TorqueObjectModelTask.java TorqueSQLTask.java
                        TorqueSQLTransformTask.java
               src/java/org/apache/turbine/torque/engine/database/model
                        Tag: T_2_1_BRANCH Column.java Database.java
                        ForeignKey.java Table.java
               src/java/org/apache/turbine/torque/engine/database/transform
                        Tag: T_2_1_BRANCH SQLToAppData.java
  Added:       src/java/org/apache/turbine/torque Tag: T_2_1_BRANCH
                        TorqueCreateDatabase.java
  Log:
  - a few merges from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDTDTask.java
  
  Index: TorqueDataDTDTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDTDTask.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  
  
  
  1.1.2.4   +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDumpTask.java
  
  Index: TorqueDataDumpTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataDumpTask.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  
  
  
  1.1.2.4   +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataSQLTask.java
  
  Index: TorqueDataSQLTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueDataSQLTask.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  
  
  
  1.4.4.5   +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java
  
  Index: TorqueJDBCTransformTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueJDBCTransformTask.java,v
  retrieving revision 1.4.4.4
  retrieving revision 1.4.4.5
  diff -u -r1.4.4.4 -r1.4.4.5
  
  
  
  1.5.10.1  +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueObjectModelTask.java
  
  Index: TorqueObjectModelTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueObjectModelTask.java,v
  retrieving revision 1.5
  retrieving revision 1.5.10.1
  diff -u -r1.5 -r1.5.10.1
  
  
  
  1.5.10.1  +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueSQLTask.java
  
  Index: TorqueSQLTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueSQLTask.java,v
  retrieving revision 1.5
  retrieving revision 1.5.10.1
  diff -u -r1.5 -r1.5.10.1
  
  
  
  1.3.4.2   +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueSQLTransformTask.java
  
  Index: TorqueSQLTransformTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueSQLTransformTask.java,v
  retrieving revision 1.3.4.1
  retrieving revision 1.3.4.2
  diff -u -r1.3.4.1 -r1.3.4.2
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/TorqueCreateDatabase.java
  
  Index: TorqueCreateDatabase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/TorqueCreateDatabase.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TorqueCreateDatabase.java 2001/05/28 23:05:12     1.1
  +++ TorqueCreateDatabase.java 2001/05/28 23:10:54     1.1.2.1
  @@ -63,7 +63,7 @@
    * for creating databases on various platforms.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: TorqueCreateDatabase.java,v 1.1 2001/05/28 23:05:12 jvanzyl Exp $
  + * @version $Id: TorqueCreateDatabase.java,v 1.1.2.1 2001/05/28 23:10:54 jvanzyl 
Exp $
    */
   public class TorqueCreateDatabase extends TexenTask
   {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.10.5  +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Column.java
  
  Index: Column.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Column.java,v
  retrieving revision 1.3.10.4
  retrieving revision 1.3.10.5
  diff -u -r1.3.10.4 -r1.3.10.5
  
  
  
  1.3.10.6  +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Database.java
  
  Index: Database.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Database.java,v
  retrieving revision 1.3.10.5
  retrieving revision 1.3.10.6
  diff -u -r1.3.10.5 -r1.3.10.6
  
  
  
  1.4.4.6   +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java
  
  Index: ForeignKey.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/ForeignKey.java,v
  retrieving revision 1.4.4.5
  retrieving revision 1.4.4.6
  diff -u -r1.4.4.5 -r1.4.4.6
  
  
  
  1.10.4.6  +0 -0      
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Table.java
  
  Index: Table.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/model/Table.java,v
  retrieving revision 1.10.4.5
  retrieving revision 1.10.4.6
  diff -u -r1.10.4.5 -r1.10.4.6
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.10.6  +1 -1      
jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java
  
  Index: SQLToAppData.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/engine/database/transform/SQLToAppData.java,v
  retrieving revision 1.3.10.5
  retrieving revision 1.3.10.6
  diff -u -r1.3.10.5 -r1.3.10.6
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to