Author: tv
Date: Sat Nov 18 10:14:14 2006
New Revision: 476581
URL: http://svn.apache.org/viewvc?view=rev&rev=476581
Log:
Version 3.3 all over the place. Updated some dependencies.
Modified:
db/torque/common/trunk/pom.xml
db/torque/common/trunk/project.xml
db/torque/generator/trunk/pom.xml
db/torque/generator/trunk/src/conf/build-torque.xml
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
db/torque/generator/trunk/xdocs/custom-templates.xml
db/torque/generator/trunk/xdocs/how-templates-work.xml
db/torque/generator/trunk/xdocs/index.xml
db/torque/generator/trunk/xdocs/navigation.xml
db/torque/maven-plugin/trunk/project.xml
db/torque/maven-plugin/trunk/xdocs/index.xml
db/torque/maven-plugin/trunk/xdocs/navigation.xml
db/torque/runtime/trunk/project.xml
db/torque/runtime/trunk/xdocs/navigation.xml
db/torque/site/trunk/xdocs/changes.xml
db/torque/site/trunk/xdocs/developer-info/site-edit-deploy.xml
db/torque/site/trunk/xdocs/download.xml
db/torque/site/trunk/xdocs/index.xml
db/torque/site/trunk/xdocs/navigation.xml
db/torque/site/trunk/xdocs/version-specific/database-howtos/hsqldb-howto.xml
db/torque/site/trunk/xdocs/version-specific/database-howtos/postgres-howto.xml
db/torque/site/trunk/xdocs/version-specific/other-howtos/database-layout-howto.xml
db/torque/site/trunk/xdocs/version-specific/supported-databases.xml
db/torque/templates/trunk/pom.xml
db/torque/test/trunk/test-project/pom.xml
db/torque/trunks/maven.xml
db/torque/tutorial/trunk/xdocs/index.xml
db/torque/tutorial/trunk/xdocs/navigation.xml
db/torque/tutorial/trunk/xdocs/step1.xml
db/torque/tutorial/trunk/xdocs/step3.xml
db/torque/tutorial/trunk/xdocs/step4.xml
db/torque/tutorial/trunk/xdocs/step6.xml
Modified: db/torque/common/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/common/trunk/pom.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/common/trunk/pom.xml (original)
+++ db/torque/common/trunk/pom.xml Sat Nov 18 10:14:14 2006
@@ -28,7 +28,7 @@
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque</name>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.3-RC1</version>
<description>Common project descriptor for the Torque project</description>
<url>http://db.apache.org/torque</url>
Modified: db/torque/common/trunk/project.xml
URL:
http://svn.apache.org/viewvc/db/torque/common/trunk/project.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/common/trunk/project.xml (original)
+++ db/torque/common/trunk/project.xml Sat Nov 18 10:14:14 2006
@@ -22,7 +22,7 @@
<pomVersion>3</pomVersion>
<groupId>torque</groupId>
<name>Torque</name>
- <currentVersion>3.2.1-dev</currentVersion>
+ <currentVersion>3.3-RC1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://db.apache.org/</url>
@@ -352,7 +352,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-ant-plugin</artifactId>
- <version>1.9</version>
+ <version>1.10</version>
<type>plugin</type>
</dependency>
@@ -366,28 +366,28 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-changelog-plugin</artifactId>
- <version>1.8.2</version>
+ <version>1.9.1</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-developer-activity-plugin</artifactId>
- <version>1.5.2</version>
+ <version>1.6</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-file-activity-plugin</artifactId>
- <version>1.5.2</version>
+ <version>1.6</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven-plugins</groupId>
<artifactId>maven-findbugs-plugin</artifactId>
- <version>0.9.1</version>
+ <version>1.3</version>
<url>http://maven-plugins.sourceforge.net/maven-findbugs-plugin/</url>
<type>plugin</type>
</dependency>
@@ -395,28 +395,28 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>1.6.1</version>
+ <version>1.7</version>
<type>plugin</type>
</dependency>
@@ -430,7 +430,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-xdoc-plugin</artifactId>
- <version>1.9.2</version>
+ <version>1.10</version>
<type>plugin</type>
</dependency>
</dependencies>
Modified: db/torque/generator/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/pom.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/pom.xml (original)
+++ db/torque/generator/trunk/pom.xml Sat Nov 18 10:14:14 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.db.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.3-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/src/conf/build-torque.xml (original)
+++ db/torque/generator/trunk/src/conf/build-torque.xml Sat Nov 18 10:14:14 2006
@@ -41,7 +41,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.1-dev.jar"/>
+ <property name="torque.jar" value="torque-gen-3.3-RC1.jar"/>
<!--
Build the classpath used by all torque ant tasks.
Modified:
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
---
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
(original)
+++
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
Sat Nov 18 10:14:14 2006
@@ -673,7 +673,7 @@
/**
* Utility method to see if the column is a string
*
- * @deprecated will be removed after the 3.2 release
+ * @deprecated will be removed after the 3.3 release
*/
public boolean isString()
{
Modified:
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
---
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
(original)
+++
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
Sat Nov 18 10:14:14 2006
@@ -40,7 +40,7 @@
{
/** Where the DTD is located on the web. */
public static final String WEB_SITE_DTD
- = "http://db.apache.org/torque/dtd/database_3_2_1.dtd";;
+ = "http://db.apache.org/torque/dtd/database_3_3.dtd";;
/** Where the 3.2 DTD is located on the web. */
public static final String WEB_SITE_DTD_3_2
Modified: db/torque/generator/trunk/xdocs/custom-templates.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/xdocs/custom-templates.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/xdocs/custom-templates.xml (original)
+++ db/torque/generator/trunk/xdocs/custom-templates.xml Sat Nov 18 10:14:14
2006
@@ -80,7 +80,7 @@
<p>
Torque has always supported customizing its generator thru creating
complete template file replacement directorys/jar and/or a custom Java
- class generator jar. However, starting with version 3.2.1, the Torque
+ class generator jar. However, starting with version 3.3, the Torque
build scripts (Maven 1.0 and Ant, Maven 2.0 is coming), support an
"override" method that is intended to allow specific templates and classes
to be customized, rather than a complete replacement.
@@ -229,7 +229,7 @@
<tr>
<td>Date:</td><td>9 Aug 2006</td>
</tr>
- <tr><td>Torque-Version:</td><td>3.2.1 (Dev)</td>
+ <tr><td>Torque-Version:</td><td>3.3-RC1</td>
</tr>
<tr>
<td>Goal/Target Effected:</td><td>datadtd</td>
Modified: db/torque/generator/trunk/xdocs/how-templates-work.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/xdocs/how-templates-work.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/xdocs/how-templates-work.xml (original)
+++ db/torque/generator/trunk/xdocs/how-templates-work.xml Sat Nov 18 10:14:14
2006
@@ -160,7 +160,7 @@
<section name="The XML Custom Option Element">
<p>
- With the release of Version 3.2.1, the XML DTD supports an
+ With the release of Version 3.3, the XML DTD supports an
<option key="key" value="value"> element
intended for use by custom templates. Zero or more of these elements
can be nested (as the first item) inside the dataset, table, column,
Modified: db/torque/generator/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/xdocs/index.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/xdocs/index.xml (original)
+++ db/torque/generator/trunk/xdocs/index.xml Sat Nov 18 10:14:14 2006
@@ -63,13 +63,13 @@
of the Torque generator from the
<a href="../../../download.html">Torque download page</a>. Unpack it in
the root directory of your project. This will create a directory called
- <code>torque-gen-3.2</code> in the root directory of your project.
+ <code>torque-gen-3.3</code> in the root directory of your project.
You also need to have <a href="http://ant.apache.org";>ant</a>
installed and available in your path.
</p>
<p>
- Change into the <code>torque-gen-3.2</code> directory and edit the file
+ Change into the <code>torque-gen-3.3</code> directory and edit the file
<code>build.properties</code>. Look through the properties and
modify them to fit your specific set-up.
Afterwards, assuming you want to keep your schema
@@ -97,12 +97,12 @@
<p>
If you want to use the id broker (a Torque runtime service which creates
primary keys in a database independent manner), also copy the file
- <code>torque-gen-3.2/src/schema/id-table-schema.xml</code> to the
+ <code>torque-gen-3.3/src/schema/id-table-schema.xml</code> to the
<code>src/schema</code> subdirectory of your project root.
</p>
<p>
- Now change into the <code>torque-gen-3.2</code> directory, and type
+ Now change into the <code>torque-gen-3.3</code> directory, and type
the command
</p>
@@ -120,7 +120,7 @@
<p>
If you want to create your database using torque (this does not work for
all databases), you first need to copy the database driver jar
- into the <code>torque-gen-3.2/lib</code> directory.
+ into the <code>torque-gen-3.3/lib</code> directory.
Then make sure that the database user you have configured in the
build.properties has sufficient rights to create a database.
When everything is ready, type the command
@@ -132,7 +132,7 @@
<p>
To create the tables in your database, you also need the database driver
- jar in the <code>torque-gen-3.2/lib</code> directory. Type the command
+ jar in the <code>torque-gen-3.3/lib</code> directory. Type the command
</p>
<source>
Modified: db/torque/generator/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/db/torque/generator/trunk/xdocs/navigation.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/generator/trunk/xdocs/navigation.xml (original)
+++ db/torque/generator/trunk/xdocs/navigation.xml Sat Nov 18 10:14:14 2006
@@ -32,7 +32,7 @@
<menu name="Module Documentation">
<item name="Overview"
href="../../../documentation/index.html"/>
- <item name="Torque 3.2"
href="../../../documentation/torque-3.2.html">
+ <item name="Torque 3.3"
href="../../../documentation/torque-3.3.html">
<item name="Generator" href="/index.html" collapse="true">
<item name="Tasks Reference" href="/tasks-reference.html"/>
<item name="Schema Reference" href="/schema-reference.html"/>
Modified: db/torque/maven-plugin/trunk/project.xml
URL:
http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/project.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/maven-plugin/trunk/project.xml (original)
+++ db/torque/maven-plugin/trunk/project.xml Sat Nov 18 10:14:14 2006
@@ -88,14 +88,14 @@
<dependency>
<groupId>torque</groupId>
<artifactId>torque-gen</artifactId>
- <version>3.2.1-dev</version>
+ <version>3.3-RC1</version>
<url>http://db.apache.org/torque/generator/</url>
</dependency>
<dependency>
<groupId>torque</groupId>
<artifactId>torque-gen-templates</artifactId>
- <version>3.2.1-dev</version>
+ <version>3.3-RC1</version>
<url>http://db.apache.org/torque/templates/</url>
</dependency>
Modified: db/torque/maven-plugin/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/xdocs/index.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/maven-plugin/trunk/xdocs/index.xml (original)
+++ db/torque/maven-plugin/trunk/xdocs/index.xml Sat Nov 18 10:14:14 2006
@@ -65,7 +65,7 @@
</p>
<source><![CDATA[
-maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque
-Dversion=3.2
+maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque
-Dversion=3.3
]]></source>
</section>
Modified: db/torque/maven-plugin/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/xdocs/navigation.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/maven-plugin/trunk/xdocs/navigation.xml (original)
+++ db/torque/maven-plugin/trunk/xdocs/navigation.xml Sat Nov 18 10:14:14 2006
@@ -32,7 +32,7 @@
<menu name="Module Documentation">
<item name="Overview"
href="../../../documentation/index.html"/>
- <item name="Torque 3.2"
href="../../../documentation/torque-3.2.html">
+ <item name="Torque 3.3"
href="../../../documentation/torque-3.3.html">
<item name="Generator" href="../generator/index.html"
collapse="true">
<item name="dummy"/>
</item>
Modified: db/torque/runtime/trunk/project.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/project.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Sat Nov 18 10:14:14 2006
@@ -52,7 +52,7 @@
<version>2.1</version>
<type>jar</type>
<properties>
- <war.bundle>true</war.bundle>
+ <dist.bundle>true</dist.bundle>
</properties>
</dependency>
@@ -196,9 +196,6 @@
<artifactId>avalon-framework-impl</artifactId>
<version>4.3</version>
<type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<dependency>
Modified: db/torque/runtime/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/navigation.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/runtime/trunk/xdocs/navigation.xml (original)
+++ db/torque/runtime/trunk/xdocs/navigation.xml Sat Nov 18 10:14:14 2006
@@ -32,7 +32,7 @@
<menu name="Module Documentation">
<item name="Overview"
href="../../../documentation/index.html"/>
- <item name="Torque 3.2"
href="../../../documentation/torque-3.2.html">
+ <item name="Torque 3.3"
href="../../../documentation/torque-3.3.html">
<item name="Generator" href="../generator/index.html"
collapse="true">
<item name="dummy"/>
</item>
Modified: db/torque/site/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/changes.xml (original)
+++ db/torque/site/trunk/xdocs/changes.xml Sat Nov 18 10:14:14 2006
@@ -30,10 +30,13 @@
<body>
- <release version="3.2.1-dev" date="in SVN">
+ <release version="3.3-RC1" date="in SVN">
<action type="fix" dev="tfischer">
Fixed a synchronisation issue in the getDateString() method in
the database adapter for postgresql.
+ </action>
+ <action type="fix" dev="tv" issue="TORQUE-63" due-to="Ronny Völker">
+ Wrong caching of method calls with more than three arguments in
MethodResultCache.
</action>
<action type="add" dev="tfischer" issue="TORQUE-44" due-to="Greg Monroe">
The Column names TABLE_NAME and DATABASE_NAME are now legal column
names.
Modified: db/torque/site/trunk/xdocs/developer-info/site-edit-deploy.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/developer-info/site-edit-deploy.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/developer-info/site-edit-deploy.xml (original)
+++ db/torque/site/trunk/xdocs/developer-info/site-edit-deploy.xml Sat Nov 18
10:14:14 2006
@@ -148,8 +148,8 @@
<li>
In the _COPY_ of the site for the archive, remove the previous
versions in the releases/ subdirectory. E.g. if the current version
- is Torque 3.2 and you want to create the site for the release of
- Torque 3.2.1, remove everything except the torque-3.2 subdirectory
+ is Torque 3.3 and you want to create the site for the release of
+ Torque 4.0, remove everything except the torque-3.3 subdirectory
of the releases directory.
</li>
<li>
@@ -163,7 +163,7 @@
<li>
Clean the directory of the previous version in the new version of
the site (NOT in the copy) (in the above examples, this would be
- removing releases/torque-3.2/runtime, releases/torque-3.2/generator
+ removing releases/torque-3.3/runtime, releases/torque-3.3/generator
and so on.)
</li>
<li>
@@ -176,7 +176,7 @@
<li>
Remove the old dev version (if it exists) from the releases
subdirectoy (in our above eample, this would be
- releases/torque-3.2.1-dev).
+ releases/torque-3.3-dev).
</li>
<li>
Empty your browser cache and check the results.
Modified: db/torque/site/trunk/xdocs/download.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/download.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/download.xml (original)
+++ db/torque/site/trunk/xdocs/download.xml Sat Nov 18 10:14:14 2006
@@ -47,6 +47,34 @@
</tr>
<tr>
+ <td rowspan="3"><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/";>Torque
3.3</a></td>
+ </tr>
+
+ <tr>
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/binaries/torque-3.3.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-3.3.tar.gz.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-3.3.tar.gz.md5";>MD5</a></td>
+
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/binaries/torque-gen-3.3.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-gen-3.3.tar.gz.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-gen-3.3.tar.gz.md5";>MD5</a></td>
+ <td rowspan="2">
+ <a
href="http://www.apache.org/dyn/closer.cgi/java-repository/torque/plugins/maven-torque-plugin-3.3.jar";>JAR</a>
+ <a
href="http://www.apache.org/dist/java-repository/torque/plugins/maven-torque-plugin-3.3.jar.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/java-repository/torque/plugins/maven-torque-plugin-3.3.jar.md5";>MD5</a></td>
+ </tr>
+
+ <tr>
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/binaries/torque-3.3.zip";>ZIP</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-3.3.zip.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-3.3.zip.md5";>MD5</a></td>
+
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/binaries/torque-gen-3.3.zip";>ZIP</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-gen-3.3.zip.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/binaries/torque-gen-3.3.zip.md5";>MD5</a></td>
+ </tr>
+
+ <tr>
<td rowspan="3"><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.2/";>Torque
3.2</a></td>
</tr>
@@ -147,6 +175,22 @@
<th>Runtime</th>
<th>Generator</th>
<th>Maven Plugin</th>
+ </tr>
+
+ <tr>
+ <td rowspan="2"><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/";>Torque
3.3</a></td>
+
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/source/torque-3.3-src.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/torque-3.3-src.tar.gz.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/torque-3.3-src.tar.gz.md5";>MD5</a></td>
+
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/source/torque-gen-3.3-src.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/torque-gen-3.3-src.tar.gz.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/torque-gen-3.3-src.tar.gz.md5";>MD5</a></td>
+
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-3.3/source/maven-torque-plugin-3.3-src.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/maven-torque-plugin-3.3-src.tar.gz.asc";>Signature</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-3.3/source/maven-torque-plugin-3.3-src.tar.gz.md5";>MD5</a></td>
</tr>
<tr>
Modified: db/torque/site/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/index.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/index.xml (original)
+++ db/torque/site/trunk/xdocs/index.xml Sat Nov 18 10:14:14 2006
@@ -107,7 +107,7 @@
<p>
<ul>
<li>
- Most recent <i>production</i> release of Torque is Torque 3.2
+ Most recent <i>production</i> release of Torque is Torque 3.3
</li>
<!--li>
Most recent <i>development</i> release of Torque is Torque 3.2-rc3
Modified: db/torque/site/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/navigation.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/navigation.xml (original)
+++ db/torque/site/trunk/xdocs/navigation.xml Sat Nov 18 10:14:14 2006
@@ -46,17 +46,17 @@
<menu name="Module Documentation">
<item name="Overview" href="/documentation/index.html"/>
- <item name="Torque 3.2" href="/documentation/torque-3.2.html">
- <item name="Generator"
href="/releases/torque-3.2/generator/index.html" collapse="true">
+ <item name="Torque 3.3" href="/documentation/torque-3.3.html">
+ <item name="Generator"
href="/releases/torque-3.3/generator/index.html" collapse="true">
<item name="dummy"/>
</item>
- <item name="Maven Plugin"
href="/releases/torque-3.2/maven-plugin/index.html" collapse="true">
+ <item name="Maven Plugin"
href="/releases/torque-3.3/maven-plugin/index.html" collapse="true">
<item name="dummy"/>
</item>
- <item name="Runtime"
href="/releases/torque-3.2/runtime/index.html" collapse="true">
+ <item name="Runtime"
href="/releases/torque-3.3/runtime/index.html" collapse="true">
<item name="dummy"/>
</item>
- <item name="Tutorial"
href="/releases/torque-3.2/tutorial/index.html" collapse="true">
+ <item name="Tutorial"
href="/releases/torque-3.3/tutorial/index.html" collapse="true">
<item name="dummy"/>
</item>
</item>
Modified:
db/torque/site/trunk/xdocs/version-specific/database-howtos/hsqldb-howto.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/version-specific/database-howtos/hsqldb-howto.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
---
db/torque/site/trunk/xdocs/version-specific/database-howtos/hsqldb-howto.xml
(original)
+++
db/torque/site/trunk/xdocs/version-specific/database-howtos/hsqldb-howto.xml
Sat Nov 18 10:14:14 2006
@@ -33,7 +33,7 @@
<section name="HSQLDB 1.7.x">
<p>
- In Torque 3.2.1, the drop table statement was changed from
+ In Torque 3.3, the drop table statement was changed from
</p>
<source>
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?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
---
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
Sat Nov 18 10:14:14 2006
@@ -28,7 +28,7 @@
<section name="PostgreSQL versions">
<p>
- The generator templates in Torque 3.2 are optimized for
+ The generator templates in Torque 3.3 are optimized for
PostgreSQL 7.3 and later.
To use an older version of PostgreSQL, do the following:
</p>
Modified:
db/torque/site/trunk/xdocs/version-specific/other-howtos/database-layout-howto.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/version-specific/other-howtos/database-layout-howto.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
---
db/torque/site/trunk/xdocs/version-specific/other-howtos/database-layout-howto.xml
(original)
+++
db/torque/site/trunk/xdocs/version-specific/other-howtos/database-layout-howto.xml
Sat Nov 18 10:14:14 2006
@@ -74,7 +74,7 @@
</p>
<p>
- Note that prior to Release 3.2.1, using these two column names WILL produce
+ Note that prior to Release 3.3, using these two column names WILL produce
duplicate constants and uncompilable code.
</p>
Modified: db/torque/site/trunk/xdocs/version-specific/supported-databases.xml
URL:
http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/version-specific/supported-databases.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/site/trunk/xdocs/version-specific/supported-databases.xml
(original)
+++ db/torque/site/trunk/xdocs/version-specific/supported-databases.xml Sat Nov
18 10:14:14 2006
@@ -153,7 +153,7 @@
<p>
If your RDBMS is not listed here, please read the document about
- <a
href="../releases/torque-3.2/runtime/reference/new-database-support.html">writing
DB Adapters</a>.
+ <a
href="../releases/torque-3.3/runtime/reference/new-database-support.html">writing
DB Adapters</a>.
</p>
<p>
If there is no tester for your RDBMS and you want to help, please read
Modified: db/torque/templates/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/templates/trunk/pom.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/templates/trunk/pom.xml (original)
+++ db/torque/templates/trunk/pom.xml Sat Nov 18 10:14:14 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.db.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.3-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: db/torque/test/trunk/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/pom.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/test/trunk/test-project/pom.xml (original)
+++ db/torque/test/trunk/test-project/pom.xml Sat Nov 18 10:14:14 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.db.torque</groupId>
<artifactId>torque</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.3-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: db/torque/trunks/maven.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunks/maven.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/trunks/maven.xml (original)
+++ db/torque/trunks/maven.xml Sat Nov 18 10:14:14 2006
@@ -67,7 +67,7 @@
</goal>
<goal name="copy-generator-docs" description="Copy generated docs to target
directory">
- <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.2/generator">
+ <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.3/generator">
<ant:fileset dir="${basedir}/generator/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
@@ -75,7 +75,7 @@
</goal>
<goal name="copy-runtime-docs" description="Copy generated docs to target
directory">
- <ant:copy todir="${basedir}/site/target/docs/releases/torque-3.2/runtime">
+ <ant:copy todir="${basedir}/site/target/docs/releases/torque-3.3/runtime">
<ant:fileset dir="${basedir}/runtime/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
@@ -83,7 +83,7 @@
</goal>
<goal name="copy-plugin1-docs" description="Copy generated docs to target
directory">
- <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.2/maven-plugin">
+ <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.3/maven-plugin">
<ant:fileset dir="${basedir}/maven-plugin/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
@@ -91,7 +91,7 @@
</goal>
<goal name="copy-template-docs" description="Copy generated docs to target
directory">
- <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.2/templates">
+ <ant:copy
todir="${basedir}/site/target/docs/releases/torque-3.3/templates">
<ant:fileset dir="${basedir}/templates/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
@@ -99,7 +99,7 @@
</goal>
<goal name="copy-tutorial-docs" description="Copy generated docs to target
directory">
- <ant:copy todir="${basedir}/site/target/docs/releases/torque-3.2/tutorial">
+ <ant:copy todir="${basedir}/site/target/docs/releases/torque-3.3/tutorial">
<ant:fileset dir="${basedir}/tutorial/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
Modified: db/torque/tutorial/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/index.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/index.xml (original)
+++ db/torque/tutorial/trunk/xdocs/index.xml Sat Nov 18 10:14:14 2006
@@ -20,7 +20,7 @@
<document>
<properties>
- <title>Torque 3.2 Tutorial</title>
+ <title>Torque 3.3 Tutorial</title>
<author email="[EMAIL PROTECTED]">Pete Kazmier</author>
<author email="[EMAIL PROTECTED]">Scott Eade</author>
<author email="[EMAIL PROTECTED]">Thomas Fischer</author>
Modified: db/torque/tutorial/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/navigation.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/navigation.xml (original)
+++ db/torque/tutorial/trunk/xdocs/navigation.xml Sat Nov 18 10:14:14 2006
@@ -32,7 +32,7 @@
<menu name="Module Documentation">
<item name="Overview"
href="../../../documentation/index.html"/>
- <item name="Torque 3.2"
href="../../../documentation/torque-3.2.html">
+ <item name="Torque 3.3"
href="../../../documentation/torque-3.3.html">
<item name="Generator" href="../generator/index.html"
collapse="true">
<item name="dummy"/>
</item>
Modified: db/torque/tutorial/trunk/xdocs/step1.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step1.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step1.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step1.xml Sat Nov 18 10:14:14 2006
@@ -53,10 +53,10 @@
to work properly.
</li>
</ul>
- For this tutorial, we will be using the maven plugin for Torque 3.2.x
+ For this tutorial, we will be using the maven plugin for Torque 3.3
(which will silently invoke the generator) to
generate our object model classes and sql scripts. For working with the
- generated classes, we will use the Torque 3.2.x runtime for our
+ generated classes, we will use the Torque 3.3 runtime for our
sample application.
</p>
@@ -75,7 +75,7 @@
</p>
<source><![CDATA[
-maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque
-Dversion=3.2
+maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque
-Dversion=3.3
]]></source>
<p>
Modified: db/torque/tutorial/trunk/xdocs/step3.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step3.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step3.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step3.xml Sat Nov 18 10:14:14 2006
@@ -197,7 +197,7 @@
<groupId>torque</groupId>
<id>torque-tutorial</id>
<name>Torque</name>
- <currentVersion>3.2-rc3</currentVersion>
+ <currentVersion>3.3</currentVersion>
<dependencies>
<dependency>
Modified: db/torque/tutorial/trunk/xdocs/step4.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step4.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step4.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step4.xml Sat Nov 18 10:14:14 2006
@@ -65,79 +65,114 @@
<dependency>
<artifactId>torque</artifactId>
<groupId>torque</groupId>
- <version>3.2-rc3</version>
+ <version>3.3</version>
</dependency>
<dependency>
- <artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
- <version>4.1.4</version>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <url>http://avalon.apache.org/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
</dependency>
<dependency>
- <artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
<version>1.7.0</version>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
</dependency>
<dependency>
- <artifactId>commons-collections</artifactId>
<groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<version>3.1</version>
+ <url>http://jakarta.apache.org/commons/collections/</url>
</dependency>
<dependency>
- <artifactId>commons-configuration</artifactId>
<groupId>commons-configuration</groupId>
- <version>1.1</version>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/commons/configuration/</url>
</dependency>
<dependency>
- <artifactId>commons-dbcp</artifactId>
<groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
+ <url>http://jakarta.apache.org/commons/dbcp/</url>
</dependency>
<dependency>
- <artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>2.1</version>
+ <url>http://jakarta.apache.org/commons/lang/</url>
</dependency>
<dependency>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
</dependency>
<dependency>
- <artifactId>commons-pool</artifactId>
<groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
<version>1.2</version>
+ <url>http://jakarta.apache.org/commons/pool/</url>
</dependency>
<dependency>
- <artifactId>jcs</artifactId>
<groupId>jcs</groupId>
+ <artifactId>jcs</artifactId>
<version>20030822.182132</version>
+ <url>http://jakarta.apache.org/jcs/</url>
+ </dependency>
+
+ <!-- This is not needed if you use Java 1.4 or higher -->
+ <dependency>
+ <groupId>jdbc</groupId>
+ <artifactId>jdbc</artifactId>
+ <version>2.0</version>
+ <url>http://java.sun.com/products/jdbc/download.html#spec</url>
+ </dependency>
+
+ <!-- This is not needed if you use Java 1.4 or higher -->
+ <dependency>
+ <groupId>jndi</groupId>
+ <artifactId>jndi</artifactId>
+ <version>1.2.1</version>
+ <url>http://java.sun.com/products/jndi/</url>
</dependency>
<dependency>
- <artifactId>village</artifactId>
<groupId>village</groupId>
+ <artifactId>village</artifactId>
<version>2.0</version>
+ <url>http://www.softwareforge.de/projects/village</url>
</dependency>
<dependency>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
+ <url>http://xerces.apache.org/xerces2-j/</url>
</dependency>
<dependency>
- <artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<version>2.0.2</version>
+ <url>http://xml.apache.org/commons/</url>
</dependency>
]]></source>
Modified: db/torque/tutorial/trunk/xdocs/step6.xml
URL:
http://svn.apache.org/viewvc/db/torque/tutorial/trunk/xdocs/step6.xml?view=diff&rev=476581&r1=476580&r2=476581
==============================================================================
--- db/torque/tutorial/trunk/xdocs/step6.xml (original)
+++ db/torque/tutorial/trunk/xdocs/step6.xml Sat Nov 18 10:14:14 2006
@@ -137,7 +137,7 @@
</p>
<source><![CDATA[
-java -cp
classes:lib/avalon-framework-4.1.4.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-collections-3.1.jar:lib/commons-configuration-1.1.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-3.1.6-bin.jar:lib/torque-3.2-rc3.jar:lib/village-2.0.jar
com.kazmier.Bookstore
+java -cp
classes:lib/avalon-framework-4.1.4.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-collections-3.1.jar:lib/commons-configuration-1.1.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-bin.jar:lib/torque-3.3-rc3.jar:lib/village-2.0.jar
com.kazmier.Bookstore
]]></source>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
