Index: project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/project.xml,v
retrieving revision 1.25
diff -u -r1.25 project.xml
--- project.xml	29 Aug 2003 18:37:20 -0000	1.25
+++ project.xml	31 Aug 2003 11:23:50 -0000
@@ -298,7 +298,7 @@
 		</dependency>
 		<dependency>
 			<id>torque</id>
-			<version>3.0</version>
+			<version>3.1-rc</version>
 			<properties>
 				<war.bundle.jar>true</war.bundle.jar>
 			</properties>
Index: build/torque/build-torque.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/build-torque.xml,v
retrieving revision 1.2
diff -u -r1.2 build-torque.xml
--- build/torque/build-torque.xml	4 Dec 2002 02:01:33 -0000	1.2
+++ build/torque/build-torque.xml	31 Aug 2003 11:23:52 -0000
@@ -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-3.0.jar"/>
+  <property name="torque.jar" value="torque-gen-3.1-rc.jar"/>
 
   <!--
     Build the classpath. Specifically point to each file we're including to avoid
@@ -33,22 +33,12 @@
   -->
   <path id="torque-classpath">
     <fileset dir="${torque.lib.dir}">
-      <include name="**/commons-beanutils-1.4.1.jar"/>
-      <include name="**/commons-collections-2.0.jar"/>
-      <include name="**/commons-configuration-1.0-dev.jar"/>
-      <include name="**/commons-dbcp-1.0-dev-20020806.jar"/>
-      <include name="**/commons-lang-1.0.jar"/>
-      <include name="**/commons-logging-1.0.2.jar"/>
-      <include name="**/commons-pool-1.0.jar"/>
-      <include name="**/jcs-1.0-dev.jar"/>
-      <include name="**/jdbc-2.0.jar"/>
-      <include name="**/jndi-1.2.1.jar"/>
-      <include name="**/log4j-1.2.6.jar"/>
-      <include name="**/stratum-1.0-b3.jar"/>
-      <include name="**/tomcat-naming-1.0.jar"/>
+      <include name="**/commons-collections-2.1.jar"/>
+      <include name="**/commons-lang-1.0.1.jar"/>
+      <include name="**/log4j-1.2.8.jar"/>
       <include name="**/${torque.jar}"/>
-      <include name="**/velocity-1.3.jar"/>
-      <include name="**/village-2.0-dev-20021111.jar"/>
+      <include name="**/velocity-1.3.1.jar"/>
+      <include name="**/village-2.0-dev-20030625.jar"/>
       <include name="**/xercesImpl-2.0.2.jar"/>
       <include name="**/xmlParserAPIs-2.0.2.jar"/>
       <include name="**/*.jar"/>
@@ -57,7 +47,7 @@
 
   <!--
     The default.properties file will map old properties to the new ones along
-    with setting the corret defaults.
+    with setting the correct defaults.
   -->
   <property resource="org/apache/torque/default.properties">
     <classpath>
@@ -153,7 +143,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.               -->
   <!-- ================================================================ -->
 
@@ -177,7 +167,6 @@
     <echo message="+------------------------------------------+"/>
     <echo message="|                                          |"/>
     <echo message="| Generating SQL for YOUR Torque project!  |"/>
-    <echo message="| Woo hoo!                                 |"/>
     <echo message="|                                          |"/>
     <echo message="+------------------------------------------+"/>
 
@@ -186,6 +175,7 @@
   </target>
 
   <target name="sql-classpath" if="torque.internal.useClasspath">
+    <echo message="loading templates from classpath"/>
     <torque-sql
       basePathToDbProps="sql/base/"
       contextProperties="${torque.contextProperties}"
@@ -204,6 +194,7 @@
   </target>
 
   <target name="sql-template" unless="torque.internal.useClasspath">
+    <echo message="loading templates from ${torque.templatePath}"/>
     <torque-sql
       basePathToDbProps="sql/base/"
       contextProperties="${torque.contextProperties}"
@@ -236,7 +227,6 @@
     <echo message="+------------------------------------------+"/>
     <echo message="|                                          |"/>
     <echo message="| Generating docs for YOUR datamodel!      |"/>
-    <echo message="| Woo hoo!                                 |"/>
     <echo message="|                                          |"/>
     <echo message="+------------------------------------------+"/>
 
@@ -336,7 +326,6 @@
     <echo message="+-----------------------------------------------+"/>
     <echo message="|                                               |"/>
     <echo message="| Generating XML from JDBC connection !         |"/>
-    <echo message="| Woo hoo!                                      |"/>
     <echo message="|                                               |"/>
     <echo message="+-----------------------------------------------+"/>
 
@@ -362,7 +351,6 @@
     <echo message="+-----------------------------------------------+"/>
     <echo message="|                                               |"/>
     <echo message="| Generating SQL from data XML !                |"/>
-    <echo message="| Woo hoo!                                      |"/>
     <echo message="|                                               |"/>
     <echo message="+-----------------------------------------------+"/>
 
@@ -424,7 +412,6 @@
     <echo message="+-----------------------------------------------+"/>
     <echo message="|                                               |"/>
     <echo message="| Dumping the data from database into XML       |"/>
-    <echo message="| Woo hoo!                                      |"/>
     <echo message="|                                               |"/>
     <echo message="+-----------------------------------------------+"/>
 
@@ -457,14 +444,13 @@
     <echo message="+-----------------------------------------------+"/>
     <echo message="|                                               |"/>
     <echo message="| Generating Data DTD for YOUR Torque project!  |"/>
-    <echo message="| Woo hoo!                                      |"/>
     <echo message="|                                               |"/>
     <echo message="+-----------------------------------------------+"/>
 
     <torque-data-model
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.dataDtd}"
-      outputDirectory="${torque.output.dir}"
+      outputDirectory="${torque.schema.dir}"
       outputFile="report.${torque.project}.datadtd.generation"
       templatePath="${torque.templatePath}"
       useClasspath="${torque.useClasspath}"
@@ -476,7 +462,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
@@ -499,7 +485,7 @@
     <echo message="+------------------------------------------+"/>
     <echo message="|                                          |"/>
     <echo message="| Generating Peer-based Object Model for   |"/>
-    <echo message="| YOUR Torque project! Woo hoo!            |"/>
+    <echo message="| YOUR Torque project!                     |"/>
     <echo message="|                                          |"/>
     <echo message="+------------------------------------------+"/>
 
@@ -573,7 +559,7 @@
     <echo message="+------------------------------------------+"/>
     <echo message="|                                          |"/>
     <echo message="| Zipping the Object Model files for YOUR  |"/>
-    <echo message="| Torque project! Woo hoo!                 |"/>
+    <echo message="| Torque project!                          |"/>
     <echo message="|                                          |"/>
     <echo message="+------------------------------------------+"/>
 
@@ -726,6 +712,13 @@
   <!-- =================================================================== -->
 
   <target
+    name="ojb"
+    description="==> generates the repository and om for ojb (experimental)">
+    <antcall target="ojb-repository"/>
+    <antcall target="ojb-model"/>
+  </target>
+
+  <target
     name="ojb-repository"
     description="==> generates the repository for ojb (experimental)">
 
@@ -779,57 +772,4 @@
     </torque-data-model>
   </target>
 
-  <!--
-    Deprecated targets with the project- prefix.
-  -->
-  <target name="project-sql">
-    <echo message="The 'project-sql' target is deprecated. Please use the 'sql' target instead."/>
-    <antcall target="sql"/>
-  </target>
-  <target name="project-om">
-    <echo message="The 'project-om' target is deprecated. Please use the 'om' target instead."/>
-    <antcall target="om"/>
-  </target>
-  <target name="project-doc">
-    <echo message="The 'project-doc' target is deprecated. Please use the 'doc' target instead."/>
-    <antcall target="doc"/>
-  </target>
-  <target name="project-create-db">
-    <echo message="The 'project-create-db' target is deprecated. Please use the 'create-db' target instead."/>
-    <antcall target="create-db"/>
-  </target>
-  <target name="project-insert-sql">
-    <echo message="The 'project-insert-sql' target is deprecated. Please use the 'insert-sql' target instead."/>
-    <antcall target="insert-sql"/>
-  </target>
-  <target name="project-jdbc">
-    <echo message="The 'project-jdbc' target is deprecated. Please use the 'jdbc' target instead."/>
-    <antcall target="jdbc"/>
-  </target>
-  <target name="project-datasql">
-    <echo message="The 'project-datasql' target is deprecated. Please use the 'datasql' target instead."/>
-    <antcall target="datasql"/>
-  </target>
-  <target name="project-datadump">
-    <echo message="The 'project-datadump' target is deprecated. Please use the 'datadump' target instead."/>
-    <antcall target="datadump"/>
-  </target>
-  <target name="project-datadtd">
-    <echo message="The 'project-datadtd' target is deprecated. Please use the 'datadtd' target instead."/>
-    <antcall target="datadtd"/>
-  </target>
-  <target name="project-sql2xml">
-    <echo message="The 'project-sql2xml' target is deprecated. Please use the 'sql2xml' target instead."/>
-    <antcall target="sql2xml"/>
-  </target>
-  <target name="project-ojb-repository">
-    <echo message="The 'project-ojb-repository' target is deprecated. Please use the 'ojb-repository' target instead."/>
-    <antcall target="ojb-repository"/>
-  </target>
-  <target name="project-ojb-model">
-    <echo message="The 'project-obj-model' target is deprecated. Please use the 'ojb-model' target instead."/>
-    <antcall target="ojb-model"/>
-  </target>
-
 </project>
-
Index: build/torque/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- build/torque/build.xml	8 Dec 2002 19:33:52 -0000	1.21
+++ build/torque/build.xml	31 Aug 2003 11:23:53 -0000
@@ -21,7 +21,6 @@
 
     <!-- unjar templates to workaround torque problems -->
     <mkdir dir="templates.scratch"/>
-    <unjar src="../../lib/torque-3.0.jar" dest="templates.scratch"/> 
 
     <antcall target="sql"/>
     <antcall target="om"/>
Index: build/torque/schema/coffees-schema.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/schema/coffees-schema.xml,v
retrieving revision 1.2
diff -u -r1.2 coffees-schema.xml
--- build/torque/schema/coffees-schema.xml	8 Dec 2002 19:33:52 -0000	1.2
+++ build/torque/schema/coffees-schema.xml	31 Aug 2003 11:23:53 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
 
 
 <!-- ==================================================================== -->
Index: build/torque/schema/dbpsml-schema.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml,v
retrieving revision 1.6
diff -u -r1.6 dbpsml-schema.xml
--- build/torque/schema/dbpsml-schema.xml	18 Oct 2002 19:16:31 -0000	1.6
+++ build/torque/schema/dbpsml-schema.xml	31 Aug 2003 11:23:54 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
 
 <!-- ==================================================================== -->
 <!--                                                                      -->
Index: build/torque/schema/security-schema.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/schema/security-schema.xml,v
retrieving revision 1.6
diff -u -r1.6 security-schema.xml
--- build/torque/schema/security-schema.xml	24 Oct 2002 17:17:39 -0000	1.6
+++ build/torque/schema/security-schema.xml	31 Aug 2003 11:23:54 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
 
 <!-- ==================================================================== -->
 <!--                                                                      -->
Index: build/torque/schema/turbine-schema.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/torque/schema/turbine-schema.xml,v
retrieving revision 1.6
diff -u -r1.6 turbine-schema.xml
--- build/torque/schema/turbine-schema.xml	18 Oct 2002 19:16:31 -0000	1.6
+++ build/torque/schema/turbine-schema.xml	31 Aug 2003 11:23:54 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd">
 
 <!-- ==================================================================== -->
 <!--                                                                      -->