From torque-dev-return-8151-apmail-db-torque-dev-archive=db.apache.org@db.apache.org Thu Nov 01 16:21:06 2007
Return-Path: <torque-dev-return-8151-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: (qmail 81924 invoked from network); 1 Nov 2007 16:21:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Nov 2007 16:21:06 -0000
Received: (qmail 92387 invoked by uid 500); 1 Nov 2007 16:20:53 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 92349 invoked by uid 500); 1 Nov 2007 16:20:53 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 92338 invoked by uid 500); 1 Nov 2007 16:20:53 -0000
Received: (qmail 92335 invoked by uid 99); 1 Nov 2007 16:20:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 09:20:53 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 16:21:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CB2AA1A9832; Thu,  1 Nov 2007 09:20:31 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r591070 - in /db/torque: generator/trunk/src/conf/
 maven-plugin/trunk/ runtime/trunk/ site/trunk/xdocs/developer-info/
 site/trunk/xdocs/version-specific/database-howtos/ tutorial/trunk/xdocs/
Date: Thu, 01 Nov 2007 16:20:28 -0000
To: torque-commits@db.apache.org
From: tv@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071101162031.CB2AA1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tv
Date: Thu Nov  1 09:20:26 2007
New Revision: 591070

URL: http://svn.apache.org/viewvc?rev=591070&view=rev
Log:
Fixed village references in build scripts and docs

Modified:
    db/torque/generator/trunk/src/conf/build-torque.xml
    db/torque/maven-plugin/trunk/project.xml
    db/torque/runtime/trunk/gump.xml
    db/torque/site/trunk/xdocs/developer-info/developer-guide.xml
    db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml
    db/torque/tutorial/trunk/xdocs/step4.xml
    db/torque/tutorial/trunk/xdocs/step6.xml

Modified: db/torque/generator/trunk/src/conf/build-torque.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/build-torque.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/generator/trunk/src/conf/build-torque.xml (original)
+++ db/torque/generator/trunk/src/conf/build-torque.xml Thu Nov  1 09:20:26 2007
@@ -42,6 +42,7 @@
   <property name="lib.dir" value="lib"/>
   <property name="torque.lib.dir" value="${lib.dir}"/>
   <property name="torque.jar" value="torque-gen-3.3-RC3.jar"/>
+  <property name="village.jar" value="village-3.3-RC3.jar"/>
 
   <!--
     Build the classpath used by all torque ant tasks.
@@ -78,12 +79,12 @@
       <include name="*override.jar"/>
     </fileset>
     <pathelement path="${torque.jar}" />
+    <pathelement path="${village.jar}" />
     <fileset dir="${torque.lib.dir}">
       <include name="**/commons-collections-3.2.jar"/>
       <include name="**/commons-lang-2.3.jar"/>
       <include name="**/commons-logging-1.1.jar"/>
       <include name="**/velocity-1.5.jar"/>
-      <include name="**/village-2.0.jar"/>
       <include name="**/xercesImpl-2.6.2.jar"/>
       <include name="**/xml-apis-2.0.2.jar"/>
       <include name="**/*.jar"/>

Modified: db/torque/maven-plugin/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/project.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/maven-plugin/trunk/project.xml (original)
+++ db/torque/maven-plugin/trunk/project.xml Thu Nov  1 09:20:26 2007
@@ -114,10 +114,10 @@
     </dependency>
 
     <dependency>
+      <groupId>torque</groupId>
       <artifactId>village</artifactId>
-      <groupId>village</groupId>
-      <version>2.0</version>
-      <url>http://www.softwareforge.de/projects/village</url>
+      <version>3.3-RC3</version>
+      <url>http://db.apache.org/torque/village/</url>
     </dependency>
 
     <dependency>

Modified: db/torque/runtime/trunk/gump.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/gump.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/runtime/trunk/gump.xml (original)
+++ db/torque/runtime/trunk/gump.xml Thu Nov  1 09:20:26 2007
@@ -17,12 +17,12 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<module name="jakarta-turbine-torque">
+<module name="db-torque">
 
   <description>Persistence Layer</description>
-  <url href="http://jakarta.apache.org/turbine/torque/"/>
+  <url href="http://db.apache.org/torque/"/>
 
-  <cvs repository="jakarta"/>
+  <cvs repository="db"/>
 
   <!-- This is really the cvs module. We need to change this but -->
   <!-- I will leave this for now until everything works.         -->
@@ -53,7 +53,6 @@
     <depend project="jakarta-velocity"/>
     <depend project="jakarta-velocity-dvsl"/>
     <depend project="jdbc"/>
-    <depend project="village"/>
     <depend project="xml-xerces"/>
     <depend project="xml-apis"/>
 
@@ -62,7 +61,7 @@
     <jar name="torque-@@DATE@@.jar"/>
     <javadoc nested="docs/apidocs"/>
 
-    <nag from="turbine-torque-dev@jakarta.apache.org"
-         to="turbine-torque-dev@jakarta.apache.org"/>
+    <nag from="torque-dev@db.apache.org"
+         to="torque-dev@db.apache.org"/>
   </project>
 </module>

Modified: db/torque/site/trunk/xdocs/developer-info/developer-guide.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/developer-info/developer-guide.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/site/trunk/xdocs/developer-info/developer-guide.xml (original)
+++ db/torque/site/trunk/xdocs/developer-info/developer-guide.xml Thu Nov  1 09:20:26 2007
@@ -86,7 +86,7 @@
       
       <subsection name="Maven 2 build">
         <p>
-          Change into the directories common, runtime, templates, generator, and
+          Change into the directories common, village, runtime, templates, generator, and
           maven2-plugin in this order and run <code>mvn install</code>
           in each of them.
         </p>

Modified: db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml (original)
+++ db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml Thu Nov  1 09:20:26 2007
@@ -85,7 +85,7 @@
 not map to one of the columns in the visitor table is written to a large
 object field in the database.  Database actions in the TurbineUserPeer and
 BasePeer classes are done through the
-<a href="http://www.softwareforge.de/projects/village">Village API</a>.
+<a href="../../releases/torque-3.3/village/index.html">Village API</a>.
 The village API uses the ResultSetMetaData returned by your JDBC driver to
 determine the types of the columns in a SQL result set.  Unfortunately,
 in PostgreSQL large objects are referenced using an OID column (which is a
@@ -123,7 +123,7 @@
 the driver, please try it out. You may also wish to try upgrading to a
 more recent version of the Postgrest driver and also make sure that you
 are using the latest released version of
-<a href="http://www.softwareforge.de/projects/village">Village</a>.
+<a href="../../releases/torque-3.3/village/index.html">Village</a>.
 </p>
 
 <source><![CDATA[

Modified: db/torque/tutorial/trunk/xdocs/step4.xml
URL: http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step4.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step4.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step4.xml Thu Nov  1 09:20:26 2007
@@ -92,57 +92,56 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
+      <version>3.2</version>
       <url>http://jakarta.apache.org/commons/collections/</url>
     </dependency>
 
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>1.2</version>
+      <version>1.4</version>
       <url>http://jakarta.apache.org/commons/configuration/</url>
     </dependency>
 
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2</version>
       <url>http://jakarta.apache.org/commons/dbcp/</url>
     </dependency>
 
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.3</version>
       <url>http://jakarta.apache.org/commons/lang/</url>
     </dependency>
 
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/logging/</url>
     </dependency>
 
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
       <url>http://jakarta.apache.org/commons/pool/</url>
     </dependency>
 
     <dependency>
       <groupId>jcs</groupId>
       <artifactId>jcs</artifactId>
-      <version>20030822.182132</version>
+      <version>1.3</version>
       <url>http://jakarta.apache.org/jcs/</url>
     </dependency>
 
     <dependency>
-      <groupId>village</groupId>
       <artifactId>village</artifactId>
-      <version>2.0</version>
-      <url>http://www.softwareforge.de/projects/village</url>
+      <groupId>torque</groupId>
+      <version>3.3-RC3</version>
     </dependency>
 
     <dependency>
@@ -162,7 +161,7 @@
 ]]></source>
 
 <p>
-  You need not download any of these libraries -
+  You don't need to download any of these libraries -
   Maven will download them automatically when you
   build your project.
 </p>

Modified: db/torque/tutorial/trunk/xdocs/step6.xml
URL: http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step6.xml?rev=591070&r1=591069&r2=591070&view=diff
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step6.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step6.xml Thu Nov  1 09:20:26 2007
@@ -138,7 +138,7 @@
 </p>
 
 <source><![CDATA[
-java -cp classes:lib/avalon-framework-4.1.4.jar:lib/commons-beanutils-core-1.7.0.jar:lib/commons-collections-3.1.jar:lib/commons-configuration-1.2.jar:lib/commons-dbcp-1.2.1.jar:lib/commons-lang-2.1.jar:lib/commons-logging-1.0.4.jar:lib/commons-pool-1.2.jar:lib/jcs-20030822.182132.jar:lib/mysql-connector-java-5.0.4.jar:lib/torque-3.3-RC3.jar:lib/village-2.0.jar com.kazmier.Bookstore
+java -cp classes:lib/avalon-framework-api-4.3.jar:lib/commons-beanutils-core-1.7.0.jar:lib/commons-collections-3.2.jar:lib/commons-configuration-1.4.jar:lib/commons-dbcp-1.2.2.jar:lib/commons-lang-2.3.jar:lib/commons-logging-1.1.jar:lib/commons-pool-1.3.jar:lib/jcs-1.3.jar:lib/mysql-connector-java-5.0.4.jar:lib/torque-3.3-RC3.jar:lib/village-3.3-RC3.jar com.kazmier.Bookstore
 ]]></source>
 
 <p>



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