svn commit: r909999 - in /db/torque/village/trunk: src/java/com/workingdogs/village/Value.java xdocs/changes.xml
Author: seade
Date: Sun Feb 14 11:31:24 2010
New Revision: 90
URL: http://svn.apache.org/viewvc?rev=90view=rev
Log:
Deal with situation arising in jre1.6.0_18 where an IllegalArgumentException is
encountered for dates with a single digit month or day of month. Resolves
TORQUE-133.
Reapplying patch to correct location.
Modified:
db/torque/village/trunk/src/java/com/workingdogs/village/Value.java
db/torque/village/trunk/xdocs/changes.xml
Modified: db/torque/village/trunk/src/java/com/workingdogs/village/Value.java
URL:
http://svn.apache.org/viewvc/db/torque/village/trunk/src/java/com/workingdogs/village/Value.java?rev=90r1=909998r2=90view=diff
==
--- db/torque/village/trunk/src/java/com/workingdogs/village/Value.java
(original)
+++ db/torque/village/trunk/src/java/com/workingdogs/village/Value.java Sun Feb
14 11:31:24 2010
@@ -1244,17 +1244,17 @@
{
cal.setTime((Time) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
-(cal.get(Calendar.MONTH) + 1) + -
-+ cal.get(Calendar.DAY_OF_MONTH));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
++ leadingZero(cal.get(Calendar.MONTH) + 1) + -
++ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
-(cal.get(Calendar.MONTH) + 1) + -
-+ cal.get(Calendar.DAY_OF_MONTH));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
++ leadingZero(cal.get(Calendar.MONTH) + 1) + -
++ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isString())
{
@@ -1311,17 +1311,17 @@
{
cal.setTime((Time) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
-(cal.get(Calendar.MONTH) + 1) + -
-+ cal.get(Calendar.DAY_OF_MONTH));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
++ leadingZero(cal.get(Calendar.MONTH) + 1) + -
++ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
-(cal.get(Calendar.MONTH) + 1) + -
-+ cal.get(Calendar.DAY_OF_MONTH));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
++ leadingZero(cal.get(Calendar.MONTH) + 1) + -
++ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
}
else
{
@@ -1522,4 +1522,15 @@
|| value.equalsIgnoreCase(yes)
|| value.equalsIgnoreCase(y) || value.equals(1));
}
+
+/**
+ * Convert an int to a two digit String with a leading zero where
necessary.
+ *
+ * @param val The value to be converted.
+ * @return A two character String with leading zero.
+ */
+private String leadingZero(int val)
+{
+return (val 10 ? 0 : ) + val;
+}
}
Modified: db/torque/village/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/village/trunk/xdocs/changes.xml?rev=90r1=909998r2=90view=diff
==
--- db/torque/village/trunk/xdocs/changes.xml (original)
+++ db/torque/village/trunk/xdocs/changes.xml Sun Feb 14 11:31:24 2010
@@ -25,6 +25,11 @@
body
release version=3.3.1-SNAPSHOT date=in SVN
+action type=fix dev=seade issue=TORQUE-133 due-to=Georg Marx
+ Deal with situation arising in jre1.6.0_18 where an
+ IllegalArgumentException is encountered for dates with a single digit
+ month or day of month.
+/action
action type=fix dev=tv
Fixed the infamous NPE when Oracle returns null for a blob.
/action
-
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
svn commit: r910000 - in /db/torque/village/tags/TORQUE_3_3: pom.xml src/java/com/workingdogs/village/Value.java xdocs/changes.xml
Author: seade
Date: Sun Feb 14 11:39:06 2010
New Revision: 91
URL: http://svn.apache.org/viewvc?rev=91view=rev
Log:
Back out 908012, applied to wrong location.
Modified:
db/torque/village/tags/TORQUE_3_3/pom.xml
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml
Modified: db/torque/village/tags/TORQUE_3_3/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/pom.xml?rev=91r1=90r2=91view=diff
==
--- db/torque/village/tags/TORQUE_3_3/pom.xml (original)
+++ db/torque/village/tags/TORQUE_3_3/pom.xml Sun Feb 14 11:39:06 2010
@@ -26,7 +26,6 @@
artifactIdtorque/artifactId
version3.3/version
/parent
- version3.3.1-dev/version
modelVersion4.0.0/modelVersion
@@ -40,7 +39,7 @@
artifactIdjunit/artifactId
version3.8.1/version
scopetest/scope
-/dependency
+/dependency
/dependencies
build
Modified:
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java?rev=91r1=90r2=91view=diff
==
---
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
(original)
+++
db/torque/village/tags/TORQUE_3_3/src/java/com/workingdogs/village/Value.java
Sun Feb 14 11:39:06 2010
@@ -1245,17 +1245,17 @@
{
cal.setTime((Time) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
-+ leadingZero(cal.get(Calendar.MONTH) + 1) + -
-+ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
+(cal.get(Calendar.MONTH) + 1) + -
++ cal.get(Calendar.DAY_OF_MONTH));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
-+ leadingZero(cal.get(Calendar.MONTH) + 1) + -
-+ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
+(cal.get(Calendar.MONTH) + 1) + -
++ cal.get(Calendar.DAY_OF_MONTH));
}
else if (isString())
{
@@ -1312,17 +1312,17 @@
{
cal.setTime((Time) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
-+ leadingZero(cal.get(Calendar.MONTH) + 1) + -
-+ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
+(cal.get(Calendar.MONTH) + 1) + -
++ cal.get(Calendar.DAY_OF_MONTH));
}
else if (isUtilDate())
{
cal.setTime((java.util.Date) valueObject);
-return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + -
-+ leadingZero(cal.get(Calendar.MONTH) + 1) + -
-+ leadingZero(cal.get(Calendar.DAY_OF_MONTH)));
+return java.sql.Date.valueOf(cal.get(Calendar.YEAR) + - +
+(cal.get(Calendar.MONTH) + 1) + -
++ cal.get(Calendar.DAY_OF_MONTH));
}
else
{
@@ -1523,15 +1523,4 @@
|| value.equalsIgnoreCase(yes)
|| value.equalsIgnoreCase(y) || value.equals(1));
}
-
-/**
- * Convert an int to a two digit String with a leading zero where
necessary.
- *
- * @param val The value to be converted.
- * @return A two character String with leading zero.
- */
-private String leadingZero(int val)
-{
-return (val 10 ? 0 : ) + val;
-}
}
Modified: db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml?rev=91r1=90r2=91view=diff
==
--- db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml (original)
+++ db/torque/village/tags/TORQUE_3_3/xdocs/changes.xml Sun Feb 14 11:39:06 2010
@@ -24,14 +24,7 @@
/properties
body
- release version=3.3.1 date=in SVN
-action type=fix dev=seade issue=TORQUE-133 due-to=Georg Marx
- Deal with situation arising
svn commit: r619230 - in /db/torque/village/trunk: src/test/com/workingdogs/village/TestMySQL.java xdocs/changes.xml
Author: seade
Date: Wed Feb 6 16:29:31 2008
New Revision: 619230
URL: http://svn.apache.org/viewvc?rev=619230view=rev
Log:
Refactored unit tests to use JUnit. This has not been configured to run as
part of the build process.
Added test case for TORQUE-8.
Modified:
db/torque/village/trunk/src/test/com/workingdogs/village/TestMySQL.java
db/torque/village/trunk/xdocs/changes.xml
Modified:
db/torque/village/trunk/src/test/com/workingdogs/village/TestMySQL.java
URL:
http://svn.apache.org/viewvc/db/torque/village/trunk/src/test/com/workingdogs/village/TestMySQL.java?rev=619230r1=619229r2=619230view=diff
==
--- db/torque/village/trunk/src/test/com/workingdogs/village/TestMySQL.java
(original)
+++ db/torque/village/trunk/src/test/com/workingdogs/village/TestMySQL.java Wed
Feb 6 16:29:31 2008
@@ -21,26 +21,32 @@
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import junit.framework.TestCase;
/**
- * This class is used for testing the functionality of this product. While
creating this code, I have closed many potential bugs,
- * but I'm sure that others still exist. Thus, if you find a bug in Village,
please add to this test suite so that the bug will be
- * sure to be fixed in future versions.
+ * This class is used for testing the functionality of this product. While
+ * creating this code, I have closed many potential bugs, but I'm sure that
+ * others still exist. Thus, if you find a bug in Village, please add to this
+ * test suite so that the bug will be sure to be fixed in future versions.
*
- * P
- * In order to do the testing, you will need to be able to connect via JDBC to
your database. Since I use MySQL A
- * HREF=http://www.mysql.com/;http://www.mysql.com//A , this testing suite
is best for that database. I also use the mm MySQL
- * drivers A
HREF=http://www.worldserver.com/mm.mysql/;http://www.worldserver.com/mm.mysql//A
because it is the best driver
- * that I have found for MySQL.
+ * p
+ * In order to do the testing, you will need to be able to connect via JDBC to
+ * your database. Since I use a href=http://www.mysql.com/;MySQL/a, this
+ * testing suite is best for that database. I also use the mm MySQL drivers
+ * a href=http://mmmysql.sourceforge.net/;mm MySQL drivers/a because it
+ * is the best driver that I have found for MySQL.
* /p
*
* P
* Note that Village should work with strongany/strong JDBC compliant
driver.
* /p
*
- * P
- * Here is the schema that this test expects ( you should be able to copy and
paste it into your MySQL database that you want to
- * use ):
+ * p
+ * Here is the schema that this test expects (you should be able to copy and
+ * paste it into your MySQL database that you want to use):
* pre
* CREATE TABLE test
* (
@@ -72,10 +78,18 @@
* /pre
* /p
*
+ * p
+ * Note that presently this class is hardcoded to use a MySQL database named
+ * village with a username of village and a password of village. It is
+ * a modified version of Jon's original Unit test that apparently pre-dated
+ * JUnit!
+ * /p
+ *
* @author a href=mailto:[EMAIL PROTECTED]Jon S. Stevens/a
+ * @author a href=mailto:[EMAIL PROTECTED]Scott Eade/a
* @version $Revision: 565 $
*/
-public class TestMySQL
+public class TestMySQL extends TestCase
{
/** The database connection */
static Connection conn;
@@ -90,18 +104,21 @@
private static String DB_HOST = localhost;
/**
- * This is the user to log into the database as. For this test, the user
must have insert/update/delete access to the database.
+ * This is the user to log into the database as. For this test, the user
+ * must have insert/update/delete access to the database.
*/
-private static String DB_USER = ;
+private static String DB_USER = village;
/** the password for the user */
-private static String DB_PASS = ;
+private static String DB_PASS = village;
/** mm MySQL Driver setup */
private static String DB_DRIVER = org.gjt.mm.mysql.Driver;
+//private static String DB_DRIVER = com.mysql.jdbc.Driver;
/** mm MySQL Driver setup */
-private static String DB_CONNECTION = jdbc:mysql:// + DB_HOST + / +
DB_NAME + ?user= + DB_USER + password= + DB_PASS;
+private static String DB_CONNECTION = jdbc:mysql:// + DB_HOST + /
++ DB_NAME + ?user= + DB_USER + password= + DB_PASS;
/** used for debugging */
private static boolean debugging = true;
@@ -110,9 +127,6 @@
private static int num = 1;
/** used for debugging */
-private static int testCount = 1;
-
-/** used for debugging */
private static int TDS = 1;
/** used for debugging */
@@ -124,391 +138,415 @@
/** used for debugging */
private static int FAILED = 2;
+/** The number of times to hit the schema to try and reach
svn commit: r619244 - /db/torque/village/trunk/xdocs/changes.xml
Author: seade Date: Wed Feb 6 18:54:00 2008 New Revision: 619244 URL: http://svn.apache.org/viewvc?rev=619244view=rev Log: Added missing date. Modified: db/torque/village/trunk/xdocs/changes.xml Modified: db/torque/village/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/db/torque/village/trunk/xdocs/changes.xml?rev=619244r1=619243r2=619244view=diff == --- db/torque/village/trunk/xdocs/changes.xml (original) +++ db/torque/village/trunk/xdocs/changes.xml Wed Feb 6 18:54:00 2008 @@ -29,7 +29,7 @@ Refactored unit tests to use JUnit. Added test case for TORQUE-8. /action /release - release version=3.3-RC3 date=in SVN + release version=3.3-RC3 date=2008-01-11 action type=update dev=tv Integration into Torque /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r619257 - /db/torque/test/trunk/profile/mysql/project.xml
Author: seade Date: Wed Feb 6 20:21:16 2008 New Revision: 619257 URL: http://svn.apache.org/viewvc?rev=619257view=rev Log: Use a connector that is not broken. Modified: db/torque/test/trunk/profile/mysql/project.xml Modified: db/torque/test/trunk/profile/mysql/project.xml URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/mysql/project.xml?rev=619257r1=619256r2=619257view=diff == --- db/torque/test/trunk/profile/mysql/project.xml (original) +++ db/torque/test/trunk/profile/mysql/project.xml Wed Feb 6 20:21:16 2008 @@ -26,7 +26,7 @@ dependency artifactIdmysql-connector-java/artifactId groupIdmysql/groupId - version5.0.4/version + version5.0.5/version /dependency /dependencies /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r618896 - in /db/torque: runtime/trunk/pom.xml runtime/trunk/project.xml test/trunk/test-project/pom.xml
Author: seade
Date: Tue Feb 5 21:08:39 2008
New Revision: 618896
URL: http://svn.apache.org/viewvc?rev=618896view=rev
Log:
Use the most recent release of some test resources.
Modified:
db/torque/runtime/trunk/pom.xml
db/torque/runtime/trunk/project.xml
db/torque/test/trunk/test-project/pom.xml
Modified: db/torque/runtime/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/pom.xml?rev=618896r1=618895r2=618896view=diff
==
--- db/torque/runtime/trunk/pom.xml (original)
+++ db/torque/runtime/trunk/pom.xml Tue Feb 5 21:08:39 2008
@@ -116,12 +116,12 @@
version1.2.1/version
/dependency--
-dependency
- groupIdorg.apache.torque/groupId
- artifactIdvillage/artifactId
- version${project.version}/version
- typejar/type
-/dependency
+dependency
+ groupIdorg.apache.torque/groupId
+ artifactIdvillage/artifactId
+ version${project.version}/version
+ typejar/type
+/dependency
dependency
groupIdxerces/groupId
@@ -158,14 +158,14 @@
dependency
groupIdfulcrum/groupId
artifactIdfulcrum-testcontainer/artifactId
- version1.0.4/version
+ version1.0.5/version
scopetest/scope
/dependency
dependency
groupIdfulcrum/groupId
artifactIdfulcrum-yaafi/artifactId
- version1.0.3/version
+ version1.0.5/version
scopetest/scope
/dependency
Modified: db/torque/runtime/trunk/project.xml
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/project.xml?rev=618896r1=618895r2=618896view=diff
==
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Tue Feb 5 21:08:39 2008
@@ -8,7 +8,7 @@
License); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
@@ -17,122 +17,135 @@
specific language governing permissions and limitations
under the License.
--
+
project
-extendcommon/project.xml/extend
-pomVersion3/pomVersion
+ extendcommon/project.xml/extend
+ pomVersion3/pomVersion
artifactIdtorque/artifactId
groupIdtorque/groupId
-idtorque/id
-nameTorque/name
-descriptionTorque is a persistence layer./description
-shortDescriptionPersistence Layer/shortDescription
-urlhttp://db.apache.org/torque/releases/torque-3.3/runtime//url
-
siteDirectory/www/db.apache.org/torque/releases/torque-3.3/runtime//siteDirectory
-repository
-
connectionscm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk/developerConnection
-urlhttp://svn.apache.org/viewvc/url
-/repository
-dependencies
-dependency
-groupIdavalon-framework/groupId
-artifactIdavalon-framework-api/artifactId
-version4.3/version
-typejar/type
-urlhttp://avalon.apache.org//url
-properties
-dist.bundletrue/dist.bundle
-/properties
-/dependency
-dependency
-groupIdavalon-logkit/groupId
-artifactIdavalon-logkit/artifactId
-version2.1/version
-typejar/type
-properties
-dist.bundletrue/dist.bundle
-/properties
-/dependency
-dependency
-groupIdcommons-beanutils/groupId
-artifactIdcommons-beanutils-core/artifactId
-version1.7.0/version
+ idtorque/id
+ nameTorque/name
+
+ descriptionTorque is a persistence layer./description
+ shortDescriptionPersistence Layer/shortDescription
+ urlhttp://db.apache.org/torque/releases/torque-3.3/runtime//url
+
siteDirectory/www/db.apache.org/torque/releases/torque-3.3/runtime//siteDirectory
+
+ repository
+
connectionscm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk/developerConnection
+urlhttp://svn.apache.org/viewvc/url
+ /repository
+
+ dependencies
+dependency
+ groupIdavalon-framework/groupId
+ artifactIdavalon-framework-api/artifactId
+ version4.3/version
+typejar/type
+ urlhttp://avalon.apache.org//url
+ properties
+dist.bundletrue/dist.bundle
+ /properties
+/dependency
+
+dependency
+groupIdavalon-logkit/groupId
+artifactIdavalon-logkit/artifactId
+version2.1/version
+typejar/type
+properties
+ dist.bundletrue
svn commit: r618901 - /db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
Author: seade
Date: Tue Feb 5 21:17:24 2008
New Revision: 618901
URL: http://svn.apache.org/viewvc?rev=618901view=rev
Log:
Update SqlExpressionTest to work with Java 1.6.
Fixes TORQUE-109. Thanks to Brendan Miller for the patch.
Modified:
db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
Modified:
db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
URL:
http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java?rev=618901r1=618900r2=618901view=diff
==
---
db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
(original)
+++
db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
Tue Feb 5 21:17:24 2008
@@ -89,9 +89,14 @@
String[] values = new String[] { 42, 43, 44 };
String result = SqlExpression.buildIn(COL, values, SqlEnum.IN,
true, db);
-// It seems the order of the values is different for jdk1.3 vs 1.4
+// It seems the order of the values is different for jdk1.3 vs 1.4,
etc.
// In any case, the order is not significant.
-if (result.equals(COL IN ('42','43','44')))
+if (result.equals(COL IN ('43','42','44')))
+{
+// jdk 1.6
+assertEquals(result, COL IN ('43','42','44'));
+}
+else if (result.equals(COL IN ('42','43','44')))
{
// jdk 1.4
assertEquals(result, COL IN ('42','43','44'));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r516326 - /db/torque/templates/trunk/src/templates/om/Peer.vm
Author: seade
Date: Fri Mar 9 00:09:12 2007
New Revision: 516326
URL: http://svn.apache.org/viewvc?view=revrev=516326
Log:
Corrected spelling mistake in comment only.
Modified:
db/torque/templates/trunk/src/templates/om/Peer.vm
Modified: db/torque/templates/trunk/src/templates/om/Peer.vm
URL:
http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/Peer.vm?view=diffrev=516326r1=516325r2=516326
==
--- db/torque/templates/trunk/src/templates/om/Peer.vm (original)
+++ db/torque/templates/trunk/src/templates/om/Peer.vm Fri Mar 9 00:09:12 2007
@@ -174,7 +174,7 @@
+ and give as many details as possible (including the error
+ stack trace)., t);
-// Error objects should always be propogated.
+// Error objects should always be propagated.
if (t instanceof Error)
{
throw (Error) t.fillInStackTrace();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r432587 - /db/torque/generator/trunk/xdocs/properties-reference.xml
Author: seade Date: Fri Aug 18 07:06:54 2006 New Revision: 432587 URL: http://svn.apache.org/viewvc?rev=432587view=rev Log: It seems that objectIsCaching was merged into the Manager code back in 3.2 - i.e. objectIsCaching can now be used in conjunction with useManagers. Modified: db/torque/generator/trunk/xdocs/properties-reference.xml Modified: db/torque/generator/trunk/xdocs/properties-reference.xml URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/xdocs/properties-reference.xml?rev=432587r1=432586r2=432587view=diff == --- db/torque/generator/trunk/xdocs/properties-reference.xml (original) +++ db/torque/generator/trunk/xdocs/properties-reference.xml Fri Aug 18 07:06:54 2006 @@ -1,6 +1,6 @@ ?xml version=1.0? !-- - Copyright 2001-2005 The Apache Software Foundation. + Copyright 2001-2006 The Apache Software Foundation. Licensed under the Apache License, Version 2.0 (the License) you may not use this file except in compliance with the License. @@ -356,8 +356,7 @@ td If true, Torque generates data objects that cache their foreign key relationships. If this is not desired (because the underlying objects -can be manipulated from other code), set this property to false. This currently -cannot combined with the manager setting from above. +can be manipulated from other code), set this property to false. /td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r389504 - /db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java
Author: seade Date: Tue Mar 28 06:05:26 2006 New Revision: 389504 URL: http://svn.apache.org/viewcvs?rev=389504view=rev Log: Use BigDecimal(double) constructor so as to help code compiled under JDK 1.5 execute correctly under earlier JDKs. Related Eclipse bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=121325 Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java?rev=389504r1=389503r2=389504view=diff == --- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java (original) +++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java Tue Mar 28 06:05:26 2006 @@ -1,7 +1,7 @@ package org.apache.torque.engine.database.model; /* - * Copyright 2001-2005 The Apache Software Foundation. + * Copyright 2001-2006 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License) * you may not use this file except in compliance with the License. @@ -89,8 +89,8 @@ public static final String VARCHAR_OBJECT_TYPE = \\; public static final String LONGVARCHAR_OBJECT_TYPE = \\; public static final String CLOB_OBJECT_TYPE = \\; -public static final String NUMERIC_OBJECT_TYPE = new BigDecimal(0); -public static final String DECIMAL_OBJECT_TYPE = new BigDecimal(0); +public static final String NUMERIC_OBJECT_TYPE = new BigDecimal((double) 0); +public static final String DECIMAL_OBJECT_TYPE = new BigDecimal((double) 0); public static final String BIT_OBJECT_TYPE = new Boolean(true); public static final String TINYINT_OBJECT_TYPE = new Byte((byte)0); public static final String SMALLINT_OBJECT_TYPE = new Short((short)0); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r389505 - /db/torque/site/trunk/xdocs/changes.xml
Author: seade Date: Tue Mar 28 06:06:07 2006 New Revision: 389505 URL: http://svn.apache.org/viewcvs?rev=389505view=rev Log: Use BigDecimal(double) constructor so as to help code compiled under JDK 1.5 execute correctly under earlier JDKs. Related Eclipse bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=121325 Modified: db/torque/site/trunk/xdocs/changes.xml Modified: db/torque/site/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/db/torque/site/trunk/xdocs/changes.xml?rev=389505r1=389504r2=389505view=diff == --- db/torque/site/trunk/xdocs/changes.xml (original) +++ db/torque/site/trunk/xdocs/changes.xml Tue Mar 28 06:06:07 2006 @@ -29,6 +29,12 @@ release version=3.2.1-dev date=in SVN +action type=fix dev=seade + Use BigDecimal(double) constructor so as to help code compiled under + JDK 1.5 execute correctly under earlier JDKs + (a href=https://bugs.eclipse.org/bugs/show_bug.cgi?id=121325; + Related Eclipse bug/a). +/action action type=update dev=tv Update to the Avalon components of Torque. The component now understands Merlin- and YAAFI-type context entries and provides again all methods from - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r280339 - in /db/torque: runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java test/trunk/test-project/src/java/org/apache/torque/util/LargeSelectTest.java
Author: seade Date: Mon Sep 12 06:43:59 2005 New Revision: 280339 URL: http://svn.apache.org/viewcvs?rev=280339view=rev Log: Closer to an actual Serializable LargeSelect. Serialization of Criteria needs to be addressed before this can progress any further. Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java db/torque/test/trunk/test-project/src/java/org/apache/torque/util/LargeSelectTest.java Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java?rev=280339r1=280338r2=280339view=diff == --- db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java (original) +++ db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java Mon Sep 12 06:43:59 2005 @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Set; +import java.io.IOException; +import java.io.ObjectInputStream; import java.io.Serializable; import java.lang.reflect.Method; @@ -111,16 +113,15 @@ * pIn your template you will then use something along the lines of: * * pre - *#set ($largeSelect = $data.User.getTemp(someName)) - *#set ($searchop = $data.Parameters.getString(searchop)) - *#if ($searchop.equals(prev)) - * #set ($recs = $largeSelect.PreviousResults) + *#set($largeSelect = $data.User.getTemp(someName)) + *#set($searchop = $data.Parameters.getString(searchop)) + *#if($searchop.equals(prev)) + * #set($recs = $largeSelect.PreviousResults) *#else - * #if ($searchop.equals(goto)) - *#set ($recs - *= $largeSelect.getPage($data.Parameters.getInt(page, 1))) + * #if($searchop.equals(goto)) + *#set($recs = $largeSelect.getPage($data.Parameters.getInt(page, 1))) * #else - *#set ($recs = $largeSelect.NextResults) + *#set($recs = $largeSelect.NextResults) * #end *#end * /pre @@ -141,9 +142,9 @@ private int memoryLimit; /** The record number of the first record in memory. */ -private int blockBegin = 0; +private transient int blockBegin = 0; /** The record number of the last record in memory. */ -private int blockEnd; +private transient int blockEnd; /** How much of the memory block is currently occupied with result data. */ private volatile int currentlyFilledTo = -1; @@ -151,31 +152,29 @@ private String query; /** The database name to get from Torque. */ private String dbName; -/** Used to retrieve query results from Village. */ -private QueryDataSet qds = null; /** The memory store of records. */ -private List results = null; +private transient List results = null; /** The thread that executes the query. */ -private Thread thread = null; +private transient Thread thread = null; /** * A flag used to kill the thread when the currently executing query is no * longer required. */ -private volatile boolean killThread = false; +private transient volatile boolean killThread = false; /** A flag that indicates whether or not the query thread is running. */ -private volatile boolean threadRunning = false; +private transient volatile boolean threadRunning = false; /** * An indication of whether or not the current query has completed * processing. */ -private volatile boolean queryCompleted = false; +private transient volatile boolean queryCompleted = false; /** * An indication of whether or not the totals (records and pages) are at * their final values. */ -private boolean totalsFinalized = false; +private transient boolean totalsFinalized = false; /** The cursor position in the result set. */ private int position; @@ -183,13 +182,11 @@ private int totalPages = -1; /** The total number of records known to exist. */ private int totalRecords = 0; -/** The number of the page that was last retrieved. */ -private int currentPageNumber = 0; /** The criteria used for the query. */ private Criteria criteria = null; /** The last page of results that were returned. */ -private List lastResults; +private transient List lastResults; /** * The class that is possibly used to construct the criteria and used @@ -200,24 +197,31 @@ * A reference to the method in the return builder class that will * convert the Village Records to the desired class. */ -private Method populateObjectsMethod = null; +private transient Method populateObjectsMethod = null; /** * The default value (gt;) used to indicate that the total number of - * records or pages is unknown. You can use codesetMoreIndicator()/code - * to change
svn commit: r279725 - in /db/torque/test/trunk/profile/postgresql: ./ Torque.properties project.properties project.xml
Author: seade Date: Fri Sep 9 00:39:04 2005 New Revision: 279725 URL: http://svn.apache.org/viewcvs?rev=279725view=rev Log: Test profile for PostgreSQL. Added: db/torque/test/trunk/profile/postgresql/ - copied from r279689, db/torque/test/trunk/profile/mysql/ Modified: db/torque/test/trunk/profile/postgresql/Torque.properties db/torque/test/trunk/profile/postgresql/project.properties db/torque/test/trunk/profile/postgresql/project.xml Modified: db/torque/test/trunk/profile/postgresql/Torque.properties URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/profile/postgresql/Torque.properties?rev=279725r1=279689r2=279725view=diff == --- db/torque/test/trunk/profile/postgresql/Torque.properties (original) +++ db/torque/test/trunk/profile/postgresql/Torque.properties Fri Sep 9 00:39:04 2005 @@ -1,9 +1,9 @@ torque.database.default = bookstore -torque.database.bookstore.adapter = mysql +torque.database.bookstore.adapter = postgresql #Using commons-dbcp torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory -torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver -torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore -torque.dsfactory.bookstore.connection.user = root -torque.dsfactory.bookstore.connection.password = +torque.dsfactory.bookstore.connection.driver = org.postgresql.Driver +torque.dsfactory.bookstore.connection.url = jdbc:postgresql://localhost:5432/bookstore +torque.dsfactory.bookstore.connection.user = torque +torque.dsfactory.bookstore.connection.password = torque Modified: db/torque/test/trunk/profile/postgresql/project.properties URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/profile/postgresql/project.properties?rev=279725r1=279689r2=279725view=diff == --- db/torque/test/trunk/profile/postgresql/project.properties (original) +++ db/torque/test/trunk/profile/postgresql/project.properties Fri Sep 9 00:39:04 2005 @@ -2,16 +2,16 @@ torque.test.base.idMethod = idbroker #settings that will go straight through to the generator -torque.database.createUrl = jdbc:mysql://localhost:3306/mysql -torque.database.buildUrl = jdbc:mysql://localhost:3306/bookstore +torque.database.createUrl = jdbc:postgresql://localhost:5432/template1 +torque.database.buildUrl = jdbc:postgresql://localhost:5432/bookstore torque.generateBeans = true #settings for both generator and runtime -torque.database = mysql -torque.database.driver = org.gjt.mm.mysql.Driver -torque.database.user = root -torque.database.password = +torque.database = postgresql +torque.database.driver = org.postgresql.Driver +torque.database.user = torque +torque.database.password = torque #settings for runtime -torque.database.url = jdbc:mysql://localhost:3306/bookstore +torque.database.url = jdbc:postgresql://localhost:5432/bookstore torque.database.validationQuery = SELECT 1 Modified: db/torque/test/trunk/profile/postgresql/project.xml URL: http://svn.apache.org/viewcvs/db/torque/test/trunk/profile/postgresql/project.xml?rev=279725r1=279689r2=279725view=diff == --- db/torque/test/trunk/profile/postgresql/project.xml (original) +++ db/torque/test/trunk/profile/postgresql/project.xml Fri Sep 9 00:39:04 2005 @@ -1,14 +1,16 @@ ?xml version=1.0 encoding=UTF-8? project extend../base/project.xml/extend - artifactIdtorque-mysql-test/artifactId - nameTorque-mysql-test/name + artifactIdtorque-postgresql-test/artifactId + nameTorque-postgresql-test/name dependencies dependency - artifactIdmysql-connector-java/artifactId - groupIdmysql/groupId - version3.1.6-bin/version -/dependency + groupIdpostgresql/groupId + artifactIdpostgresql/artifactId + version7.4-jdbc3/version + jarpg74.215.jdbc3.jar/jar + urlhttp://www.postgresql.org//url +/dependency /dependencies /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs/tutorial index.xml
seade 2005/01/30 03:26:10 Modified:.Tag: TORQUE_3_1_BRANCH project-base.xml xdocs/tutorial Tag: TORQUE_3_1_BRANCH index.xml Log: Mail archives are changing server. Revision ChangesPath No revision No revision 1.9.2.17 +2 -2 db-torque/project-base.xml Index: project-base.xml === RCS file: /home/cvs/db-torque/project-base.xml,v retrieving revision 1.9.2.16 retrieving revision 1.9.2.17 diff -u -r1.9.2.16 -r1.9.2.17 --- project-base.xml 29 Dec 2004 10:32:05 - 1.9.2.16 +++ project-base.xml 30 Jan 2005 11:26:10 - 1.9.2.17 @@ -54,13 +54,13 @@ nameTorque User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameTorque Developer List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists No revision No revision 1.3.2.3 +1 -1 db-torque/xdocs/tutorial/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/index.xml,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- index.xml 19 Aug 2004 14:33:48 - 1.3.2.2 +++ index.xml 30 Jan 2005 11:26:10 - 1.3.2.3 @@ -36,7 +36,7 @@ email sent to the a href=../mail-lists.html turbine-user/a mailing list by Steven F. Davis called - a href=http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5287 + a href=http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5287 torque outside turbine - detailed example (long)/a. It has subsequently been updated for Turbine 3.1 which separates the a href=../generator/generator/a from - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque project-base.xml
seade 2005/01/30 03:29:24 Modified:xdocs/tutorial index.xml .project-base.xml Log: Mail archives are changing server. Revision ChangesPath 1.6 +1 -1 db-torque/xdocs/tutorial/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 19 Aug 2004 14:34:14 - 1.5 +++ index.xml 30 Jan 2005 11:29:24 - 1.6 @@ -36,7 +36,7 @@ email sent to the a href=../mail-lists.html turbine-user/a mailing list by Steven F. Davis called - a href=http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5287 + a href=http://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]amp;msgNo=5287 torque outside turbine - detailed example (long)/a. It has subsequently been updated for Turbine 3.1 which separates the a href=../generator/generator/a from 1.12 +2 -2 db-torque/project-base.xml Index: project-base.xml === RCS file: /home/cvs/db-torque/project-base.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project-base.xml 6 Dec 2004 15:26:47 - 1.11 +++ project-base.xml 30 Jan 2005 11:29:24 - 1.12 @@ -54,13 +54,13 @@ nameTorque User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameTorque Developer List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator project.xml
seade 2004/10/29 04:52:52 Modified:src/maven-plugin Tag: TORQUE_3_1_BRANCH project.xml .Tag: TORQUE_3_1_BRANCH project-base.xml project.xml xdocsTag: TORQUE_3_1_BRANCH navigation.xml src/generator Tag: TORQUE_3_1_BRANCH project.xml Log: 3.1.x will be the default for the torque site for now, later we will create a torque-site module. Revision ChangesPath No revision No revision 1.12.2.16 +2 -2 db-torque/src/maven-plugin/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v retrieving revision 1.12.2.15 retrieving revision 1.12.2.16 diff -u -r1.12.2.15 -r1.12.2.16 --- project.xml 26 Oct 2004 11:55:19 - 1.12.2.15 +++ project.xml 29 Oct 2004 11:52:51 - 1.12.2.16 @@ -26,8 +26,8 @@ descriptionMaven Plugin for Torque/description shortDescriptionMaven Plugin for Torque/shortDescription - urlhttp://db.apache.org/torque-31/maven-plugin//url - siteDirectory/www/db.apache.org/torque-31/maven-plugin/siteDirectory + urlhttp://db.apache.org/torque/maven-plugin//url + siteDirectory/www/db.apache.org/torque/maven-plugin/siteDirectory dependencies dependency No revision No revision 1.9.2.11 +1 -1 db-torque/project-base.xml Index: project-base.xml === RCS file: /home/cvs/db-torque/project-base.xml,v retrieving revision 1.9.2.10 retrieving revision 1.9.2.11 diff -u -r1.9.2.10 -r1.9.2.11 --- project-base.xml 27 Oct 2004 14:23:38 - 1.9.2.10 +++ project-base.xml 29 Oct 2004 11:52:51 - 1.9.2.11 @@ -39,7 +39,7 @@ urlhttp://db.apache.org/torque//url issueTrackingUrlhttp://issues.apache.org/scarab/issues/issueTrackingUrl siteAddressdb.apache.org/siteAddress - siteDirectory/www/db.apache.org/torque-31//siteDirectory + siteDirectory/www/db.apache.org/torque//siteDirectory distributionSitewww.apache.org/distributionSite distributionDirectory/www/www.apache.org/dist/java-repository/distributionDirectory 1.103.2.20 +1 -1 db-torque/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.103.2.19 retrieving revision 1.103.2.20 diff -u -r1.103.2.19 -r1.103.2.20 --- project.xml 16 Oct 2004 12:19:36 - 1.103.2.19 +++ project.xml 29 Oct 2004 11:52:51 - 1.103.2.20 @@ -26,7 +26,7 @@ descriptionTorque is a persistence layer./description shortDescriptionPersistence Layer/shortDescription urlhttp://db.apache.org/torque//url - siteDirectory/www/db.apache.org/torque-31//siteDirectory + siteDirectory/www/db.apache.org/torque//siteDirectory repository connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:db-torque/connection No revision No revision 1.11.2.12 +1 -0 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.11.2.11 retrieving revision 1.11.2.12 diff -u -r1.11.2.11 -r1.11.2.12 --- navigation.xml27 Oct 2004 10:16:06 - 1.11.2.11 +++ navigation.xml29 Oct 2004 11:52:51 - 1.11.2.12 @@ -14,6 +14,7 @@ item name=Overview href=/index.html/ item name=News and Status href=/status.html/ item name=Downloads href=/download.html/ + item name=Torque 3.2.x docs href=http://db.apache.org/torque-32// item name=Torque Wiki href=http://wiki.apache.org/db-torque// /menu menu name=Guides No revision No revision 1.13.2.6 +1 -1 db-torque/src/generator/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/src/generator/project.xml,v retrieving revision 1.13.2.5 retrieving revision 1.13.2.6 diff -u -r1.13.2.5 -r1.13.2.6 --- project.xml 16 Oct 2004 12:13:01 - 1.13.2.5 +++ project.xml 29 Oct 2004 11:52:52 - 1.13.2.6 @@ -30,7 +30,7 @@ descriptionGenerator for Torque./description shortDescriptionGenerator for Torque/shortDescription urlhttp://db.apache.org/torque/generator/url - siteDirectory/www/db.apache.org/torque-31/generator/siteDirectory + siteDirectory/www/db.apache.org/torque/generator/siteDirectory dependencies dependency
cvs commit: db-torque/xdocs changes.xml
seade 2004/10/19 16:20:12 Modified:src/generator/src/templates/om Tag: TORQUE_3_1_BRANCH ObjectWithManager.vm Object.vm xdocsTag: TORQUE_3_1_BRANCH changes.xml Log: TRQS235 Generated code contains Javadoc error sentence is different Revision ChangesPath No revision No revision 1.5.2.3 +1 -1 db-torque/src/generator/src/templates/om/ObjectWithManager.vm Index: ObjectWithManager.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- ObjectWithManager.vm 26 Aug 2004 05:16:02 - 1.5.2.2 +++ ObjectWithManager.vm 19 Oct 2004 23:20:11 - 1.5.2.3 @@ -339,7 +339,7 @@ /** * Provides convenient way to set a relationship based on a - * ObjectKey. e.g. + * ObjectKey, for example * codebar.setFooKey(foo.getPrimaryKey())/code * #if ($fk.LocalColumns.size() 1) 1.7.2.5 +1 -1 db-torque/src/generator/src/templates/om/Object.vm Index: Object.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -r1.7.2.4 -r1.7.2.5 --- Object.vm 26 Aug 2004 05:16:02 - 1.7.2.4 +++ Object.vm 19 Oct 2004 23:20:11 - 1.7.2.5 @@ -353,7 +353,7 @@ /** * Provides convenient way to set a relationship based on a - * ObjectKey. e.g. + * ObjectKey, for example * codebar.setFooKey(foo.getPrimaryKey())/code * #if ($fk.LocalColumns.size() 1) No revision No revision 1.140.2.6 +3 -0 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.140.2.5 retrieving revision 1.140.2.6 diff -u -r1.140.2.5 -r1.140.2.6 --- changes.xml 16 Oct 2004 12:59:53 - 1.140.2.5 +++ changes.xml 19 Oct 2004 23:20:11 - 1.140.2.6 @@ -30,6 +30,9 @@ Change PostgreSQL ID generation to use codeselect nextval/code instead of codeselect currval/code. /action +action type=update dev=seade + TRQS235 Generated code contains Javadoc error sentence is different +/action /release release version=3.1.1-RC3 date=2004-10-16 action type=update dev=henning - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/10/19 18:26:18
Modified:src/generator/src/templates/om Tag: TORQUE_3_1_BRANCH
ObjectWithManager.vm Peer.vm Object.vm
BaseManager.vm
xdocsTag: TORQUE_3_1_BRANCH changes.xml
Log:
TRQS236 Generated code contains Javadoc error @param tags incorrect.
Revision ChangesPath
No revision
No revision
1.5.2.4 +3 -3 db-torque/src/generator/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- ObjectWithManager.vm 19 Oct 2004 23:20:11 - 1.5.2.3
+++ ObjectWithManager.vm 20 Oct 2004 01:26:18 - 1.5.2.4
@@ -263,7 +263,7 @@
/**
* Declares an association between this object and a $interfaceName object
*
- * @param $interfaceName v
+ * @param v $interfaceName
* @throws TorqueException
*/
public void set${pVarName}($interfaceName v) throws TorqueException
@@ -1194,7 +1194,7 @@
/**
* Set the PrimaryKey using ObjectKey.
*
- * @param ObjectKey $clo
+ * @param $clo ObjectKey
*/
public void setPrimaryKey(ObjectKey $clo)
$throwsClause {
@@ -1333,7 +1333,7 @@
#foreach ($col in $table.PrimaryKey)
#set ( $clo=$col.UncapitalisedJavaName )
#set ( $cjtype= $col.JavaNative )
- * @param $cjtype $clo
+ * @param $clo $cjtype
#end
*/
public void setPrimaryKey($argList)
1.5.2.10 +2 -1 db-torque/src/generator/src/templates/om/Peer.vm
Index: Peer.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -r1.5.2.9 -r1.5.2.10
--- Peer.vm 10 Sep 2004 09:36:39 - 1.5.2.9
+++ Peer.vm 20 Oct 2004 01:26:18 - 1.5.2.10
@@ -421,6 +421,7 @@
* Grabs the raw Village records to be formed into objects.
* This method should be used for transactions
*
+ * @param criteria object used to create the SELECT statement.
* @param con the connection to use
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
@@ -1121,7 +1122,7 @@
#set ( $cjtype= $col.JavaNative )
* @param $clo $cjtype
#end
- * @param Connection con
+ * @param con Connection
*/
public static $table.JavaName ${retrieveMethod}(
#foreach ($col in $table.PrimaryKey)
1.7.2.6 +2 -2 db-torque/src/generator/src/templates/om/Object.vm
Index: Object.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- Object.vm 19 Oct 2004 23:20:11 - 1.7.2.5
+++ Object.vm 20 Oct 2004 01:26:18 - 1.7.2.6
@@ -1219,7 +1219,7 @@
/**
* Set the PrimaryKey using ObjectKey.
*
- * @param $clo ObjectKey
+ * @param key $clo ObjectKey
*/
public void setPrimaryKey(ObjectKey key)
$throwsClause
@@ -1359,7 +1359,7 @@
#foreach ($col in $table.PrimaryKey)
#set ( $clo=$col.UncapitalisedJavaName )
#set ( $cjtype= $col.JavaNative )
- * @param $cjtype $clo
+ * @param $clo $cjtype
#end
*/
public void setPrimaryKey($argList)
1.3.2.1 +8 -2 db-torque/src/generator/src/templates/om/BaseManager.vm
Index: BaseManager.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/BaseManager.vm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- BaseManager.vm7 Aug 2003 13:13:00 - 1.3
+++ BaseManager.vm20 Oct 2004 01:26:18 - 1.3.2.1
@@ -86,6 +86,8 @@
* Static accessor for the @see #getInstanceImpl(ObjectKey, boolean).
*
* @param id an codeObjectKey/code value
+ * @param fromCache if true, look for cached ${interfaceName}s before loading
+ * from storage.
* @return a code${interfaceName}/code value
* @exception TorqueException if an error occurs
*/
@@ -115,6 +117,8 @@
* Static accessor for the @see #getInstanceImpl(ObjectKey).
*
* @param id an codeObjectKey/code value
+ * @param fromCache if true, look for cached ${interfaceName}s before loading
cvs commit: db-torque/xdocs changes.xml
seade 2004/10/19 18:28:18
Modified:src/generator/src/templates/om Object.vm Peer.vm
BaseManager.vm ObjectWithManager.vm
xdocschanges.xml
Log:
TRQS236 Generated code contains Javadoc error @param tags incorrect.
Revision ChangesPath
1.17 +1 -1 db-torque/src/generator/src/templates/om/Object.vm
Index: Object.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Object.vm 19 Oct 2004 23:24:37 - 1.16
+++ Object.vm 20 Oct 2004 01:28:18 - 1.17
@@ -1359,7 +1359,7 @@
#foreach ($col in $table.PrimaryKey)
#set ( $clo=$col.UncapitalisedJavaName )
#set ( $cjtype= $col.JavaNative )
- * @param $cjtype $clo
+ * @param $clo $cjtype
#end
*/
public void setPrimaryKey($argList)
1.12 +2 -1 db-torque/src/generator/src/templates/om/Peer.vm
Index: Peer.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Peer.vm 7 Sep 2004 12:24:33 - 1.11
+++ Peer.vm 20 Oct 2004 01:28:18 - 1.12
@@ -421,6 +421,7 @@
* Grabs the raw Village records to be formed into objects.
* This method should be used for transactions
*
+ * @param criteria object used to create the SELECT statement.
* @param con the connection to use
* @throws TorqueException Any exceptions caught during processing will be
* rethrown wrapped into a TorqueException.
@@ -1105,7 +1106,7 @@
#set ( $cjtype= $col.JavaNative )
* @param $clo $cjtype
#end
- * @param Connection con
+ * @param con Connection
*/
public static $table.JavaName ${retrieveMethod}(
#foreach ($col in $table.PrimaryKey)
1.4 +8 -2 db-torque/src/generator/src/templates/om/BaseManager.vm
Index: BaseManager.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/BaseManager.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseManager.vm7 Aug 2003 13:13:00 - 1.3
+++ BaseManager.vm20 Oct 2004 01:28:18 - 1.4
@@ -86,6 +86,8 @@
* Static accessor for the @see #getInstanceImpl(ObjectKey, boolean).
*
* @param id an codeObjectKey/code value
+ * @param fromCache if true, look for cached ${interfaceName}s before loading
+ * from storage.
* @return a code${interfaceName}/code value
* @exception TorqueException if an error occurs
*/
@@ -115,6 +117,8 @@
* Static accessor for the @see #getInstanceImpl(ObjectKey).
*
* @param id an codeObjectKey/code value
+ * @param fromCache if true, look for cached ${interfaceName}s before loading
+ * from storage.
* @return a code${interfaceName}/code value
* @exception TorqueException if an error occurs
*/
@@ -142,6 +146,8 @@
* Static accessor for the @see #getInstancesImpl(List, boolean).
*
* @param ids a codeList/code value
+ * @param fromCache if true, look for cached ${interfaceName}s before loading
+ * from storage.
* @return a codeList/code value
* @exception TorqueException if an error occurs
*/
@@ -287,7 +293,7 @@
/**
* Gets a list of ModuleEntities based on id's.
*
- * @param moduleIds a codeNumberKey[]/code value
+ * @param ids a codeNumberKey[]/code value
* @return a codeList/code value
* @exception TorqueException if an error occurs
*/
1.12 +2 -2 db-torque/src/generator/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ObjectWithManager.vm 19 Oct 2004 23:24:37 - 1.11
+++ ObjectWithManager.vm 20 Oct 2004 01:28:18 - 1.12
@@ -263,7 +263,7 @@
/**
* Declares an association between this object and a $interfaceName object
*
- * @param $interfaceName v
+ * @param v $interfaceName
* @throws TorqueException
*/
public void set${pVarName}($interfaceName v) throws TorqueException
@@ -1335,7 +1335,7 @@
#foreach ($col in $table.PrimaryKey)
#set ( $clo=$col.UncapitalisedJavaName )
#set ( $cjtype= $col.JavaNative
cvs commit: db-torque/src/generator/xdocs properties-reference.xml
seade 2004/10/16 02:59:02 Modified:src/generator/xdocs Tag: TORQUE_3_1_BRANCH properties-reference.xml Log: Documented runOnlyOnSchemaChange. Revision ChangesPath No revision No revision 1.4.2.4 +8 -1 db-torque/src/generator/xdocs/properties-reference.xml Index: properties-reference.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- properties-reference.xml 4 Sep 2004 13:29:19 - 1.4.2.3 +++ properties-reference.xml 16 Oct 2004 09:59:02 - 1.4.2.4 @@ -55,7 +55,14 @@ something like codecom.company.project.om/code. /td /tr - +tr + tdcode torque.runOnlyOnSchemaChange /code/td + tdcode true /code/td + td +When codetrue/code the codeom/code goal will only be executed +when the schema has actually been updated. + /td +/tr tr td colspan=3strong Directories and Paths /strong/td - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/conf default.properties
seade 2004/10/16 03:08:31
Modified:src/generator/src/conf Tag: TORQUE_3_1_BRANCH
default.properties
Log:
Correct the default value for runOnlyOnSchemaChange.
Revision ChangesPath
No revision
No revision
1.3.2.4 +2 -2 db-torque/src/generator/src/conf/default.properties
Index: default.properties
===
RCS file: /home/cvs/db-torque/src/generator/src/conf/default.properties,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- default.properties25 Aug 2004 01:06:00 - 1.3.2.3
+++ default.properties16 Oct 2004 10:08:31 - 1.3.2.4
@@ -49,7 +49,7 @@
torque.project = ${project}
torque.database = ${database}
torque.targetPackage = ${targetPackage}
-torque.runOnlyOnSchemaChange = false
+torque.runOnlyOnSchemaChange = true
# ---
#
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque project.xml
seade 2004/09/22 19:29:39 Modified:.Tag: TORQUE_3_1_BRANCH project.xml Log: Fix dependency urls. Revision ChangesPath No revision No revision 1.103.2.16 +10 -9 db-torque/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.103.2.15 retrieving revision 1.103.2.16 diff -u -r1.103.2.15 -r1.103.2.16 --- project.xml 14 Sep 2004 20:28:00 - 1.103.2.15 +++ project.xml 23 Sep 2004 02:29:39 - 1.103.2.16 @@ -224,37 +224,37 @@ dependency idavalon-framework/id version4.1.4/version - urlhttp://jakarta.apache.org/avalon//url + urlhttp://avalon.apache.org//url /dependency dependency idcommons-beanutils/id version1.6.1/version - urlhttp://jakarta.apache.org/commons/beanutils.html/url + urlhttp://jakarta.apache.org/commons/beanutils//url /dependency dependency idcommons-collections/id version3.0/version - urlhttp://jakarta.apache.org/commons/collections.html/url + urlhttp://jakarta.apache.org/commons/collections//url /dependency dependency idcommons-configuration/id version1.0-rc1/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/configuration//url /dependency dependency idcommons-dbcp/id version1.1/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/dbcp//url /dependency dependency idcommons-lang/id version2.0/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/lang//url /dependency dependency idcommons-logging/id version1.0.4/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/logging//url /dependency dependency idcommons-pool/id @@ -279,12 +279,12 @@ dependency idlog4j/id version1.2.8/version - urlhttp://jakarta.apache.org/log4j//url + urlhttp://logging.apache.org/log4j//url /dependency dependency idlogkit/id version1.0.1/version - urlhttp://jakarta.apache.org/avalon/logkit//url + urlhttp://avalon.apache.org/products/runtime/system/logging//url /dependency dependency idstratum/id @@ -305,6 +305,7 @@ groupIdxml-apis/groupId artifactIdxml-apis/artifactId version1.0.b2/version + urlhttp://xml.apache.org/commons//url /dependency dependency idjunit/id - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin project.xml
seade 2004/09/22 20:02:09 Modified:src/maven-plugin project.xml Log: Fix dependency urls. Revision ChangesPath 1.20 +10 -6 db-torque/src/maven-plugin/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- project.xml 26 Aug 2004 11:43:51 - 1.19 +++ project.xml 23 Sep 2004 03:02:09 - 1.20 @@ -33,27 +33,27 @@ dependency idcommons-collections/id version3.0/version - urlhttp://jakarta.apache.org/commons/collections.html/url + urlhttp://jakarta.apache.org/commons/collections//url /dependency dependency idcommons-configuration/id version1.0-rc1/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/configuration//url /dependency dependency idcommons-dbcp/id version1.1/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/dbcp//url /dependency dependency idcommons-lang/id version2.0/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/lang//url /dependency dependency idcommons-logging/id version1.0.4/version - urlhttp://jakarta.apache.org/commons//url + urlhttp://jakarta.apache.org/commons/logging//url /dependency dependency idlog4j/id @@ -64,19 +64,23 @@ groupIdtorque/groupId artifactIdtorque-gen/artifactId version3.2-dev/version + urlhttp://db.apache.org/torque/generator//url /dependency dependency idvelocity/id version1.3.1/version + urlhttp://jakarta.apache.org/velocity//url /dependency dependency - idxerces/id + idxerces:xercesImpl/id version2.4.0/version + urlhttp://xml.apache.org/xerces2-j//url /dependency dependency groupIdxml-apis/groupId artifactIdxml-apis/artifactId version1.0.b2/version + urlhttp://xml.apache.org/commons//url /dependency /dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin plugin.jelly
seade 2004/09/11 05:41:44
Modified:xdocschanges.xml
src/maven-plugin plugin.jelly
Log:
TRQS226: Remove unneeded code in Torque maven plugin. Thanks to Thierry Lach for
the patch.
Revision ChangesPath
1.139 +4 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- changes.xml 4 Sep 2004 13:33:09 - 1.138
+++ changes.xml 11 Sep 2004 12:41:44 - 1.139
@@ -10,6 +10,10 @@
release version=3.2-alpha date=in CVS
action dev='seade' type='fix'
+TRQS226: Remove unneeded code in Torque maven plugin. Thanks to
+Thierry Lach for the patch.
+ /action
+ action dev='seade' type='fix'
TRQS220: Torque maven plugin om zip goal doesn't work. Thanks to Dan
Price for the patch.
/action
1.13 +1 -8 db-torque/src/maven-plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 4 Sep 2004 13:33:09 - 1.12
+++ plugin.jelly 11 Sep 2004 12:41:44 - 1.13
@@ -62,13 +62,6 @@
path refid=maven.dependency.classpath/
/path
-!-- The default.properties file will map old properties to the new ones along
- with setting the correct defaults.
-
- Note: I have no idea why this file is not already processed by the plugin..
- --
-property
file=${maven.plugin.dir}/maven-torque-plugin-3.2-dev/plugin.properties/
-
!-- Define all of the tasks --
taskdef
name=torque-data-model
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/java/org/apache/torque/engine/database/model Column.java
seade 2004/09/11 06:56:45 Modified:xdocschanges.xml src/generator/src/java/org/apache/torque/engine/database/model Column.java Log: TRQS154: TIME should be enclosed in single quotes for SQL Loader. Thanks to Matt Finn for the patch. Revision ChangesPath 1.140 +4 -0 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- changes.xml 11 Sep 2004 12:41:44 - 1.139 +++ changes.xml 11 Sep 2004 13:56:45 - 1.140 @@ -10,6 +10,10 @@ release version=3.2-alpha date=in CVS action dev='seade' type='fix' +TRQS154: TIME should be enclosed in single quotes for SQL Loader. +Thanks to Matt Finn for the patch. + /action + action dev='seade' type='fix' TRQS226: Remove unneeded code in Torque maven plugin. Thanks to Thierry Lach for the patch. /action 1.26 +2 -1 db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Column.java Index: Column.java === RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Column.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Column.java 24 Aug 2004 01:14:22 - 1.25 +++ Column.java 11 Sep 2004 13:56:45 - 1.26 @@ -597,6 +597,7 @@ || torqueType.equals(DATE) || torqueType.equals(DATETIME) || torqueType.equals(TIMESTAMP) +|| torqueType.equals(TIME) || torqueType.equals(CHAR) || torqueType.equals(CLOB)); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/09/11 07:28:59
Modified:src/java/org/apache/torque/util Tag: TORQUE_3_1_BRANCH
BasePeer.java
xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Restored sql statement logging (DEBUG level) that was lost in RC2.
Revision ChangesPath
No revision
No revision
1.76.2.5 +9 -4 db-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.76.2.4
retrieving revision 1.76.2.5
diff -u -r1.76.2.4 -r1.76.2.5
--- BasePeer.java 26 Aug 2004 17:01:25 - 1.76.2.4
+++ BasePeer.java 11 Sep 2004 14:28:59 - 1.76.2.5
@@ -899,8 +899,7 @@
throws TorqueException
{
Query query = createQuery(criteria);
-StringBuffer stmt = new StringBuffer();
-return query.toStringBuffer(stmt).toString();
+return query.toString();
}
/**
@@ -1171,6 +1170,10 @@
}
LimitHelper.buildLimit(criteria, query);
+if (log.isDebugEnabled())
+{
+log.debug(query.toString());
+}
return query;
}
@@ -2337,7 +2340,9 @@
}
LimitHelper.buildLimit(criteria, query);
-queryString.append(query.toString());
+String sql = query.toString();
+log.debug(sql);
+queryString.append(sql);
}
/**
No revision
No revision
1.3.2.29 +3 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.28
retrieving revision 1.3.2.29
diff -u -r1.3.2.28 -r1.3.2.29
--- release-changes.xml 11 Sep 2004 13:57:33 - 1.3.2.28
+++ release-changes.xml 11 Sep 2004 14:28:59 - 1.3.2.29
@@ -38,6 +38,9 @@
p
ul
li
+ Restored sql statement logging (DEBUG level) that was lost in RC2.
+/li
+li
TRQS154: TIME should be enclosed in single quotes for SQL Loader.
Thanks to Matt Finn for the patch.
/li
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/templates/om Peer.vm
seade 2004/09/07 05:20:44
Modified:src/generator/src/templates/om Peer.vm
Log:
Typos. Thanks Henning.
Revision ChangesPath
1.10 +2 -2 db-torque/src/generator/src/templates/om/Peer.vm
Index: Peer.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Peer.vm 26 Aug 2004 05:18:38 - 1.9
+++ Peer.vm 7 Sep 2004 12:20:44 - 1.10
@@ -1226,7 +1226,7 @@
}
#elseif ($col.isBooleanChar())
// check for conversion from boolean to Y/N
-if ( c.containsKey($cup) )
+if ( criteria.containsKey($cup) )
{
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
@@ -1236,7 +1236,7 @@
}
#elseif ($col.isBit())
// check for conversion from boolean to bit (1/0)
-if (c.containsKey($cup))
+if (criteria.containsKey($cup))
{
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/09/04 06:29:19
Modified:src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.properties
src/generator/xdocs Tag: TORQUE_3_1_BRANCH
properties-reference.xml
xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Changed the default property value for torque.output.dir from maven.build.dest to
maven.build.dir.
The properties reference was updated accordingly and a few missing properties were
also documented.
Revision ChangesPath
No revision
No revision
1.3.2.6 +2 -2 db-torque/src/maven-plugin/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- plugin.properties 25 Aug 2004 01:05:59 - 1.3.2.5
+++ plugin.properties 4 Sep 2004 13:29:19 - 1.3.2.6
@@ -47,7 +47,7 @@
#
# ---
-outputDirectory = ${maven.build.dest}
+outputDirectory = ${maven.build.dir}
schemaDirectory = ${maven.src.dir}/schema
templatePath = ${maven.src.dir}/torqueTemplates
No revision
No revision
1.4.2.3 +49 -12db-torque/src/generator/xdocs/properties-reference.xml
Index: properties-reference.xml
===
RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- properties-reference.xml 19 Aug 2004 00:41:47 - 1.4.2.2
+++ properties-reference.xml 4 Sep 2004 13:29:19 - 1.4.2.3
@@ -77,7 +77,7 @@
/tr
tr
tdcode torque.output.dir /code/td
- tdcode ${torque.home}/src /code/td
+ tdcode ${torque.home}/target /code/td
td
The base directory for the output files.
/td
@@ -98,7 +98,7 @@
/tr
tr
tdcode torque.java.dir /code/td
- tdcode ${torque.output.dir}/java /code/td
+ tdcode ${maven.src.dir}/java /code/td
td
The directory to place all of the generated Java code in.
/td
@@ -119,20 +119,18 @@
/tr
tr
tdcode torque.ojb.dir /code/td
- tdcode ${torque.output.dir}/ojb /code/td
+ tdcode ${maven.src.dir}/ojb /code/td
td
The directory to place all of the generated OJB code in.
/td
/tr
-!--
-tr
- tdcode torque.omzip.dir /code/td
- tdcode ${torque.output.dir} /code/td
- td
-The directory a jar of the Java om files.
- /td
-/tr
---
+tr
+ tdcode torque.omzip.dir /code/td
+ tdcode ${torque.output.dir} /code/td
+ td
+The directory to place the jar files output by the om-zip goal.
+ /td
+/tr
tr
@@ -382,6 +380,45 @@
/td
/tr
+tr
+ tdcode torque.omzip.src.base /code/td
+ tdcode false /code/td
+ td
+Whether the om generated base src (BaseX.java) files should be included in
+the src jar produced by om-zip.
+ /td
+/tr
+tr
+ tdcode torque.omzip.src.extension /code/td
+ tdcode false /code/td
+ td
+Whether the om generated extension src (X.java) files should be included in
+the src jar produced by om-zip.
+ /td
+/tr
+tr
+ tdcode torque.omzip.bin.base /code/td
+ tdcode false /code/td
+ td
+Whether the om generated base class (BaseX.class) files should be included
+in the bin jar produced by om-zip.
+ /td
+/tr
+tr
+ tdcode torque.omzip.bin.extension /code/td
+ tdcode false /code/td
+ td
+Whether the om generated extension class (X.class) files should be included
+in the bin jar produced by om-zip.
+ /td
+/tr
+tr
+ tdcode torque.omzip.deleteFiles /code/td
+ tdcode false /code/td
+ td
+Whether the generated om files should be deleted following the om-zip.
+ /td
+/tr
tr
td colspan=3strong Compile Settings /strong/td
No revision
No revision
1.3.2.22 +31 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.21
retrieving revision 1.3.2.22
diff -u -r1.3.2.21 -r1.3.2.22
--- release-changes.xml 27 Aug 2004 12:07:25 - 1.3.2.21
+++ release-changes.xml 4 Sep 2004 13:29:19 - 1.3.2.22
@@ -10,6 +10,37 @@
body
+section name=Torque 3.1.1-rc3.
+p
+ Changes between Torque 3.1.1-rc2 and 3.1.1-rc3.br/
+/p
+
+subsection name=Other changes
+p
+ ul
+li
+Changed the default property value
cvs commit: db-torque/src/maven-plugin plugin.jelly
seade 2004/09/04 06:32:50
Modified:xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.jelly
Log:
TRQS220: Torque maven plugin om zip goal doesn't work.
Thanks to Dan Price for the patch.
Revision ChangesPath
No revision
No revision
1.3.2.23 +4 -2 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.22
retrieving revision 1.3.2.23
diff -u -r1.3.2.22 -r1.3.2.23
--- release-changes.xml 4 Sep 2004 13:29:19 - 1.3.2.22
+++ release-changes.xml 4 Sep 2004 13:32:50 - 1.3.2.23
@@ -31,15 +31,17 @@
/subsection
/section
-!--subsection name=Fixed bugs
+subsection name=Fixed bugs
p
ul
li
+ TRQS220: Torque maven plugin om zip goal doesn't work. Thanks to Dan
+ Price for the patch.
/li
/ul
/p
/subsection
-/section--
+/section
section name=Torque 3.1.1-rc2.
p
No revision
No revision
1.8.2.3 +6 -5 db-torque/src/maven-plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- plugin.jelly 25 Aug 2004 01:05:59 - 1.8.2.2
+++ plugin.jelly 4 Sep 2004 13:32:50 - 1.8.2.3
@@ -555,7 +555,7 @@
j:set var=torque.internal.omzip.type value=bin/
j:set var=torque.internal.omzip.pattern value=base/
j:set var=torque.internal.omzip.files value=class/
-j:set var=torque.internal.omzip.dir value=${torque.compile.build.dir}/
+j:set var=torque.internal.omzip.dir value=${torque.omzip.dir}/
attainGoal name=torque:om-zip-worker/
j:set var=torque.internal.omzip.pattern value=extension/
attainGoal name=torque:om-zip-worker/
@@ -565,12 +565,13 @@
goal
name=torque:om-zip-worker
-j:if
test=torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}
+property name=torque_internal_omzipworker_guard_name
value=torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}/
+j:if test=${context.getVariable(torque_internal_omzipworker_guard_name) ==
'true'}
!-- Base files that typically aren't modified. --
patternset id=torque.internal.omzip.pattern.base
-include
name=${torque.internal.omzip.packagePath}/${torque.basePrefix}*.${torque.internal.omzip.files}/
-include
name=${torque.internal.omzip.packagePath}/map/*MapBuilder.${torque.internal.omzip.files}/
+include
name=${torque.internal.omzip.packagePath}/**/${torque.basePrefix}*.${torque.internal.omzip.files}/
+include
name=${torque.internal.omzip.packagePath}/map/**/*MapBuilder.${torque.internal.omzip.files}/
/patternset
!-- Extension files that typically are modified. --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs mssql-howto.xml
seade 2004/09/04 07:27:28 Modified:xdocsmssql-howto.xml Log: Added reference to jTDS, fixed borken link to MS SQL JDBC driver. Revision ChangesPath 1.9 +15 -9 db-torque/xdocs/mssql-howto.xml Index: mssql-howto.xml === RCS file: /home/cvs/db-torque/xdocs/mssql-howto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mssql-howto.xml 19 Aug 2004 02:24:49 - 1.8 +++ mssql-howto.xml 4 Sep 2004 14:27:28 - 1.9 @@ -51,19 +51,25 @@ /section section name=JDBC Driver p -Microsoft has a a -href=http://www.microsoft.com/sql/downloads/2000/jdbc.asp;JDBC -driver for MS SQL Server/a in beta. Alternately, a third party -commercial driver from a -href=http://industry.java.sun.com/products/jdbc/drivers;JDBC(TM) -Technology - Drivers/a, the JDBC-ODBC bridge driver from Sun, or the -free driver from a href=http://www.freetds.org;FreeTDS/a can be -used. +Microsoft has a JDBC driver for MS SQL Server available from their a +href=http://www.microsoft.com/sql/downloads/;SQL Downloads page/a. +Alternately, a third party commercial driver from +a href=http://industry.java.sun.com/products/jdbc/drivers;JDBC(TM) +Technology - Drivers/a, the JDBC-ODBC bridge driver from Sun, or one of the +free drivers, a href=http://www.freetds.org;FreeTDS/a or +a href=http://jtds.sourceforge.net/;jTDS/a can be used. /p p The driver from FreeTDS, as of version 0.51, is unstable and buggy, and not -recommended for production environments. Use at your own risk. +recommended for production environments. Use at your own risk. If you have used +a more recent version of FreeTDS successfully then please let us know. +/p + +p +We have only recently been informed of the existence of +a href=http://jtds.sourceforge.net/;jTDS/a, which is based on FreeTDS. +Try it out and let us know how it goes. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/27 05:08:23 Modified:xdocschanges.xml Log: Typo. Revision ChangesPath 1.136 +2 -2 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- changes.xml 26 Aug 2004 12:37:43 - 1.135 +++ changes.xml 27 Aug 2004 12:08:23 - 1.136 @@ -19,11 +19,11 @@ /action action dev='seade' type='add' HSQL adapter enhancements: added support for case-insensitive queries -and cascading deletes. Thanks to Partick Carl for the patch. +and cascading deletes. Thanks to Patrick Carl for the patch. /action action dev='seade' type='fix' HSQL adapter fix: correction to the generated CREATE TABLE DDL when -using IDENTITY columns. Thanks to Partick Carl for the patch. +using IDENTITY columns. Thanks to Patrick Carl for the patch. /action action dev='seade' type='fix' TRQS185: Corrected handling of BIT with PostgreSQL. Note that the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs user-guide.xml
seade 2004/08/26 04:15:06 Modified:xdocsTag: TORQUE_3_1_BRANCH user-guide.xml Log: Typo. Revision ChangesPath No revision No revision 1.12.2.5 +1 -1 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.12.2.4 retrieving revision 1.12.2.5 diff -u -r1.12.2.4 -r1.12.2.5 --- user-guide.xml26 Aug 2004 11:09:12 - 1.12.2.4 +++ user-guide.xml26 Aug 2004 11:15:06 - 1.12.2.5 @@ -76,7 +76,7 @@ source![CDATA[ # Note: Until Torque 3.1.1 is released you will need use 3.1.1-rc1. maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 -S]]/source +]]/source p At runtime the generated object model classes need access to the Torque - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs navigation.xml
seade 2004/08/26 04:17:05 Modified:xdocsTag: TORQUE_3_1_BRANCH navigation.xml Log: Fix link. Revision ChangesPath No revision No revision 1.11.2.9 +1 -1 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.11.2.8 retrieving revision 1.11.2.9 diff -u -r1.11.2.8 -r1.11.2.9 --- navigation.xml22 Aug 2004 23:53:12 - 1.11.2.8 +++ navigation.xml26 Aug 2004 11:17:05 - 1.11.2.9 @@ -42,7 +42,7 @@ /menu menu name=Development item name=DB Adapters href=/db-adapters.html/ - item name=Changes href=/changes.html/ + item name=Changes href=/release-changes.html/ item name=Referenceshref=/references.html/ item name=Todo href=/todo.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs properties.xml
seade 2004/08/26 04:19:24 Modified:src/maven-plugin/xdocs properties.xml Log: Use relative link. Revision ChangesPath 1.5 +1 -1 db-torque/src/maven-plugin/xdocs/properties.xml Index: properties.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/properties.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- properties.xml7 Dec 2003 13:24:22 - 1.4 +++ properties.xml26 Aug 2004 11:19:24 - 1.5 @@ -10,7 +10,7 @@ section name=Plugin Settings p All of the settings used by the plugin are documented in the -a href=http://db.apache.org/torque/generator/properties-reference.html; +a href=../generator/properties-reference.html Properties Reference/a for Torque. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs properties.xml
seade 2004/08/26 04:19:33 Modified:src/maven-plugin/xdocs Tag: TORQUE_3_1_BRANCH properties.xml Log: Use relative link. Revision ChangesPath No revision No revision 1.2.2.3 +1 -1 db-torque/src/maven-plugin/xdocs/properties.xml Index: properties.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/properties.xml,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- properties.xml13 Aug 2004 05:26:22 - 1.2.2.2 +++ properties.xml26 Aug 2004 11:19:33 - 1.2.2.3 @@ -10,7 +10,7 @@ section name=Plugin Settings p All of the settings used by the plugin are documented in the -a href=http://db.apache.org/torque/generator/properties-reference.html; +a href=../generator/properties-reference.html Properties Reference/a for Torque. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs status.xml
seade 2004/08/26 04:37:36 Modified:xdocsTag: TORQUE_3_1_BRANCH status.xml Log: Mention the 3.1.1-rc1 release. Belated mention of Martin. Revision ChangesPath No revision No revision 1.13.2.1 +18 -0 db-torque/xdocs/status.xml Index: status.xml === RCS file: /home/cvs/db-torque/xdocs/status.xml,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -r1.13 -r1.13.2.1 --- status.xml1 Sep 2003 20:02:36 - 1.13 +++ status.xml26 Aug 2004 11:37:36 - 1.13.2.1 @@ -5,6 +5,7 @@ properties titleNews and Status/title author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -18,6 +19,23 @@ p A list of changes can be found a href=release-changes.htmlhere/a. /p + + subsection name=26 August 2004 - Torque 3.1.1-rc1 is released! +p + We are working on setting up the mirrored download page for 3.1.1 + final. In the mean time you can obtain the Torque 3.1.1-rc1 + generator, runtime and maven-plugin from the + a href=http://ibiblio.org/maven/torque/;ibiblio maven + repository/a. +/p + /subsection + + subsection name=In Memoriam +p + a href=http://www.apache.org/foundation/martin.html;Farewell to + Martin Pöschl/a. +/p + /subsection subsection name=1 September 2003 - Torque 3.1 is released! p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs user-guide.xml maven-howto.xml
seade 2004/08/26 04:41:44 Modified:xdocs/tutorial step1.xml xdocsuser-guide.xml maven-howto.xml Log: Download instructions for 3.2. Revision ChangesPath 1.6 +1 -2 db-torque/xdocs/tutorial/step1.xml Index: step1.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step1.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- step1.xml 23 Aug 2004 03:27:21 - 1.5 +++ step1.xml 26 Aug 2004 11:41:44 - 1.6 @@ -25,8 +25,7 @@ /p source![CDATA[ -!!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! -!!! TO DO - Confirm these values !!! +# Note: Until Torque 3.1.1 is released you will need use 3.1.1-rc1. maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source 1.16 +2 -3 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- user-guide.xml23 Aug 2004 03:27:21 - 1.15 +++ user-guide.xml26 Aug 2004 11:41:44 - 1.16 @@ -74,9 +74,8 @@ /p source![CDATA[ -!!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! -!!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 +# Torque 3.2 is yet to be released and deployed, in the mean time you must build the plugin from source. +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.2 ]]/source p 1.9 +2 -3 db-torque/xdocs/maven-howto.xml Index: maven-howto.xml === RCS file: /home/cvs/db-torque/xdocs/maven-howto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maven-howto.xml 23 Aug 2004 03:27:21 - 1.8 +++ maven-howto.xml 26 Aug 2004 11:41:44 - 1.9 @@ -56,9 +56,8 @@ /p source![CDATA[ -!!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! -!!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 +# Torque 3.2 is yet to be released and deployed, in the mean time you must build the plugin from source. +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.2 ]]/source /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator project.xml project.properties
seade 2004/08/26 04:43:51
Modified:src/maven-plugin project.properties project.xml
.project.properties project-base.xml
src/generator project.xml project.properties
Log:
Deployment goodness.
ASL 2.0.
Revision ChangesPath
1.6 +32 -0 db-torque/src/maven-plugin/project.properties
Index: project.properties
===
RCS file: /home/cvs/db-torque/src/maven-plugin/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties23 Oct 2003 10:19:48 - 1.5
+++ project.properties26 Aug 2004 11:43:51 - 1.6
@@ -1,6 +1,38 @@
# ---
+# Copyright 2002-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---
+
+# ---
# P R O J E C T P R O P E R T I E S
+#
+# $Id$
+#
+# These properties are used by the maven Torque build, you may override
+# any of these default values by placing property values in
+# your build.properties file.
# ---
+
+#
+#
+# Maven building and deploy. These settings are for deployment to www.apache.org.
+# If you are not an Torque committer, you can safely ignore these. :-)
+#
+#
+maven.repo.remote=http://www.ibiblio.org/maven/,http://www.apache.org/dist/java-repository/
+maven.remote.group=apcvs
+
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
1.19 +1 -0 db-torque/src/maven-plugin/project.xml
Index: project.xml
===
RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 20 Aug 2004 03:29:35 - 1.18
+++ project.xml 26 Aug 2004 11:43:51 - 1.19
@@ -21,6 +21,7 @@
extend../../project-base.xml/extend
pomVersion3/pomVersion
idmaven-torque-plugin/id
+ groupIdtorque/groupId
nameMaven Torque Plug-in/name
descriptionMaven Plugin for Torque/description
1.9 +10 -1 db-torque/project.properties
Index: project.properties
===
RCS file: /home/cvs/db-torque/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties25 Aug 2004 01:02:23 - 1.8
+++ project.properties26 Aug 2004 11:43:51 - 1.9
@@ -23,6 +23,15 @@
# to do site or installation specific changes to the project build.
# ---
+#
+#
+# Maven building and deploy. These settings are for deployment to www.apache.org.
+# If you are not an Torque committer, you can safely ignore these. :-)
+#
+#
+maven.repo.remote=http://www.ibiblio.org/maven/,http://www.apache.org/dist/java-repository/
+maven.remote.group=apcvs
+
torque.generator.home = src/generator
maven.checkstyle.format = turbine
1.9 +2 -1 db-torque/project-base.xml
Index: project-base.xml
===
RCS file: /home/cvs/db-torque/project-base.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project-base.xml 23 Aug 2004 01:23:05 - 1.8
+++ project-base.xml 26 Aug 2004 11:43:51 - 1.9
@@ -40,7 +40,8 @@
issueTrackingUrlhttp://issues.apache.org/scarab/issues/issueTrackingUrl
siteAddressdb.apache.org/siteAddress
siteDirectory/www/db.apache.org/torque//siteDirectory
-
distributionDirectory/www/db.apache.org/builds/db-torque//distributionDirectory
+ distributionSitewww.apache.org/distributionSite
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/26 05:37:43 Modified:xdocschanges.xml Log: Oops. Revision ChangesPath 1.135 +1 -0 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- changes.xml 26 Aug 2004 11:28:47 - 1.134 +++ changes.xml 26 Aug 2004 12:37:43 - 1.135 @@ -16,6 +16,7 @@ /action action dev='seade' type='update' Upgrade to and xerces-2.4.0. + /action action dev='seade' type='add' HSQL adapter enhancements: added support for case-insensitive queries and cascading deletes. Thanks to Partick Carl for the patch. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/java/org/apache/torque/map TableMap.java
seade 2004/08/26 17:52:50
Modified:src/java/org/apache/torque/map Tag: TORQUE_3_1_BRANCH
TableMap.java
Log:
Picky style fix - no functional change.
Revision ChangesPath
No revision
No revision
1.13.2.4 +2 -2 db-torque/src/java/org/apache/torque/map/TableMap.java
Index: TableMap.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/map/TableMap.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- TableMap.java 26 Aug 2004 16:50:24 - 1.13.2.3
+++ TableMap.java 27 Aug 2004 00:52:50 - 1.13.2.4
@@ -515,7 +515,7 @@
while (st.hasMoreTokens())
{
String element = ((String) st.nextElement()).toLowerCase();
-out.append (StringUtils.capitalize(element));
+out.append(StringUtils.capitalize(element));
}
return out.toString();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/java/org/apache/torque/engine/database/model TypeMap.java
seade 2004/08/25 22:18:39
Modified:src/generator/src/templates/om Object.vm Peer.vm
ObjectWithManager.vm
src/generator/src/java/org/apache/torque/engine/database/model
TypeMap.java
Log:
Hennings Findbugs patch.
This is mainly working around things like new String() (replacing it
with ), new Boolean(true) (replacing it with Boolean.TRUE).
Also cleanup of constructs like this:
if (foo) {
#if ($templateFoo)
do something
#end
}
which results in
if (foo) {
}
when $templateFoo is false.
Revision ChangesPath
1.15 +3 -3 db-torque/src/generator/src/templates/om/Object.vm
Index: Object.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Object.vm 14 Aug 2004 12:01:42 - 1.14
+++ Object.vm 26 Aug 2004 05:18:38 - 1.15
@@ -917,7 +917,7 @@
#elseif ($cjtype == double)
return new Double(get${cfc}());
#elseif ($cjtype == boolean)
-return new Boolean(get${cfc}());
+return Boolean.valueOf(get${cfc}());
#elseif ($cjtype == short)
return new Short(get${cfc}());
#elseif ($cjtype == byte)
@@ -957,7 +957,7 @@
#elseif ($cjtype == double)
return new Double(get${cfc}());
#elseif ($cjtype == boolean)
-return new Boolean(get${cfc}());
+return Boolean.valueOf(get${cfc}());
#elseif ($cjtype == short)
return new Short(get${cfc}());
#elseif ($cjtype == byte)
@@ -996,7 +996,7 @@
#elseif ($cjtype == double)
return new Double(get${cfc}());
#elseif ($cjtype == boolean)
-return new Boolean(get${cfc}());
+return Boolean.valueOf(get${cfc}());
#elseif ($cjtype == short)
return new Short(get${cfc}());
#elseif ($cjtype == byte)
1.9 +65 -212 db-torque/src/generator/src/templates/om/Peer.vm
Index: Peer.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Peer.vm 23 Aug 2004 11:49:47 - 1.8
+++ Peer.vm 26 Aug 2004 05:18:38 - 1.9
@@ -255,14 +255,7 @@
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
{
-if (((Boolean) possibleBoolean).booleanValue())
-{
-criteria.add($cup, 1);
-}
-else
-{
-criteria.add($cup, 0);
-}
+criteria.add($cup, ((Boolean) possibleBoolean).booleanValue() ? 1 :
0);
}
}
#elseif ($col.isBooleanChar())
@@ -272,14 +265,7 @@
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
{
-if (((Boolean) possibleBoolean).booleanValue())
-{
-criteria.add($cup, Y);
-}
-else
-{
-criteria.add($cup, N);
-}
+criteria.add($cup, ((Boolean) possibleBoolean).booleanValue() ? Y
: N);
}
}
#elseif ($col.isBit())
@@ -289,27 +275,15 @@
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
{
-if (((Boolean) possibleBoolean).booleanValue())
-{
-criteria.add($cup, 1);
-}
-else
-{
-criteria.add($cup, 0);
-}
+criteria.add($cup, ((Boolean) possibleBoolean).booleanValue() ? 1
: 0);
}
}
#end
#end
-// Set the correct dbName if it has not been overridden
-// criteria.getDbName will return the same object if not set to
-// another value so == check is okay and faster
-if (criteria.getDbName() == Torque.getDefaultDB())
-{
-criteria.setDbName(DATABASE_NAME);
-}
-if (con == null)
+setDbName(criteria);
+
+ if (con == null)
{
return BasePeer.doInsert(criteria);
}
@@ -468,14 +442,7 @@
Object possibleBoolean = criteria.get($cup);
if (possibleBoolean instanceof Boolean)
{
-if (((Boolean) possibleBoolean
cvs commit: db-torque/src/generator/src/conf default.properties
seade 2004/08/23 23:59:51
Modified:src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.properties
src/generator/src/conf Tag: TORQUE_3_1_BRANCH
default.properties
Log:
Commented out some duplicate properties. This fixes runtime:test.
Revision ChangesPath
No revision
No revision
1.3.2.4 +9 -9 db-torque/src/maven-plugin/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- plugin.properties 19 Aug 2004 00:18:50 - 1.3.2.3
+++ plugin.properties 24 Aug 2004 06:59:51 - 1.3.2.4
@@ -63,16 +63,16 @@
database.manual.creation = false
sameJavaName = false
-torque.database.createUrl = ${createDatabaseUrl}
-torque.database.buildUrl = ${buildDatabaseUrl}
-torque.database.url = ${databaseUrl}
-torque.database.driver = ${databaseDriver}
-torque.database.user = ${databaseUser}
-torque.database.password = ${databasePassword}
-torque.database.host = ${databaseHost}
+#torque.database.createUrl = ${createDatabaseUrl}
+#torque.database.buildUrl = ${buildDatabaseUrl}
+#torque.database.url = ${databaseUrl}
+#torque.database.driver = ${databaseDriver}
+#torque.database.user = ${databaseUser}
+#torque.database.password = ${databasePassword}
+#torque.database.host = ${databaseHost}
-torque.database.schema = ${databaseSchema}
-torque.database.name = ${databaseName}
+#torque.database.schema = ${databaseSchema}
+#torque.database.name = ${databaseName}
torque.database.manualCreation = ${database.manual.creation}
torque.saveJavaName = ${sameJavaName}
No revision
No revision
1.3.2.2 +9 -9 db-torque/src/generator/src/conf/default.properties
Index: default.properties
===
RCS file: /home/cvs/db-torque/src/generator/src/conf/default.properties,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- default.properties11 Sep 2003 22:46:09 - 1.3.2.1
+++ default.properties24 Aug 2004 06:59:51 - 1.3.2.2
@@ -76,16 +76,16 @@
database.manual.creation = false
sameJavaName = false
-torque.database.createUrl = ${createDatabaseUrl}
-torque.database.buildUrl = ${buildDatabaseUrl}
-torque.database.url = ${databaseUrl}
-torque.database.driver = ${databaseDriver}
-torque.database.user = ${databaseUser}
-torque.database.password = ${databasePassword}
-torque.database.host = ${databaseHost}
+#torque.database.createUrl = ${createDatabaseUrl}
+#torque.database.buildUrl = ${buildDatabaseUrl}
+#torque.database.url = ${databaseUrl}
+#torque.database.driver = ${databaseDriver}
+#torque.database.user = ${databaseUser}
+#torque.database.password = ${databasePassword}
+#torque.database.host = ${databaseHost}
-torque.database.schema = ${databaseSchema}
-torque.database.name = ${databaseName}
+#torque.database.schema = ${databaseSchema}
+#torque.database.name = ${databaseName}
torque.database.manualCreation = ${database.manual.creation}
torque.saveJavaName = ${sameJavaName}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs index.xml
seade 2004/08/24 17:05:12 Modified:xdocsindex.xml Log: Update testers. Revision ChangesPath 1.24 +15 -13db-torque/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/xdocs/index.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- index.xml 18 Jul 2003 20:00:11 - 1.23 +++ index.xml 25 Aug 2004 00:05:11 - 1.24 @@ -6,6 +6,7 @@ titleTorque/title author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -33,15 +34,15 @@ table tr thRDBMS/th - thdriver/th - thstatus/th - thtester/th + thDriver/th + thStatus/th + thTester/th /tr tr tdAxion/td tdorg.axiondb.jdbc.AxionDriver/td - tdalpha/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdAlpha/td + td/td /tr tr tdCloudscape/td @@ -58,7 +59,7 @@ tr tdDB2/AS400/td tdcom.ibm.as400.access.AS400JDBCDriver/td - tdpossible case-insensitivity issues/td + tdPossible case-insensitivity issues/td tda href=mailto:[EMAIL PROTECTED]Scott Weaver/a/td /tr tr @@ -100,20 +101,20 @@ tr tdMySQL/td tdorg.gjt.mm.mysql.Driver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdNo known problems/td + tda href=mailto:[EMAIL PROTECTED]Scott Eade/a/td /tr tr tda href=oracle-howto.htmlOracle/a/td tdoracle.jdbc.driver.OracleDriver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdIssues with LOBs/td + td/td /tr tr tda href=postgres-howto.htmlPostgres/a/td tdorg.postgresql.Driver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdNo known problems/td + tda href=mailto:[EMAIL PROTECTED]Scott Eade/a/td /tr tr tdSapDB/td @@ -145,7 +146,8 @@ p If there is no tester for your RDBMS and you want to help, please read the a href=developer-guide.htmldeveloper-guide/a, run the tests -and send your results (and bugfixes ;) to the [EMAIL PROTECTED] +and send your results (and bugfixes ;) to the +a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a list. /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs index.xml
seade 2004/08/24 17:05:22 Modified:xdocsTag: TORQUE_3_1_BRANCH index.xml Log: Update testers. Revision ChangesPath No revision No revision 1.23.2.1 +15 -13db-torque/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/xdocs/index.xml,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -r1.23 -r1.23.2.1 --- index.xml 18 Jul 2003 20:00:11 - 1.23 +++ index.xml 25 Aug 2004 00:05:22 - 1.23.2.1 @@ -6,6 +6,7 @@ titleTorque/title author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -33,15 +34,15 @@ table tr thRDBMS/th - thdriver/th - thstatus/th - thtester/th + thDriver/th + thStatus/th + thTester/th /tr tr tdAxion/td tdorg.axiondb.jdbc.AxionDriver/td - tdalpha/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdAlpha/td + td/td /tr tr tdCloudscape/td @@ -58,7 +59,7 @@ tr tdDB2/AS400/td tdcom.ibm.as400.access.AS400JDBCDriver/td - tdpossible case-insensitivity issues/td + tdPossible case-insensitivity issues/td tda href=mailto:[EMAIL PROTECTED]Scott Weaver/a/td /tr tr @@ -100,20 +101,20 @@ tr tdMySQL/td tdorg.gjt.mm.mysql.Driver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdNo known problems/td + tda href=mailto:[EMAIL PROTECTED]Scott Eade/a/td /tr tr tda href=oracle-howto.htmlOracle/a/td tdoracle.jdbc.driver.OracleDriver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdIssues with LOBs/td + td/td /tr tr tda href=postgres-howto.htmlPostgres/a/td tdorg.postgresql.Driver/td - tdno known problems/td - tda href=mailto:[EMAIL PROTECTED]Martin Poeschl/a/td + tdNo known problems/td + tda href=mailto:[EMAIL PROTECTED]Scott Eade/a/td /tr tr tdSapDB/td @@ -145,7 +146,8 @@ p If there is no tester for your RDBMS and you want to help, please read the a href=developer-guide.htmldeveloper-guide/a, run the tests -and send your results (and bugfixes ;) to the [EMAIL PROTECTED] +and send your results (and bugfixes ;) to the +a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a list. /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator project.properties maven.xml LICENSE.txt
seade 2004/08/24 18:02:23 Modified:src/maven-plugin plugin.properties plugin.jelly .project.properties default.properties maven.xml src/generator/src/conf build.properties default.properties src/generator project.properties maven.xml LICENSE.txt Added: src/maven-plugin LICENSE.txt Log: ASL 2.0 Revision ChangesPath 1.6 +18 -0 db-torque/src/maven-plugin/plugin.properties Index: plugin.properties === RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin.properties 7 Dec 2003 13:23:59 - 1.5 +++ plugin.properties 25 Aug 2004 01:02:22 - 1.6 @@ -1,7 +1,25 @@ # --- +# Copyright 2002-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --- + +# --- # P L U G I N P R O P E R T I E S # --- # Torque plugin properties +# +# $Id$ # # DO NOT EDIT THIS FILE - If you need to change the values found # in this file, override them in your project.properties or 1.11 +25 -0 db-torque/src/maven-plugin/plugin.jelly Index: plugin.jelly === RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plugin.jelly 17 Jan 2004 02:39:34 - 1.10 +++ plugin.jelly 25 Aug 2004 01:02:22 - 1.11 @@ -1,4 +1,29 @@ ?xml version=1.0? +!-- +/* + * Copyright 2002-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + -- + +!-- -- +!-- -- +!-- plugin.jelly for Torque maven-plugin. -- +!-- -- +!-- $Id$ -- +!-- -- +!-- -- project xmlns:j=jelly:core 1.2 +202 -0db-torque/src/maven-plugin/LICENSE.txt 1.8 +21 -4 db-torque/project.properties Index: project.properties === RCS file: /home/cvs/db-torque/project.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project.properties10 Feb 2003 13:23:10 - 1.7 +++ project.properties25 Aug 2004 01:02:23 - 1.8 @@ -1,9 +1,26 @@ # --- -# B U I L D P R O P E R T I E S +# Copyright 2001-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License
cvs commit: db-torque/src/generator/src/conf build.properties default.properties
seade 2004/08/24 18:06:00 Modified:src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.properties plugin.jelly .Tag: TORQUE_3_1_BRANCH project.properties default.properties maven.xml src/generator Tag: TORQUE_3_1_BRANCH maven.xml project.properties src/generator/src/conf Tag: TORQUE_3_1_BRANCH build.properties default.properties Log: ASL 2.0 Revision ChangesPath No revision No revision 1.3.2.5 +18 -0 db-torque/src/maven-plugin/plugin.properties Index: plugin.properties === RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -r1.3.2.4 -r1.3.2.5 --- plugin.properties 24 Aug 2004 06:59:51 - 1.3.2.4 +++ plugin.properties 25 Aug 2004 01:05:59 - 1.3.2.5 @@ -1,7 +1,25 @@ # --- +# Copyright 2002-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --- + +# --- # P L U G I N P R O P E R T I E S # --- # Torque plugin properties +# +# $Id$ # # DO NOT EDIT THIS FILE - If you need to change the values found # in this file, override them in your project.properties or 1.8.2.2 +25 -0 db-torque/src/maven-plugin/plugin.jelly Index: plugin.jelly === RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- plugin.jelly 23 Oct 2003 10:17:24 - 1.8.2.1 +++ plugin.jelly 25 Aug 2004 01:05:59 - 1.8.2.2 @@ -1,4 +1,29 @@ ?xml version=1.0? +!-- +/* + * Copyright 2002-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + -- + +!-- -- +!-- -- +!-- plugin.jelly for Torque maven-plugin. -- +!-- -- +!-- $Id$ -- +!-- -- +!-- -- project xmlns:j=jelly:core No revision No revision 1.7.2.1 +21 -4 db-torque/project.properties Index: project.properties === RCS file: /home/cvs/db-torque/project.properties,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- project.properties10 Feb 2003 13:23:10 - 1.7 +++ project.properties25 Aug 2004 01:05:59 - 1.7.2.1 @@ -1,9 +1,26 @@ # --- -# B U I L D P R O P E R T I E S +# Copyright 2001-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under
cvs commit: db-torque project.xml
seade 2004/08/24 18:34:46 Modified:.project.xml Log: Sync versions. Revision ChangesPath 1.113 +4 -4 db-torque/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- project.xml 20 Aug 2004 03:29:35 - 1.112 +++ project.xml 25 Aug 2004 01:34:46 - 1.113 @@ -107,13 +107,13 @@ /dependency dependency idxerces:xercesImpl/id - version2.0.2/version + version2.4.0/version urlhttp://xml.apache.org/xerces2-j//url /dependency dependency - idxerces:xmlParserAPIs/id - version2.0.2/version - urlhttp://xml.apache.org/xerces2-j//url + groupIdxml-apis/groupId + artifactIdxml-apis/artifactId + version1.0.b2/version /dependency dependency idjunit/id - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/conf build-torque.xml
seade 2004/08/24 18:37:11
Modified:.Tag: TORQUE_3_1_BRANCH project.xml
src/generator/src/conf Tag: TORQUE_3_1_BRANCH
build-torque.xml
Log:
Sync versions.
Revision ChangesPath
No revision
No revision
1.103.2.10 +6 -5 db-torque/project.xml
Index: project.xml
===
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.103.2.9
retrieving revision 1.103.2.10
diff -u -r1.103.2.9 -r1.103.2.10
--- project.xml 23 Aug 2004 01:22:11 - 1.103.2.9
+++ project.xml 25 Aug 2004 01:37:11 - 1.103.2.10
@@ -91,6 +91,7 @@
roles
roleJava Developer/role
/roles
+ timezone+10/timezone
/developer
developer
nameStephen Haberman/name
@@ -282,7 +283,7 @@
/dependency
dependency
idstratum/id
- version1.0-b3/version
+ version1.0-b5/version
urlhttp://jakarta.apache.org/turbine/stratum//url
/dependency
dependency
@@ -292,13 +293,13 @@
/dependency
dependency
idxerces:xercesImpl/id
- version2.0.2/version
+ version2.4.0/version
urlhttp://xml.apache.org/xerces2-j//url
/dependency
dependency
- idxerces:xmlParserAPIs/id
- version2.0.2/version
- urlhttp://xml.apache.org/xerces2-j//url
+ groupIdxml-apis/groupId
+ artifactIdxml-apis/artifactId
+ version1.0.b2/version
/dependency
dependency
idjunit/id
No revision
No revision
1.8.2.3 +4 -4 db-torque/src/generator/src/conf/build-torque.xml
Index: build-torque.xml
===
RCS file: /home/cvs/db-torque/src/generator/src/conf/build-torque.xml,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- build-torque.xml 19 Aug 2004 14:29:10 - 1.8.2.2
+++ build-torque.xml 25 Aug 2004 01:37:11 - 1.8.2.3
@@ -33,14 +33,14 @@
--
path id=torque-classpath
fileset dir=${torque.lib.dir}
- include name=**/commons-collections-2.1.jar/
- include name=**/commons-lang-1.0.1.jar/
+ include name=**/commons-collections-3.0.jar/
+ include name=**/commons-lang-2.0.jar/
include name=**/log4j-1.2.8.jar/
include name=**/${torque.jar}/
include name=**/velocity-1.3.1.jar/
include name=**/village-2.0-dev-20030825.jar/
- include name=**/xercesImpl-2.0.2.jar/
- include name=**/xmlParserAPIs-2.0.2.jar/
+ include name=**/xercesImpl-2.4.0.jar/
+ include name=**/xml-apis-1.0.b2.jar/
include name=**/*.jar/
/fileset
/path
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/23 04:49:04
Modified:src/generator/src/templates/om Tag: TORQUE_3_1_BRANCH
Peer.vm
src/generator/src/java/org/apache/torque/engine/database/model
Tag: TORQUE_3_1_BRANCH TypeMap.java Column.java
xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Corrected handling of BIT with PostgreSQL. Note that the solution implemented has
been tested under MySLQ and PostgreSQL only.
Revision ChangesPath
No revision
No revision
1.5.2.4 +102 -0db-torque/src/generator/src/templates/om/Peer.vm
Index: Peer.vm
===
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- Peer.vm 6 Apr 2004 12:49:46 - 1.5.2.3
+++ Peer.vm 23 Aug 2004 11:49:04 - 1.5.2.4
@@ -282,6 +282,23 @@
}
}
}
+#elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (criteria.containsKey($cup))
+{
+Object possibleBoolean = criteria.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue())
+{
+criteria.add($cup, 1);
+}
+else
+{
+criteria.add($cup, 0);
+}
+}
+ }
#end
#end
@@ -478,6 +495,23 @@
}
}
}
+#elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (criteria.containsKey($cup))
+{
+Object possibleBoolean = criteria.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue())
+{
+criteria.add($cup, 1);
+}
+else
+{
+criteria.add($cup, 0);
+}
+}
+ }
#end
#end
@@ -666,6 +700,23 @@
}
}
}
+#elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (criteria.containsKey($cup))
+{
+Object possibleBoolean = criteria.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue())
+{
+criteria.add($cup, 1);
+}
+else
+{
+criteria.add($cup, 0);
+}
+}
+ }
#end
#if($col.isPrimaryKey())
selectCriteria.put($cup, criteria.remove($cup));
@@ -751,6 +802,23 @@
}
}
}
+#elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (criteria.containsKey($cup))
+{
+Object possibleBoolean = criteria.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue())
+{
+criteria.add($cup, 1);
+}
+else
+{
+criteria.add($cup, 0);
+}
+}
+ }
#end
#end
@@ -1290,6 +1358,23 @@
}
}
}
+ #elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (c.containsKey($cup))
+{
+Object possibleBoolean = c.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue())
+{
+c.add($cup, 1);
+}
+else
+{
+c.add($cup, 0);
+}
+}
+ }
#end
#end
@@ -1457,6 +1542,23 @@
else
{
c.add($cup, N);
+}
+}
+ }
+ #elseif ($col.isBit())
+// check for conversion from boolean to bit (1/0)
+if (c.containsKey($cup))
+{
+Object possibleBoolean = c.get($cup);
+if (possibleBoolean instanceof Boolean)
+{
+if (((Boolean) possibleBoolean).booleanValue
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/23 04:54:10 Modified:xdocsTag: TORQUE_3_1_BRANCH release-changes.xml Log: Refer to Scarab issue. Revision ChangesPath No revision No revision 1.3.2.16 +5 -5 db-torque/xdocs/release-changes.xml Index: release-changes.xml === RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v retrieving revision 1.3.2.15 retrieving revision 1.3.2.16 diff -u -r1.3.2.15 -r1.3.2.16 --- release-changes.xml 23 Aug 2004 11:49:04 - 1.3.2.15 +++ release-changes.xml 23 Aug 2004 11:54:10 - 1.3.2.16 @@ -43,13 +43,13 @@ p ul li - Corrected handling of BIT with PostgreSQL. Note that the solution - implemented has been tested under MySLQ and PostgreSQL only. + TRQS185: Corrected handling of BIT with PostgreSQL. Note that the + solution implemented has been tested under MySLQ and PostgreSQL only. /li li - Multiple unique constraints and indexes on a single table are now - allocated sequential names (previously duplicate names were being - allocated). + Multiple unique constraints and indexes on a single table are now + allocated sequential names (previously duplicate names were being + allocated). /li li Backported a few template fixes from Serge Huber that were committed - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/23 04:54:21 Modified:xdocschanges.xml Log: Refer to Scarab issue. Revision ChangesPath 1.132 +2 -2 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- changes.xml 23 Aug 2004 11:49:47 - 1.131 +++ changes.xml 23 Aug 2004 11:54:21 - 1.132 @@ -10,8 +10,8 @@ release version=3.2-alpha date=in CVS action dev='seade' type='fix' -Corrected handling of BIT with PostgreSQL. Note that the solution -implemented has been tested under MySLQ and PostgreSQL only. +TRQS185: Corrected handling of BIT with PostgreSQL. Note that the +solution implemented has been tested under MySLQ and PostgreSQL only. /action action dev='seade' type='add' The codeadapter/code property is now used in preference to - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/templates/sql/base/hypersonic primarykey.vm foreignkey.vm
seade 2004/08/23 19:05:04
Modified:xdocschanges.xml
src/java/org/apache/torque/adapter DBHypersonicSQL.java
src/generator/src/templates/sql/base/hypersonic
primarykey.vm foreignkey.vm
Log:
HSQL adapter enhancements/fixes: added support for case-insensitive queries, added
support for cascading deletes, correction to the generated CREATE TABLE DDL when using
IDENTITY columns. Thanks to Partick Carl for the patch.
Revision ChangesPath
1.133 +8 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- changes.xml 23 Aug 2004 11:54:21 - 1.132
+++ changes.xml 24 Aug 2004 02:05:03 - 1.133
@@ -9,6 +9,14 @@
body
release version=3.2-alpha date=in CVS
+ action dev='seade' type='add'
+HSQL adapter enhancements: added support for case-insensitive queries
+and cascading deletes. Thanks to Partick Carl for the patch.
+ /action
+ action dev='seade' type='fix'
+HSQL adapter fix: correction to the generated CREATE TABLE DDL when
+using IDENTITY columns. Thanks to Partick Carl for the patch.
+ /action
action dev='seade' type='fix'
TRQS185: Corrected handling of BIT with PostgreSQL. Note that the
solution implemented has been tested under MySLQ and PostgreSQL only.
1.10 +4 -3
db-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java
Index: DBHypersonicSQL.java
===
RCS file:
/home/cvs/db-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DBHypersonicSQL.java 22 Feb 2004 06:19:07 - 1.9
+++ DBHypersonicSQL.java 24 Aug 2004 02:05:04 - 1.10
@@ -45,7 +45,8 @@
*/
public String toUpperCase(String in)
{
-return in;
+String s = new StringBuffer(UPPER().append(in).append()).toString();
+return s;
}
/**
@@ -56,7 +57,7 @@
*/
public String ignoreCase(String in)
{
-return in;
+return toUpperCase(in);
}
/**
1.2 +1 -1
db-torque/src/generator/src/templates/sql/base/hypersonic/primarykey.vm
Index: primarykey.vm
===
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/primarykey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- primarykey.vm 10 Feb 2003 13:18:48 - 1.1
+++ primarykey.vm 24 Aug 2004 02:05:04 - 1.2
@@ -1,3 +1,3 @@
-#if ($table.hasPrimaryKey())
+#if ($table.hasPrimaryKey() $table.IdMethod != native)
PRIMARY KEY($table.printPrimaryKey()),
#end
1.2 +5 -1
db-torque/src/generator/src/templates/sql/base/hypersonic/foreignkey.vm
Index: foreignkey.vm
===
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/foreignkey.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foreignkey.vm 10 Feb 2003 13:18:48 - 1.1
+++ foreignkey.vm 24 Aug 2004 02:05:04 - 1.2
@@ -1,5 +1,9 @@
#foreach ($fk in $table.ForeignKeys)
ALTER TABLE $table.Name
ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames)
-REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames);
+REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames)
+#if ($fk.hasOnDelete())
+ON DELETE $fk.OnDelete
+#end
+;
#end
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/profile mysql.profile postgres.profile
seade 2004/08/23 19:35:04
Modified:profile Tag: TORQUE_3_1_BRANCH mysql.profile
postgres.profile
Log:
Tweak the driver jar names.
Revision ChangesPath
No revision
No revision
1.22.2.1 +1 -1 db-torque/profile/mysql.profile
Index: mysql.profile
===
RCS file: /home/cvs/db-torque/profile/mysql.profile,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- mysql.profile 18 Aug 2003 15:20:09 - 1.22
+++ mysql.profile 24 Aug 2004 02:35:04 - 1.22.2.1
@@ -1,7 +1,7 @@
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
-torque.testDatabaseJar = ${maven.repo.local}/mm.mysql/jars/mm.mysql-2.0.13-bin.jar
+torque.testDatabaseJar = ${maven.repo.local}/mm.mysql/jars/mm.mysql-2.0.14-bin.jar
torque.idMethod = idbroker
#torque.idMethod = native
torque.defaultDatabase = bookstore
1.18.2.2 +1 -1 db-torque/profile/postgres.profile
Index: postgres.profile
===
RCS file: /home/cvs/db-torque/profile/postgres.profile,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- postgres.profile 21 Jan 2004 15:20:10 - 1.18.2.1
+++ postgres.profile 24 Aug 2004 02:35:04 - 1.18.2.2
@@ -1,7 +1,7 @@
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
-torque.testDatabaseJar =
${maven.repo.local}/postgresql/jars/postgresql-7.3-jdbc2.jar
+torque.testDatabaseJar =
${maven.repo.local}/postgresql/jars/postgresql-7.3-jdbc3.jar
torque.idMethod = idbroker
#torque.idMethod = native
torque.defaultDatabase = bookstore
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/conf/master Torque.master
seade 2004/08/23 21:14:08 Modified:src/conf Torque.properties src/conf/master Torque.master Log: Corrected property name. Revision ChangesPath 1.14 +2 -2 db-torque/src/conf/Torque.properties Index: Torque.properties === RCS file: /home/cvs/db-torque/src/conf/Torque.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Torque.properties 16 Aug 2004 03:08:13 - 1.13 +++ Torque.properties 24 Aug 2004 04:14:08 - 1.14 @@ -92,7 +92,7 @@ ## Using commons-dbcp torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory #torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory -torque.dsfactory.bookstore.pool.defaultMaxActive=10 +torque.dsfactory.bookstore.pool.maxActive=10 torque.dsfactory.bookstore.pool.testOnBorrow=true torque.dsfactory.bookstore.pool.validationQuery=SELECT 1 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver 1.12 +2 -2 db-torque/src/conf/master/Torque.master Index: Torque.master === RCS file: /home/cvs/db-torque/src/conf/master/Torque.master,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Torque.master 16 Aug 2004 03:08:13 - 1.11 +++ Torque.master 24 Aug 2004 04:14:08 - 1.12 @@ -92,7 +92,7 @@ ## Using commons-dbcp [EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory [EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory [EMAIL PROTECTED]@.pool.defaultMaxActive=10 [EMAIL PROTECTED]@.pool.maxActive=10 [EMAIL PROTECTED]@.pool.testOnBorrow=true [EMAIL PROTECTED]@[EMAIL PROTECTED]@ [EMAIL PROTECTED]@.connection.driver = @DATABASE_DRIVER@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/conf/master Torque.master
seade 2004/08/23 21:14:32 Modified:src/conf Tag: TORQUE_3_1_BRANCH Torque.properties src/conf/master Tag: TORQUE_3_1_BRANCH Torque.master Log: Corrected property name. Revision ChangesPath No revision No revision 1.11.2.2 +2 -2 db-torque/src/conf/Torque.properties Index: Torque.properties === RCS file: /home/cvs/db-torque/src/conf/Torque.properties,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- Torque.properties 16 Aug 2004 03:06:45 - 1.11.2.1 +++ Torque.properties 24 Aug 2004 04:14:32 - 1.11.2.2 @@ -104,7 +104,7 @@ ## Using commons-dbcp torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory #torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory -torque.dsfactory.bookstore.pool.defaultMaxActive=10 +torque.dsfactory.bookstore.pool.maxActive=10 torque.dsfactory.bookstore.pool.testOnBorrow=true torque.dsfactory.bookstore.pool.validationQuery=SELECT 1 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver No revision No revision 1.9.2.2 +2 -2 db-torque/src/conf/master/Torque.master Index: Torque.master === RCS file: /home/cvs/db-torque/src/conf/master/Torque.master,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- Torque.master 16 Aug 2004 03:06:45 - 1.9.2.1 +++ Torque.master 24 Aug 2004 04:14:32 - 1.9.2.2 @@ -104,7 +104,7 @@ ## Using commons-dbcp [EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory [EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory [EMAIL PROTECTED]@.pool.defaultMaxActive=10 [EMAIL PROTECTED]@.pool.maxActive=10 [EMAIL PROTECTED]@.pool.testOnBorrow=true [EMAIL PROTECTED]@[EMAIL PROTECTED]@ [EMAIL PROTECTED]@.connection.driver = @DATABASE_DRIVER@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/profile postgres.profile mysql.profile
seade 2004/08/23 21:20:09
Modified:profile postgres.profile mysql.profile
Log:
Tweak the driver jar names.
Revision ChangesPath
1.20 +1 -1 db-torque/profile/postgres.profile
Index: postgres.profile
===
RCS file: /home/cvs/db-torque/profile/postgres.profile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- postgres.profile 21 Jan 2004 16:53:42 - 1.19
+++ postgres.profile 24 Aug 2004 04:20:09 - 1.20
@@ -1,7 +1,7 @@
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
-torque.testDatabaseJar =
${maven.repo.local}/postgresql/jars/postgresql-7.3-jdbc2.jar
+torque.testDatabaseJar =
${maven.repo.local}/postgresql/jars/postgresql-7.3-jdbc3.jar
torque.idMethod = idbroker
#torque.idMethod = native
torque.defaultDatabase = bookstore
1.23 +1 -1 db-torque/profile/mysql.profile
Index: mysql.profile
===
RCS file: /home/cvs/db-torque/profile/mysql.profile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mysql.profile 18 Aug 2003 15:20:09 - 1.22
+++ mysql.profile 24 Aug 2004 04:20:09 - 1.23
@@ -1,7 +1,7 @@
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
-torque.testDatabaseJar = ${maven.repo.local}/mm.mysql/jars/mm.mysql-2.0.13-bin.jar
+torque.testDatabaseJar = ${maven.repo.local}/mm.mysql/jars/mm.mysql-2.0.14-bin.jar
torque.idMethod = idbroker
#torque.idMethod = native
torque.defaultDatabase = bookstore
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs navigation.xml
seade 2004/08/22 16:52:13 Modified:xdocsTag: TORQUE_3_1_BRANCH navigation.xml Log: 3.2 uses the maven generated changes report. Revision ChangesPath No revision No revision 1.11.2.7 +1 -1 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.11.2.6 retrieving revision 1.11.2.7 diff -u -r1.11.2.6 -r1.11.2.7 --- navigation.xml22 Aug 2004 23:50:02 - 1.11.2.6 +++ navigation.xml22 Aug 2004 23:52:13 - 1.11.2.7 @@ -42,7 +42,7 @@ /menu menu name=Development item name=DB Adapters href=/db-adapters.html/ - item name=Changes href=/release-changes.html/ + item name=Changes href=/changes-report.html/ item name=Referenceshref=/references.html/ item name=Todo href=/todo.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs navigation.xml
seade 2004/08/22 16:53:12 Modified:xdocsTag: TORQUE_3_1_BRANCH navigation.xml Log: Oops - wrong branch. Revision ChangesPath No revision No revision 1.11.2.8 +1 -1 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.11.2.7 retrieving revision 1.11.2.8 diff -u -r1.11.2.7 -r1.11.2.8 --- navigation.xml22 Aug 2004 23:52:13 - 1.11.2.7 +++ navigation.xml22 Aug 2004 23:53:12 - 1.11.2.8 @@ -42,7 +42,7 @@ /menu menu name=Development item name=DB Adapters href=/db-adapters.html/ - item name=Changes href=/changes-report.html/ + item name=Changes href=/changes.html/ item name=Referenceshref=/references.html/ item name=Todo href=/todo.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs navigation.xml
seade 2004/08/22 16:53:51 Modified:xdocsnavigation.xml Log: 3.2 uses the maven generated changes report. Revision ChangesPath 1.19 +1 -1 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- navigation.xml20 Aug 2004 04:28:35 - 1.18 +++ navigation.xml22 Aug 2004 23:53:51 - 1.19 @@ -43,7 +43,7 @@ /menu menu name=Development item name=DB Adapters href=/db-adapters.html/ - item name=Changes href=/release-changes.html/ + item name=Changes href=/changes-report.html/ item name=Referenceshref=/references.html/ item name=Todo href=/todo.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/22 17:29:52
Modified:src/generator/src/java/org/apache/torque/engine/database/model
Tag: TORQUE_3_1_BRANCH Table.java Index.java
xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Multiple unique constraints and indexes on a single table are now allocated
sequential names (previously duplicate names were being allocated).
Revision ChangesPath
No revision
No revision
1.3.2.4 +11 -5
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Table.java
Index: Table.java
===
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Table.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- Table.java20 May 2004 04:34:15 - 1.3.2.3
+++ Table.java23 Aug 2004 00:29:52 - 1.3.2.4
@@ -245,10 +245,16 @@
}
}
-// NOTE: Most RDBMSes can apparently name unique column
-// constraints/indices themselves (using MySQL and Oracle
-// as test cases), so we'll assume that we needn't add an
-// entry to the system name list for these.
+for (i = 0, size = unices.size(); i size; i++)
+{
+Unique unique = (Unique) unices.get(i);
+name = unique.getName();
+if (StringUtils.isEmpty(name))
+{
+name = acquireConstraintName(U, i + 1);
+unique.setName(name);
+}
+}
}
catch (EngineException nameAlreadyInUse)
{
1.2.2.3 +1 -39
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Index.java
Index: Index.java
===
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Index.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- Index.java20 May 2004 04:34:15 - 1.2.2.2
+++ Index.java23 Aug 2004 00:29:52 - 1.2.2.3
@@ -73,7 +73,6 @@
if (indexColumns.size() 0)
{
this.indexColumns = indexColumns;
-createName();
if (log.isDebugEnabled())
{
@@ -89,31 +88,6 @@
}
/**
- * Creates a name for the index using the NameFactory.
- *
- * @throws EngineException if the name could not be created
- */
-private void createName() throws EngineException
-{
-Table table = getTable();
-List inputs = new ArrayList(4);
-inputs.add(table.getDatabase());
-inputs.add(table.getName());
-if (isUnique())
-{
-inputs.add(U);
-}
-else
-{
-inputs.add(I);
-}
-// ASSUMPTION: This Index not yet added to the list.
-inputs.add(new Integer(table.getIndices().length + 1));
-indexName = NameFactory.generateName(
-NameFactory.CONSTRAINT_GENERATOR, inputs);
-}
-
-/**
* Imports index from an XML specification
*
* @param attrib the xml attributes
@@ -140,18 +114,6 @@
*/
public String getName()
{
-if (indexName == null)
-{
-try
-{
-// generate an index name if we don't have a supplied one
-createName();
-}
-catch (EngineException e)
-{
-// still no name
-}
-}
return indexName;
}
No revision
No revision
1.3.2.13 +5 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -u -r1.3.2.12 -r1.3.2.13
--- release-changes.xml 20 Aug 2004 11:47:18 - 1.3.2.12
+++ release-changes.xml 23 Aug 2004 00:29:52 - 1.3.2.13
@@ -34,6 +34,11 @@
p
ul
li
+ Multiple unique constraints and indexes on a single table are now
+ allocated sequential names (previously duplicate names were being
+ allocated).
+/li
+li
Backported a few template fixes from Serge Huber that were committed
to HEAD some time ago.
/li
-
To unsubscribe, e-mail: [EMAIL
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/22 17:30:10
Modified:src/generator/src/java/org/apache/torque/engine/database/model
Table.java Index.java
xdocschanges.xml
Log:
Multiple unique constraints and indexes on a single table are now allocated
sequential names (previously duplicate names were being allocated).
Revision ChangesPath
1.8 +11 -5
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Table.java
Index: Table.java
===
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Table.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Table.java31 Mar 2004 14:34:33 - 1.7
+++ Table.java23 Aug 2004 00:30:10 - 1.8
@@ -237,10 +237,16 @@
}
}
-// NOTE: Most RDBMSes can apparently name unique column
-// constraints/indices themselves (using MySQL and Oracle
-// as test cases), so we'll assume that we needn't add an
-// entry to the system name list for these.
+for (i = 0, size = unices.size(); i size; i++)
+{
+Unique unique = (Unique) unices.get(i);
+name = unique.getName();
+if (StringUtils.isEmpty(name))
+{
+name = acquireConstraintName(U, i + 1);
+unique.setName(name);
+}
+}
}
catch (EngineException nameAlreadyInUse)
{
1.6 +1 -39
db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Index.java
Index: Index.java
===
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Index.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Index.java22 Feb 2004 06:27:19 - 1.5
+++ Index.java23 Aug 2004 00:30:10 - 1.6
@@ -73,7 +73,6 @@
if (!indexColumns.isEmpty())
{
this.indexColumns = indexColumns;
-createName();
if (log.isDebugEnabled())
{
@@ -89,31 +88,6 @@
}
/**
- * Creates a name for the index using the NameFactory.
- *
- * @throws EngineException if the name could not be created
- */
-private void createName() throws EngineException
-{
-Table table = getTable();
-List inputs = new ArrayList(4);
-inputs.add(table.getDatabase());
-inputs.add(table.getName());
-if (isUnique())
-{
-inputs.add(U);
-}
-else
-{
-inputs.add(I);
-}
-// ASSUMPTION: This Index not yet added to the list.
-inputs.add(new Integer(table.getIndices().size() + 1));
-indexName = NameFactory.generateName(
-NameFactory.CONSTRAINT_GENERATOR, inputs);
-}
-
-/**
* Imports index from an XML specification
*
* @param attrib the xml attributes
@@ -140,18 +114,6 @@
*/
public String getName()
{
-if (indexName == null)
-{
-try
-{
-// generate an index name if we don't have a supplied one
-createName();
-}
-catch (EngineException e)
-{
-// still no name
-}
-}
return indexName;
}
1.129 +5 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- changes.xml 20 Aug 2004 11:48:46 - 1.128
+++ changes.xml 23 Aug 2004 00:30:10 - 1.129
@@ -9,6 +9,11 @@
release version=3.2-alpha date=in CVS
action dev='seade' type='fix'
+Multiple unique constraints and indexes on a single table are now
+allocated sequential names (previously duplicate names were being
+allocated).
+ /action
+ action dev='seade' type='fix'
Generate sequences correctly for PostgreSQL (i.e. leave it to
PostgreSQL). Note that schemas produced from the database using
the codetorque:jdbc/code goal are not yet handling sequences
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque project.xml
seade 2004/08/22 18:22:11 Modified:.Tag: TORQUE_3_1_BRANCH project.xml Log: Add license to site. Revision ChangesPath No revision No revision 1.103.2.9 +9 -0 db-torque/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.103.2.8 retrieving revision 1.103.2.9 diff -u -r1.103.2.8 -r1.103.2.9 --- project.xml 16 Aug 2004 22:32:24 - 1.103.2.8 +++ project.xml 23 Aug 2004 01:22:11 - 1.103.2.9 @@ -206,6 +206,14 @@ /contributor /contributors + licenses +license + nameThe Apache Software License, Version 2.0/name + urlhttp://www.apache.org/licenses/LICENSE-2.0.html/url + distributionrepo/distribution +/license + /licenses + dependencies dependency idavalon-framework/id @@ -328,6 +336,7 @@ reportmaven-javadoc-plugin/report reportmaven-jxr-plugin/report reportmaven-junit-report-plugin/report +reportmaven-license-plugin/report reportmaven-tasklist-plugin/report reportmaven-pmd-plugin/report reportmaven-simian-plugin/report - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque project-base.xml
seade 2004/08/22 18:23:05 Modified:.project-base.xml Log: Add license to site. Revision ChangesPath 1.8 +9 -0 db-torque/project-base.xml Index: project-base.xml === RCS file: /home/cvs/db-torque/project-base.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project-base.xml 14 Aug 2004 13:09:58 - 1.7 +++ project-base.xml 23 Aug 2004 01:23:05 - 1.8 @@ -210,6 +210,14 @@ /contributor /contributors + licenses +license + nameThe Apache Software License, Version 2.0/name + urlhttp://www.apache.org/licenses/LICENSE-2.0.html/url + distributionrepo/distribution +/license + /licenses + build nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress sourceDirectorysrc/java/sourceDirectory @@ -237,6 +245,7 @@ reportmaven-javadoc-plugin/report reportmaven-jxr-plugin/report reportmaven-junit-report-plugin/report +reportmaven-license-plugin/report reportmaven-tasklist-plugin/report reportmaven-pmd-plugin/report reportmaven-simian-plugin/report - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/java/org/apache/torque TorqueInstance.java
seade 2004/08/22 19:21:39
Modified:src/java/org/apache/torque Tag: TORQUE_3_1_BRANCH
TorqueInstance.java
Log:
Removed unused import and unnecessary cast.
Revision ChangesPath
No revision
No revision
1.5.2.4 +2 -4 db-torque/src/java/org/apache/torque/TorqueInstance.java
Index: TorqueInstance.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- TorqueInstance.java 16 Aug 2004 22:32:24 - 1.5.2.3
+++ TorqueInstance.java 23 Aug 2004 02:21:39 - 1.5.2.4
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -298,8 +297,7 @@
log.debug(init( + configFile + ));
try
{
-Configuration conf = (Configuration)
-new PropertiesConfiguration(configFile);
+Configuration conf = new PropertiesConfiguration(configFile);
log.debug(Config Object is + conf);
init(conf);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/java/org/apache/torque TorqueInstance.java
seade 2004/08/22 19:54:16
Modified:xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
src/java/org/apache/torque Tag: TORQUE_3_1_BRANCH
TorqueInstance.java
Log:
Use adapter in preference to driver when building the database map.
Thanks to Ben Hogan for the patch.
Revision ChangesPath
No revision
No revision
1.3.2.14 +9 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.13
retrieving revision 1.3.2.14
diff -u -r1.3.2.13 -r1.3.2.14
--- release-changes.xml 23 Aug 2004 00:29:52 - 1.3.2.13
+++ release-changes.xml 23 Aug 2004 02:54:15 - 1.3.2.14
@@ -18,6 +18,15 @@
p
ul
li
+ The codeadapter/code property is now used in preference to
+ codedriver/code when building the database map. This allows Torque
+ to work when the driver setting is not what it expects - e.g. if using
+ codecom.mysql/code driver instead of the
+ codeorg.gjt.mm.mysql/code or when using
+ a http=http://www.p6spy.org/;P6Spy/a pass through driver for
+ performance monitoring. Thanks to Ben Hogan for the patch.
+/li
+li
DB2 limit and offset support. Thanks to Augustin Vidovic for the patch.
/li
li
No revision
No revision
1.5.2.5 +5 -4 db-torque/src/java/org/apache/torque/TorqueInstance.java
Index: TorqueInstance.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- TorqueInstance.java 23 Aug 2004 02:21:39 - 1.5.2.4
+++ TorqueInstance.java 23 Aug 2004 02:54:16 - 1.5.2.5
@@ -29,6 +29,7 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -600,10 +601,10 @@
// Setup other ID generators for this map.
try
{
-String key = getDatabaseProperty(name, driver);
-if (key == null || key.length() == 0)
+String key = getDatabaseProperty(name, adapter);
+if (StringUtils.isEmpty(key))
{
-key = getDatabaseProperty(name, adapter);
+key = getDatabaseProperty(name, driver);
}
DB db = DBFactory.create(key);
for (int i = 0; i IDGeneratorFactory.ID_GENERATOR_METHODS.length;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/22 19:54:31
Modified:src/java/org/apache/torque TorqueInstance.java
xdocschanges.xml
Log:
Use adapter in preference to driver when building the database map.
Thanks to Ben Hogan for the patch.
Revision ChangesPath
1.8 +5 -4 db-torque/src/java/org/apache/torque/TorqueInstance.java
Index: TorqueInstance.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TorqueInstance.java 20 Aug 2004 04:13:42 - 1.7
+++ TorqueInstance.java 23 Aug 2004 02:54:31 - 1.8
@@ -29,6 +29,7 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -601,10 +602,10 @@
// Setup other ID generators for this map.
try
{
-String key = getDatabaseProperty(name, driver);
-if (key == null || key.length() == 0)
+String key = getDatabaseProperty(name, adapter);
+if (StringUtils.isEmpty(key))
{
-key = getDatabaseProperty(name, adapter);
+key = getDatabaseProperty(name, driver);
}
DB db = DBFactory.create(key);
for (int i = 0; i IDGeneratorFactory.ID_GENERATOR_METHODS.length;
1.130 +10 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- changes.xml 23 Aug 2004 00:30:10 - 1.129
+++ changes.xml 23 Aug 2004 02:54:31 - 1.130
@@ -3,11 +3,21 @@
properties
titleChanges/title
author email=[EMAIL PROTECTED]Martin Poeschl/author
+author email=[EMAIL PROTECTED]Scott Eade/author
/properties
body
release version=3.2-alpha date=in CVS
+ action dev='seade' type='add'
+The codeadapter/code property is now used in preference to
+codedriver/code when building the database map. This allows Torque
+to work when the driver setting is not what it expects - e.g. if using
+codecom.mysql/code driver instead of the
+codeorg.gjt.mm.mysql/code or when using
+a http=http://www.p6spy.org/;P6Spy/a pass through driver for
+performance monitoring. Thanks to Ben Hogan for the patch.
+ /action
action dev='seade' type='fix'
Multiple unique constraints and indexes on a single table are now
allocated sequential names (previously duplicate names were being
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs/tutorial step1.xml
seade 2004/08/22 20:25:21 Modified:xdocsTag: TORQUE_3_1_BRANCH user-guide.xml maven-howto.xml xdocs/tutorial Tag: TORQUE_3_1_BRANCH step1.xml Log: Correct plugin download groupId. Revision ChangesPath No revision No revision 1.12.2.3 +1 -1 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -u -r1.12.2.2 -r1.12.2.3 --- user-guide.xml19 Aug 2004 14:32:23 - 1.12.2.2 +++ user-guide.xml23 Aug 2004 03:25:21 - 1.12.2.3 @@ -76,7 +76,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source p 1.4.2.4 +1 -1 db-torque/xdocs/maven-howto.xml Index: maven-howto.xml === RCS file: /home/cvs/db-torque/xdocs/maven-howto.xml,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- maven-howto.xml 19 Aug 2004 14:32:23 - 1.4.2.3 +++ maven-howto.xml 23 Aug 2004 03:25:21 - 1.4.2.4 @@ -58,7 +58,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source /section No revision No revision 1.3.2.2 +1 -1 db-torque/xdocs/tutorial/step1.xml Index: step1.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step1.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- step1.xml 19 Aug 2004 14:33:48 - 1.3.2.1 +++ step1.xml 23 Aug 2004 03:25:21 - 1.3.2.2 @@ -27,7 +27,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs user-guide.xml maven-howto.xml
seade 2004/08/22 20:27:21 Modified:xdocs/tutorial step1.xml xdocsuser-guide.xml maven-howto.xml Log: Correct plugin download groupId. Revision ChangesPath 1.5 +1 -1 db-torque/xdocs/tutorial/step1.xml Index: step1.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step1.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- step1.xml 19 Aug 2004 14:34:14 - 1.4 +++ step1.xml 23 Aug 2004 03:27:21 - 1.5 @@ -27,7 +27,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source p 1.15 +1 -1 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- user-guide.xml19 Aug 2004 14:34:36 - 1.14 +++ user-guide.xml23 Aug 2004 03:27:21 - 1.15 @@ -76,7 +76,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source p 1.8 +1 -1 db-torque/xdocs/maven-howto.xml Index: maven-howto.xml === RCS file: /home/cvs/db-torque/xdocs/maven-howto.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- maven-howto.xml 19 Aug 2004 14:34:36 - 1.7 +++ maven-howto.xml 23 Aug 2004 03:27:21 - 1.8 @@ -58,7 +58,7 @@ source![CDATA[ !!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! !!! TO DO - Confirm these values !!! -maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 ]]/source /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/templates/sql/base/mssql drop.vm
seade 2004/08/20 04:47:19 Modified:src/generator/src/templates/sql/base/hypersonic Tag: TORQUE_3_1_BRANCH drop.vm src/generator/src/templates/sql/base/postgresql Tag: TORQUE_3_1_BRANCH table.vm drop.vm xdocsTag: TORQUE_3_1_BRANCH release-changes.xml src/generator/src/templates/sql/base/mssql Tag: TORQUE_3_1_BRANCH drop.vm Removed: src/generator/src/templates/sql/base/postgresql Tag: TORQUE_3_1_BRANCH sequence.vm Log: Generate sequences correctly for PostgreSQL (i.e. leave it to PostgreSQL). Note that schemas produced from the database using the torque:jdbc goal are not yet handling sequences correctly. Backported a few template fixes from Serge Huber that were committed to HEAD some time ago. Revision ChangesPath No revision No revision 1.1.2.1 +1 -1 db-torque/src/generator/src/templates/sql/base/hypersonic/drop.vm Index: drop.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/drop.vm,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- drop.vm 10 Feb 2003 13:18:48 - 1.1 +++ drop.vm 20 Aug 2004 11:47:18 - 1.1.2.1 @@ -1 +1 @@ -drop table if exists $table.Name; +drop table $table.Name if exists; No revision No revision 1.1.2.1 +0 -2 db-torque/src/generator/src/templates/sql/base/postgresql/table.vm Index: table.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/postgresql/table.vm,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- table.vm 10 Feb 2003 13:18:47 - 1.1 +++ table.vm 20 Aug 2004 11:47:18 - 1.1.2.1 @@ -3,8 +3,6 @@ -- $table.Name - $generator.parse($basepath/drop.vm, , table, $tbl) -#set ( $sequence = $generator.parse($basepath/sequence.vm, , table, $tbl) ) -#if ($sequence.length()0)$sequence#end CREATE TABLE $table.Name ( 1.1.2.1 +1 -4 db-torque/src/generator/src/templates/sql/base/postgresql/drop.vm Index: drop.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/postgresql/drop.vm,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- drop.vm 10 Feb 2003 13:18:47 - 1.1 +++ drop.vm 20 Aug 2004 11:47:18 - 1.1.2.1 @@ -1,4 +1 @@ -DROP TABLE $table.Name; -#if ($table.IdMethod == native) -DROP SEQUENCE $table.SequenceName; -#end +DROP TABLE $table.Name CASCADE; No revision No revision 1.3.2.12 +10 -0 db-torque/xdocs/release-changes.xml Index: release-changes.xml === RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v retrieving revision 1.3.2.11 retrieving revision 1.3.2.12 diff -u -r1.3.2.11 -r1.3.2.12 --- release-changes.xml 20 Aug 2004 03:19:13 - 1.3.2.11 +++ release-changes.xml 20 Aug 2004 11:47:18 - 1.3.2.12 @@ -34,6 +34,16 @@ p ul li + Backported a few template fixes from Serge Huber that were committed + to HEAD some time ago. +/li +li + Generate sequences correctly for PostgreSQL (i.e. leave it to + PostgreSQL). Note that schemas produced from the database using + the codetorque:jdbc/code goal are not yet handling sequences + correctly. +/li +li Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1, commons-lang-2.0 and commons-logging-1.0.4. /li No revision No revision 1.1.2.1 +1 -1 db-torque/src/generator/src/templates/sql/base/mssql/drop.vm Index: drop.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/mssql/drop.vm,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- drop.vm 10 Feb 2003 13:18:49 - 1.1 +++ drop.vm 20 Aug 2004 11:47:19 - 1.1.2.1 @@ -26,4 +26,4 @@ DEALLOCATE refcursor DROP TABLE $table.Name END - +; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/20 04:48:47 Modified:src/generator/src/templates/sql/base/postgresql drop.vm table.vm xdocschanges.xml Removed: src/generator/src/templates/sql/base/postgresql sequence.vm Log: Generate sequences correctly for PostgreSQL (i.e. leave it to PostgreSQL). Note that schemas produced from the database using the torque:jdbc goal are not yet handling sequences correctly. Revision ChangesPath 1.3 +0 -3 db-torque/src/generator/src/templates/sql/base/postgresql/drop.vm Index: drop.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/postgresql/drop.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- drop.vm 24 Mar 2004 02:29:46 - 1.2 +++ drop.vm 20 Aug 2004 11:48:46 - 1.3 @@ -1,4 +1 @@ DROP TABLE $table.Name CASCADE; -#if ($table.IdMethod == native) -DROP SEQUENCE $table.SequenceName; -#end 1.2 +0 -2 db-torque/src/generator/src/templates/sql/base/postgresql/table.vm Index: table.vm === RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/postgresql/table.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- table.vm 10 Feb 2003 13:18:47 - 1.1 +++ table.vm 20 Aug 2004 11:48:46 - 1.2 @@ -3,8 +3,6 @@ -- $table.Name - $generator.parse($basepath/drop.vm, , table, $tbl) -#set ( $sequence = $generator.parse($basepath/sequence.vm, , table, $tbl) ) -#if ($sequence.length()0)$sequence#end CREATE TABLE $table.Name ( 1.128 +6 -0 db-torque/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- changes.xml 20 Aug 2004 03:18:22 - 1.127 +++ changes.xml 20 Aug 2004 11:48:46 - 1.128 @@ -8,6 +8,12 @@ body release version=3.2-alpha date=in CVS + action dev='seade' type='fix' +Generate sequences correctly for PostgreSQL (i.e. leave it to +PostgreSQL). Note that schemas produced from the database using +the codetorque:jdbc/code goal are not yet handling sequences +correctly. + /action action dev='henning' type='update' Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1 and commons-logging-1.0.4. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs configuration-howto.xml
seade 2004/08/19 00:19:45 Modified:xdocsconfiguration-howto.xml Log: Corrected property name. Revision ChangesPath 1.4 +1 -1 db-torque/xdocs/configuration-howto.xml Index: configuration-howto.xml === RCS file: /home/cvs/db-torque/xdocs/configuration-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configuration-howto.xml 13 Aug 2004 05:10:50 - 1.3 +++ configuration-howto.xml 19 Aug 2004 07:19:45 - 1.4 @@ -129,7 +129,7 @@ /p source![CDATA[ -torque.dsfactory.bookstore.pool.defaultMaxActive=30 +torque.dsfactory.bookstore.pool.maxActive=30 torque.dsfactory.bookstore.pool.testOnBorrow=true torque.dsfactory.bookstore.pool.validationQuery=SELECT 1 ]]/source - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs configuration-howto.xml
seade 2004/08/19 00:20:51 Modified:xdocsTag: TORQUE_3_1_BRANCH configuration-howto.xml Log: Corrected property name. Revision ChangesPath No revision No revision 1.1.2.2 +1 -1 db-torque/xdocs/configuration-howto.xml Index: configuration-howto.xml === RCS file: /home/cvs/db-torque/xdocs/configuration-howto.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- configuration-howto.xml 13 Aug 2004 05:11:07 - 1.1.2.1 +++ configuration-howto.xml 19 Aug 2004 07:20:51 - 1.1.2.2 @@ -170,7 +170,7 @@ /p source![CDATA[ -torque.dsfactory.bookstore.pool.defaultMaxActive=30 +torque.dsfactory.bookstore.pool.maxActive=30 torque.dsfactory.bookstore.pool.testOnBorrow=true torque.dsfactory.bookstore.pool.validationQuery=SELECT 1 ]]/source - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs navigation.xml
seade 2004/08/19 06:58:49 Modified:src/generator/xdocs navigation.xml xdocsnavigation.xml src/maven-plugin/xdocs navigation.xml Log: Use local site references. Revision ChangesPath 1.6 +3 -3 db-torque/src/generator/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/navigation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- navigation.xml4 Mar 2004 03:44:25 - 1.5 +++ navigation.xml19 Aug 2004 13:58:49 - 1.6 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque// - item name=generator href=http://db.apache.org/torque/generator// - item name=maven-plugin href=http://db.apache.org/torque/maven-plugin// + item name=runtime href=/torque// + item name=generator href=/torque/generator// + item name=maven-plugin href=/torque/maven-plugin// /links menu name=Overview 1.17 +4 -4 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- navigation.xml16 Aug 2004 04:04:04 - 1.16 +++ navigation.xml19 Aug 2004 13:58:49 - 1.17 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque// - item name=generator href=http://db.apache.org/torque/generator// - item name=maven-plugin href=http://db.apache.org/torque/maven-plugin// + item name=runtime href=/torque// + item name=generator href=/torque/generator// + item name=maven-plugin href=/torque/maven-plugin// /links menu name=Torque @@ -37,7 +37,7 @@ /menu menu name=Database Howto Guides item name=MS SQL Server Howto href=/mssql-howto.html/ - item name=Oracle Howto href=/oracle-howto.html/ + item name=Oracle Howto href=/oracle-howto.html/ item name=Postgres Howtohref=/postgres-howto.html/ item name=Sybase Howto href=/sybase-howto.html/ /menu 1.5 +3 -3 db-torque/src/maven-plugin/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- navigation.xml4 Mar 2004 03:44:25 - 1.4 +++ navigation.xml19 Aug 2004 13:58:49 - 1.5 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque// - item name=generator href=http://db.apache.org/torque/generator// - item name=maven-plugin href=http://db.apache.org/torque/maven-plugin// + item name=runtime href=/torque// + item name=generator href=/torque/generator// + item name=maven-plugin href=/torque/maven-plugin// /links menu name=Overview - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs navigation.xml
seade 2004/08/19 07:00:29 Modified:src/generator/xdocs Tag: TORQUE_3_1_BRANCH navigation.xml xdocsTag: TORQUE_3_1_BRANCH navigation.xml src/maven-plugin/xdocs Tag: TORQUE_3_1_BRANCH navigation.xml Log: Use local site references. Revision ChangesPath No revision No revision 1.3.2.3 +3 -3 db-torque/src/generator/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/navigation.xml,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- navigation.xml3 Mar 2004 13:30:56 - 1.3.2.2 +++ navigation.xml19 Aug 2004 14:00:29 - 1.3.2.3 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque-31// - item name=generator href=http://db.apache.org/torque-31/generator// - item name=maven-plugin href=http://db.apache.org/torque-31/maven-plugin// + item name=runtime href=/torque-31// + item name=generator href=/torque-31/generator// + item name=maven-plugin href=/torque-31/maven-plugin// /links menu name=Overview No revision No revision 1.11.2.4 +4 -4 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -r1.11.2.3 -r1.11.2.4 --- navigation.xml16 Aug 2004 04:03:42 - 1.11.2.3 +++ navigation.xml19 Aug 2004 14:00:29 - 1.11.2.4 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque-31// - item name=generator href=http://db.apache.org/torque-31/generator// - item name=maven-plugin href=http://db.apache.org/torque-31/maven-plugin// + item name=runtime href=/torque-31// + item name=generator href=/torque-31/generator// + item name=maven-plugin href=/torque-31/maven-plugin// /links menu name=Torque @@ -35,7 +35,7 @@ /menu menu name=Database Howto Guides item name=MS SQL Server Howto href=/mssql-howto.html/ - item name=Oracle Howto href=/oracle-howto.html/ + item name=Oracle Howto href=/oracle-howto.html/ item name=Postgres Howtohref=/postgres-howto.html/ item name=Sybase Howto href=/sybase-howto.html/ /menu No revision No revision 1.1.2.4 +3 -3 db-torque/src/maven-plugin/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/navigation.xml,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- navigation.xml3 Mar 2004 13:30:56 - 1.1.2.3 +++ navigation.xml19 Aug 2004 14:00:29 - 1.1.2.4 @@ -5,9 +5,9 @@ body links - item name=runtime href=http://db.apache.org/torque-31// - item name=generator href=http://db.apache.org/torque-31/generator// - item name=maven-plugin href=http://db.apache.org/torque-31/maven-plugin// + item name=runtime href=/torque-31// + item name=generator href=/torque-31/generator// + item name=maven-plugin href=/torque-31/maven-plugin// /links menu name=Overview - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs index.xml
seade 2004/08/19 07:03:36 Modified:src/maven-plugin/xdocs Tag: TORQUE_3_1_BRANCH index.xml Log: Provide some information concerning the release status of the Torque maven-plugin. Revision ChangesPath No revision No revision 1.4.2.2 +10 -3 db-torque/src/maven-plugin/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/index.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- index.xml 23 Oct 2003 10:17:24 - 1.4.2.1 +++ index.xml 19 Aug 2004 14:03:36 - 1.4.2.2 @@ -5,15 +5,16 @@ titleMaven Torque Plugin/title author email=[EMAIL PROTECTED]Stephen Haberman/author author email=[EMAIL PROTECTED]Quinton McCombs/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body section name=Maven Torque Plugin p This plugin provides easy intergration with -a href=http://db.apache.org/torque/;Torque/a for your project. This replaces using -the build-torque.xml ant script that previously provided the same -functionality. +a href=http://db.apache.org/torque/;Torque/a for your project. +This replaces using the build-torque.xml ant script that previously +provided the same functionality. /p p By default, the templates used for code generation are found in @@ -25,6 +26,12 @@ see the a href=goals.htmlGoals/a document. The various properties used to configure the plugin are documented in the a href=properties.htmlProperties/a document. + /p + p +We are working on providing a release of the Torque maven-plugin +fairly soon - in the mean time, please see the +a href=../maven-howto.htmlMaven Howto/a for installation and +configuration instructions. /p /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/conf simplelog.properties log4j.properties
seade 2004/08/19 07:27:24 Modified:src/generator/src/conf simplelog.properties log4j.properties Log: Switch logging from DEBUG to INFO - this will make the day of all thos people that for some reason have the torque-gen jar in their classpath at runtime. Revision ChangesPath 1.2 +1 -1 db-torque/src/generator/src/conf/simplelog.properties Index: simplelog.properties === RCS file: /home/cvs/db-torque/src/generator/src/conf/simplelog.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simplelog.properties 26 Jun 2003 07:01:23 - 1.1 +++ simplelog.properties 19 Aug 2004 14:27:23 - 1.2 @@ -3,4 +3,4 @@ # #set log levels -org.apache.commons.logging.simplelog.defaultlog=debug +org.apache.commons.logging.simplelog.defaultlog=info 1.2 +2 -2 db-torque/src/generator/src/conf/log4j.properties Index: log4j.properties === RCS file: /home/cvs/db-torque/src/generator/src/conf/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- log4j.properties 24 Jul 2003 12:40:11 - 1.1 +++ log4j.properties 19 Aug 2004 14:27:23 - 1.2 @@ -12,7 +12,7 @@ # # Turbine goes into Turbine Log # -log4j.category.org.apache.torque-gen = DEBUG, org.apache.torque.engine +log4j.category.org.apache.torque-gen = INFO log4j.additivity.org.apache.torque-gen = false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/conf log4j.properties simplelog.properties
seade 2004/08/19 07:27:47 Modified:src/generator/src/conf Tag: TORQUE_3_1_BRANCH log4j.properties simplelog.properties Log: Switch logging from DEBUG to INFO - this will make the day of all thos people that for some reason have the torque-gen jar in their classpath at runtime. Revision ChangesPath No revision No revision 1.1.2.1 +2 -2 db-torque/src/generator/src/conf/log4j.properties Index: log4j.properties === RCS file: /home/cvs/db-torque/src/generator/src/conf/log4j.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- log4j.properties 24 Jul 2003 12:40:11 - 1.1 +++ log4j.properties 19 Aug 2004 14:27:46 - 1.1.2.1 @@ -12,7 +12,7 @@ # # Turbine goes into Turbine Log # -log4j.category.org.apache.torque-gen = DEBUG, org.apache.torque.engine +log4j.category.org.apache.torque-gen = INFO log4j.additivity.org.apache.torque-gen = false 1.1.2.1 +1 -1 db-torque/src/generator/src/conf/simplelog.properties Index: simplelog.properties === RCS file: /home/cvs/db-torque/src/generator/src/conf/simplelog.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- simplelog.properties 26 Jun 2003 07:01:23 - 1.1 +++ simplelog.properties 19 Aug 2004 14:27:46 - 1.1.2.1 @@ -3,4 +3,4 @@ # #set log levels -org.apache.commons.logging.simplelog.defaultlog=debug +org.apache.commons.logging.simplelog.defaultlog=info - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/src/conf build-torque.xml
seade 2004/08/19 07:29:10
Modified:src/generator/src/conf Tag: TORQUE_3_1_BRANCH
build-torque.xml
Log:
Point to the correct jar file.
Revision ChangesPath
No revision
No revision
1.8.2.2 +1 -1 db-torque/src/generator/src/conf/build-torque.xml
Index: build-torque.xml
===
RCS file: /home/cvs/db-torque/src/generator/src/conf/build-torque.xml,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- build-torque.xml 3 Sep 2003 17:40:55 - 1.8.2.1
+++ build-torque.xml 19 Aug 2004 14:29:10 - 1.8.2.2
@@ -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-gen-3.1.jar/
+ property name=torque.jar value=torque-gen-3.1.1-dev.jar/
!--
Build the classpath. Specifically point to each file we're including to avoid
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs user-guide.xml criteria-howto.xml peers-howto.xml maven-howto.xml managers-cache.xml developer-guide.xml
seade 2004/08/19 07:32:24 Modified:xdocsTag: TORQUE_3_1_BRANCH user-guide.xml criteria-howto.xml peers-howto.xml maven-howto.xml managers-cache.xml developer-guide.xml Log: A vast array of documentation updates - long overdue. Revision ChangesPath No revision No revision 1.12.2.2 +222 -53 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -r1.12.2.1 -r1.12.2.2 --- user-guide.xml13 Aug 2004 05:56:43 - 1.12.2.1 +++ user-guide.xml19 Aug 2004 14:32:23 - 1.12.2.2 @@ -6,6 +6,7 @@ titleTorque User's Guide/title author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -18,13 +19,13 @@ a href=#About this GuideAbout this Guide/a /li li - a href=#Torque Directory StructureTorque Directory Structure/a + a href=#Torque componentsTorque components/a /li li - a href=#Quick Start GuideQuick Start Guide/a + a href=#Installing TorqueInstalling Torque/a /li li - a href=#Configuring TorqueConfiguring Torque/a + a href=#Quick Start GuideQuick Start Guide/a /li /ol /p @@ -34,76 +35,72 @@ section name=About this Guide p - The Torque User's guide is intended to help those who intend + This User Guide is intended to help those who want to incorporate Torque into their project to provide a means of persistence for application objects. /p /section -section name=Torque Directory Structure - -p - Here is what the Torque directory structure looks like. There are slight - differences between the stand-alone and TDK versions but nothing - significant: -/p - -source![CDATA[ -torque/ -lib/ -- Jar files required by Torque (stand-alone version) -schema/ --- Project specific XML database descriptor. -templates/--- Velocity templates used for source generation. -src/ --- Target location for output (stand-alone version). - -build-torque.xml --- Ant build file that controls Torque. - (not named build.xml to make it easier to use it - from your projects build.xml) -build.properties --- Properties file that controls Torque behaviour. -]]/source +section name=Torque components p - A typical user of Torque would really only ever need to edit the - embuild.properties/em file in base directory, and the - emproject-schema.xml/em in the strongschema/strong directory. We'll - quickly go over each of these files and some of options you have using Torque. + Torque consists of two main components: + ul +li + a href=/generator/Generator/a - The Torque generator uses a single XML + database schema file to generate the SQL for your target database and + Torque's Peer-based object relational model. The generator can be + executed using the Torque a href=/maven-plugin/maven-plugin/a or + an a href=http://ant.apache.org/;Ant/a build file. +/li +li + a href=/Runtime/a - The Torque runtime is required in order to + compile and use of the classes produced by the generator. +/li + /ul /p /section -section name=Quick Start Guide +section name=Installing Torque p - For those who just want to see Torque go all you have to do is select your - target database and target package in embuild.properties/em, edit the - emproject-schema.xml/em to suit your needs, then type - strongant -f build-torque.xml/strong. - That's it! + If you have not already done so, download and install + a href=http://maven.apache.org/;Maven/a. You then need to obtain the + Torque maven plugin. The a href=../maven-howto.htmlMaven Howto/a + includes details of how to build the maven plugin from source, but you can + easily install a binary distribution thus: /p -p - You will probably want to set the emproject/em property in the - embuild.properties/em file eventually so that your generated sources have names - that reflect your project name, but you can do that later :-). You also have to - remember that if you change the emproject/em property that you have to - change the name of your project XML database schema to match! -/p +source![CDATA[ +!!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! +!!! TO DO - Confirm
cvs commit: db-torque/xdocs/tutorial step1.xml step4.xml index.xml step3.xml step2.xml
seade 2004/08/19 07:34:14 Modified:xdocs/tutorial step1.xml step4.xml index.xml step3.xml step2.xml Log: A vast array of documentation updates - long overdue. Revision ChangesPath 1.4 +26 -18db-torque/xdocs/tutorial/step1.xml Index: step1.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step1.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- step1.xml 11 May 2003 12:59:07 - 1.3 +++ step1.xml 19 Aug 2004 14:34:14 - 1.4 @@ -4,39 +4,47 @@ properties titleTorque Tutorial/title author email=[EMAIL PROTECTED]Pete Kazmier/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body section name=Step 1: Obtaining the Torque Distribution p - First, you need to obtain the Torque - a href=http://jakarta.apache.org/builds/jakarta-turbine/torque/release/; - distribution/a. - Note that for this tutorial, you should NOT use the CVS version - of db-torque instead of the normal release version, since the - Torque CVS tree has a differing directory layout; thus it's unsuitable - for this example (at least if you're a newbie who doesn't know how to - configure the CVS version properly, which is probably true - for most people that are reading this tutorial). + For this tutorial we will be using the maven plugin for Torque 3.1.1 to + generate our object model classes and the Torque 3.1.1 runtime for our + application that makes use of the generated classes. /p p - After you have obtained your copy of the Torque, you can either - unpack the jar and integrate all of the Torque files into your - source tree, or keep Torque in the jar and use it via the classpath. + If you have not already done so, download and install + a href=http://maven.apache.org/;Maven/a. You then need to obtain the + Torque maven plugin. The a href=../maven-howto.htmlMaven Howto/a + includes details of how to build the maven plugin from source, but you can + easily install a binary distribution thus: /p +source![CDATA[ +!!! TO DO - The binary plugn is yet to be deployed, in the mean time you must build the plugin from source. !!! +!!! TO DO - Confirm these values !!! +maven plugin:download -DartifactId=maven-torque-plugin -DgroupId=maven-torque-plugin -Dversion=3.1.1 +]]/source + p - This tutorial will take the former approach. See a href=../jar-guide.htmljar - guide/a for a description of the latter approach. + At runtime the generated object model classes need access to the Torque + runtime distribution and associated libraries - these are available from the + a href=http://jakarta.apache.org/builds/jakarta-turbine/torque/release/3.1.1/; + Downloads page/a (the file to download is torque-3.1.1.tar.gz or + torque-3.1.1.zip, depending on your development platform). We will cover + what to do with this file in a later step. /p +/section + +section name=Where to next + p - You need to unpack the Torque jar to a directory where - you want to develop your application. This will create - a directory called emtorque/em. It is here that you - will configure Torque and build your application. + Next we will look at a href=step2.htmlConfiguring Torque/a. /p /section 1.5 +238 -237 db-torque/xdocs/tutorial/step4.xml Index: step4.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step4.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- step4.xml 5 Jan 2004 00:33:47 - 1.4 +++ step4.xml 19 Aug 2004 14:34:14 - 1.5 @@ -4,6 +4,7 @@ properties titleTorque Tutorial - Step 4 - Writing a Sample Application/title author email=[EMAIL PROTECTED]Pete Kazmier/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -33,7 +34,7 @@ and emBaseBookPeer/em) contain Torque-generated logic and should bnot/b be modified because Torque will overwrite your changes if you happen to generate -your object model again (via emant/em). Any +your object model again. Any business logic that you might want to add should be placed in the emBook/em and emBookPeer/em classes. This is covered later in the tutorial. @@ -94,7 +95,7 @@ database schema): instantiate a new emAuthor/em object, invoke the object's emsetFirstName/em and emsetLastName/em methods with appropriate - values, then call the emsave/em method. Thats + values, then call the emsave/em method. That's it. The following is from the sample application: /p @@ -177,9 +178,9 @@ source![CDATA[ /* -* Using the convenience methods to handle
cvs commit: db-torque/xdocs criteria-howto.xml user-guide.xml developer-guide.xml managers-cache.xml peers-howto.xml maven-howto.xml
seade 2004/08/19 07:34:37 Modified:xdocscriteria-howto.xml user-guide.xml developer-guide.xml managers-cache.xml peers-howto.xml maven-howto.xml Log: A vast array of documentation updates - long overdue. Revision ChangesPath 1.4 +13 -13db-torque/xdocs/criteria-howto.xml Index: criteria-howto.xml === RCS file: /home/cvs/db-torque/xdocs/criteria-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- criteria-howto.xml5 Dec 2003 05:04:37 - 1.3 +++ criteria-howto.xml19 Aug 2004 14:34:36 - 1.4 @@ -23,7 +23,8 @@ section name=Using Criteria to create Joins p -This example will use the related tables in the Turbine Security system +This example will use the related tables in the +a href=http://jakarta.apache.org/turbine/;Turbine/a Security system between the Turbine_Role and Turbine_Permission tables, with the bridging table, Turbine_Role_Permission. The relationship between these tables are in the Core Schema document, with Turbine_Role and Turbine_Permission both @@ -99,8 +100,10 @@ p One of the common clauses in an SQL Query is the ORDER BY clause. This can - be emulated with the Criteria Object via the addOrderByColumn(String - columnname) method. For the Role example, the Role OM Objects in the + be emulated with the Criteria Object via the + addAscendingOrderByColumn(String columnname) and + addDescendingOrderByColumn(String columnname) methods. For the Role + example, the Role OM Objects in the returned Vector can be ordered by the TURBINE_ROLE columns, ROLE_ID or NAME. If the column chosen to order by is the ROLE_ID, the returned Vector is ordered in numbers, if the NAME is the ordered column, the Vector @@ -112,7 +115,7 @@ criteria.addJoin(PermissionPeer.PERMISSION_ID,RolePermissionPeer.PERMISSION_ID); criteria.addJoin(RolePermissionPeer.ROLE_ID, RolePeer.ROLE_ID); criteria.setDistinct(); -criteria.addOrderByColumn(RolePeer.NAME); +criteria.addAscendingOrderByColumn(RolePeer.NAME); List roles = RolePeer.doSelect(criteria); /source @@ -144,7 +147,7 @@ criteria.addJoin(GroupPeer.GROUP_ID, UserGroupRolePeer.GROUP_ID); criteria.addJoin(UserGroupRolePeer.USER_ID, TurbineUserPeer.USER_ID); criteria.add(TurbineUserPeer.USERNAME, user.getUserName()); -criteria.addOrderByColumn(GroupPeer.NAME); +criteria.addAscendingOrderByColumn(GroupPeer.NAME); criteria.setDistinct(); groups = GroupPeer.doSelect(criteria); @@ -398,18 +401,15 @@ p Criteria contains a toString() method which will output a representation of -the Criteria as a String. As the Criteria to a large extent represents the -statements in a WHERE clause of SQL, the LoggingService can output the SQL. -In the TurbineResources.properties file, under the directive; +the Criteria as a String. A Criteria to a large extent represents the +statements in a WHERE clause of SQL. To see the queries being processed by +your application you can configure the logging system to capture the SQL +by adding the following to your codelog4j.properties/code file: /p source -services.LogginService.sql.level = DEBUG +log4j.logger.org.apache.torque.util.BasePeer = DEBUG /source - - p -Set the level to DEBUG. - /p /section 1.14 +222 -53 db-torque/xdocs/user-guide.xml Index: user-guide.xml === RCS file: /home/cvs/db-torque/xdocs/user-guide.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- user-guide.xml13 Aug 2004 05:58:19 - 1.13 +++ user-guide.xml19 Aug 2004 14:34:36 - 1.14 @@ -6,6 +6,7 @@ titleTorque User's Guide/title author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -18,13 +19,13 @@ a href=#About this GuideAbout this Guide/a /li li - a href=#Torque Directory StructureTorque Directory Structure/a + a href=#Torque componentsTorque components/a /li li - a href=#Quick Start GuideQuick Start Guide/a + a href=#Installing TorqueInstalling Torque/a /li li - a href=#Configuring TorqueConfiguring Torque/a + a href=#Quick Start GuideQuick Start Guide/a /li /ol /p @@ -34,76 +35,72 @@ section name=About this Guide p - The Torque User's guide is intended to help those
cvs commit: db-torque/src/maven-plugin/xdocs index.xml
seade 2004/08/19 20:05:34 Modified:src/maven-plugin/xdocs index.xml Log: Use a relative url. Revision ChangesPath 1.6 +3 -2 db-torque/src/maven-plugin/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 23 Oct 2003 10:19:48 - 1.5 +++ index.xml 20 Aug 2004 03:05:34 - 1.6 @@ -5,14 +5,15 @@ titleMaven Torque Plugin/title author email=[EMAIL PROTECTED]Stephen Haberman/author author email=[EMAIL PROTECTED]Quinton McCombs/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body section name=Maven Torque Plugin p This plugin provides easy intergration with -a href=http://db.apache.org/torque/;Torque/a for your project. This replaces using -the build-torque.xml ant script that previously provided the same +a href=../index.htmlTorque/a for your project. This replaces +using the build-torque.xml ant script that previously provided the same functionality. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs index.xml
seade 2004/08/19 20:06:09 Modified:src/maven-plugin/xdocs Tag: TORQUE_3_1_BRANCH index.xml Log: Use a relative url. Revision ChangesPath No revision No revision 1.4.2.3 +1 -1 db-torque/src/maven-plugin/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/index.xml,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- index.xml 19 Aug 2004 14:03:36 - 1.4.2.2 +++ index.xml 20 Aug 2004 03:06:09 - 1.4.2.3 @@ -12,7 +12,7 @@ section name=Maven Torque Plugin p This plugin provides easy intergration with -a href=http://db.apache.org/torque/;Torque/a for your project. +a href=../index.htmlTorque/a for your project. This replaces using the build-torque.xml ant script that previously provided the same functionality. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs/tutorial step2.xml
seade 2004/08/19 20:07:04 Modified:xdocs/tutorial step2.xml Log: Add a note about not including torque-gen in the project classpath. Revision ChangesPath 1.10 +8 -0 db-torque/xdocs/tutorial/step2.xml Index: step2.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step2.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- step2.xml 19 Aug 2004 14:34:14 - 1.9 +++ step2.xml 20 Aug 2004 03:07:04 - 1.10 @@ -677,6 +677,14 @@ runtime POM/a. /p + p +b + Note: There is no need to include the torque-gen jar file in your project + classath, including it may adversly affect the logging configuration of + your application. +/b + /p + /section section name=Where to next - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs/tutorial step2.xml
seade 2004/08/19 20:07:32 Modified:xdocs/tutorial Tag: TORQUE_3_1_BRANCH step2.xml Log: Add a note about not including torque-gen in the project classpath. Revision ChangesPath No revision No revision 1.6.2.4 +8 -0 db-torque/xdocs/tutorial/step2.xml Index: step2.xml === RCS file: /home/cvs/db-torque/xdocs/tutorial/step2.xml,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -r1.6.2.3 -r1.6.2.4 --- step2.xml 19 Aug 2004 14:33:48 - 1.6.2.3 +++ step2.xml 20 Aug 2004 03:07:32 - 1.6.2.4 @@ -677,6 +677,14 @@ runtime POM/a. /p + p +b + Note: There is no need to include the torque-gen jar file in your project + classath, including it may adversly affect the logging configuration of + your application. +/b + /p + /section section name=Where to next - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs changes.xml
seade 2004/08/19 20:18:22
Modified:xdocschanges.xml
Log:
Mention the last few changes.
Revision ChangesPath
1.127 +15 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- changes.xml 14 Aug 2004 12:01:42 - 1.126
+++ changes.xml 20 Aug 2004 03:18:22 - 1.127
@@ -8,6 +8,21 @@
body
release version=3.2-alpha date=in CVS
+ action dev='henning' type='update'
+Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1 and
+commons-logging-1.0.4.
+ /action
+ action dev='seade' type='fix'
+TRQD26: Problems with Torque tutorial. The Torque tutorial has been
+updated to reflect the separated generator and runtime components and
+to use the Maven plugin.
+ /action
+ action dev='seade' type='fix'
+The generator logging configuration has been changed from DEBUG to INFO
+- this will make the day of all those people that for some reason have
+the torque-gen jar in their classpath at runtime. bHint: You don't
+need this jar to use the Torque generated object model classes./b
+ /action
action dev='mpoeschl' type='fix'
TRQS223: The get${pVarName} method in the Object.vm template does not
return related objects with a negative PK. Thanks to Nick Curry for
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/19 20:19:13 Modified:xdocsTag: TORQUE_3_1_BRANCH release-changes.xml Log: Mention the last few changes. Revision ChangesPath No revision No revision 1.3.2.11 +15 -0 db-torque/xdocs/release-changes.xml Index: release-changes.xml === RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v retrieving revision 1.3.2.10 retrieving revision 1.3.2.11 diff -u -r1.3.2.10 -r1.3.2.11 --- release-changes.xml 19 Aug 2004 01:34:35 - 1.3.2.10 +++ release-changes.xml 20 Aug 2004 03:19:13 - 1.3.2.11 @@ -34,6 +34,21 @@ p ul li + Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1, + commons-lang-2.0 and commons-logging-1.0.4. +/li +li + TRQD26: Problems with Torque tutorial. The Torque tutorial has been + updated to reflect the separated generator and runtime components and + to use the Maven plugin. +/li +li + The generator logging configuration has been changed from DEBUG to INFO + - this will make the day of all those people that for some reason have + the torque-gen jar in their classpath at runtime. bHint: You don't + need this jar to use the Torque generated object model classes./b +/li +li The maven-plugin now provides default values for codetorque.initialIDValue/code and codetorque.initialIDStep/code so that the id table initialization - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque project.xml
seade 2004/08/19 20:29:35 Modified:src/maven-plugin project.xml src/generator project.xml .project.xml Log: Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1 and commons-logging-1.0.4. Revision ChangesPath 1.18 +9 -3 db-torque/src/maven-plugin/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- project.xml 14 Aug 2004 13:35:52 - 1.17 +++ project.xml 20 Aug 2004 03:29:35 - 1.18 @@ -31,27 +31,33 @@ dependencies dependency idcommons-collections/id - version2.1/version + version3.0/version + urlhttp://jakarta.apache.org/commons/collections.html/url /dependency dependency idcommons-configuration/id - version1.0-dev-3.20030607.194155/version + version1.0-rc1/version + urlhttp://jakarta.apache.org/commons//url /dependency dependency idcommons-dbcp/id version1.1/version + urlhttp://jakarta.apache.org/commons//url /dependency dependency idcommons-lang/id version2.0/version + urlhttp://jakarta.apache.org/commons//url /dependency dependency idcommons-logging/id - version1.0.3/version + version1.0.4/version + urlhttp://jakarta.apache.org/commons//url /dependency dependency idlog4j/id version1.2.8/version + urlhttp://logging.apache.org/log4j//url /dependency dependency groupIdtorque/groupId 1.16 +2 -2 db-torque/src/generator/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/src/generator/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 14 Aug 2004 13:09:58 - 1.15 +++ project.xml 20 Aug 2004 03:29:35 - 1.16 @@ -39,7 +39,7 @@ /dependency dependency idcommons-collections/id - version2.1/version + version3.0/version urlhttp://jakarta.apache.org/commons/collections.html/url /dependency dependency @@ -49,7 +49,7 @@ /dependency dependency idcommons-logging/id - version1.0.3/version + version1.0.4/version urlhttp://jakarta.apache.org/commons//url /dependency dependency 1.112 +4 -4 db-torque/project.xml Index: project.xml === RCS file: /home/cvs/db-torque/project.xml,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- project.xml 14 Aug 2004 13:09:58 - 1.111 +++ project.xml 20 Aug 2004 03:29:35 - 1.112 @@ -47,12 +47,12 @@ /dependency dependency idcommons-collections/id - version2.1/version + version3.0/version urlhttp://jakarta.apache.org/commons/collections.html/url /dependency dependency idcommons-configuration/id - version1.0-dev-3.20030607.194155/version + version1.0-rc1/version urlhttp://jakarta.apache.org/commons//url /dependency dependency @@ -67,7 +67,7 @@ /dependency dependency idcommons-logging/id - version1.0.3/version + version1.0.4/version urlhttp://jakarta.apache.org/commons//url /dependency dependency @@ -93,7 +93,7 @@ dependency idlog4j/id version1.2.8/version - urlhttp://jakarta.apache.org/log4j//url + urlhttp://logging.apache.org/log4j//url /dependency dependency idlogkit/id - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/java/org/apache/torque TorqueInstance.java
seade 2004/08/19 21:13:42
Modified:src/java/org/apache/torque TorqueInstance.java
Log:
Upgrade to commons-collections-3.0, commons-configuration-1.0-rc1 and
commons-logging-1.0.4.
Revision ChangesPath
1.7 +3 -3 db-torque/src/java/org/apache/torque/TorqueInstance.java
Index: TorqueInstance.java
===
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TorqueInstance.java 22 Feb 2004 06:19:56 - 1.6
+++ TorqueInstance.java 20 Aug 2004 04:13:42 - 1.7
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -27,6 +26,7 @@
import java.util.Map;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.logging.Log;
@@ -303,7 +303,7 @@
log.debug(Config Object is + conf);
init(conf);
}
-catch (IOException e)
+catch (ConfigurationException e)
{
throw new TorqueException(e);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin/xdocs navigation.xml
seade 2004/08/19 21:28:35 Modified:src/generator/xdocs navigation.xml xdocsnavigation.xml src/maven-plugin/xdocs navigation.xml Log: Correct the relative navigation urls. Revision ChangesPath 1.7 +3 -3 db-torque/src/generator/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/navigation.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- navigation.xml19 Aug 2004 13:58:49 - 1.6 +++ navigation.xml20 Aug 2004 04:28:35 - 1.7 @@ -5,9 +5,9 @@ body links - item name=runtime href=/torque// - item name=generator href=/torque/generator// - item name=maven-plugin href=/torque/maven-plugin// + item name=runtime href=../index.html/ + item name=generator href=/index.html/ + item name=maven-plugin href=../maven-plugin// /links menu name=Overview 1.18 +3 -3 db-torque/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/xdocs/navigation.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- navigation.xml19 Aug 2004 13:58:49 - 1.17 +++ navigation.xml20 Aug 2004 04:28:35 - 1.18 @@ -5,9 +5,9 @@ body links - item name=runtime href=/torque// - item name=generator href=/torque/generator// - item name=maven-plugin href=/torque/maven-plugin// + item name=runtime href=/index.html/ + item name=generator href=/generator// + item name=maven-plugin href=/maven-plugin// /links menu name=Torque 1.6 +3 -3 db-torque/src/maven-plugin/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/db-torque/src/maven-plugin/xdocs/navigation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- navigation.xml19 Aug 2004 13:58:49 - 1.5 +++ navigation.xml20 Aug 2004 04:28:35 - 1.6 @@ -5,9 +5,9 @@ body links - item name=runtime href=/torque// - item name=generator href=/torque/generator// - item name=maven-plugin href=/torque/maven-plugin// + item name=runtime href=../index.html/ + item name=generator href=../generator// + item name=maven-plugin href=/index.html/ /links menu name=Overview - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/18 17:18:51
Modified:src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.properties
xdocsTag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Provide default values for initialIDValue and initialIDStep so that the id table
initialization sql can be generated correctly.
Revision ChangesPath
No revision
No revision
1.3.2.3 +2 -0 db-torque/src/maven-plugin/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- plugin.properties 26 Jan 2004 15:56:38 - 1.3.2.2
+++ plugin.properties 19 Aug 2004 00:18:50 - 1.3.2.3
@@ -122,6 +122,8 @@
idTableXMLFile =
documentationFormat = html
initialID = 101
+torque.initialIDValue = 1000
+torque.initialIDStep = 10
torque.idTableXMLFile = ${idTableXMLFile}
torque.doc.format = ${documentationFormat}
No revision
No revision
1.3.2.9 +6 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -u -r1.3.2.8 -r1.3.2.9
--- release-changes.xml 14 Aug 2004 12:02:33 - 1.3.2.8
+++ release-changes.xml 19 Aug 2004 00:18:50 - 1.3.2.9
@@ -34,6 +34,12 @@
p
ul
li
+ The maven-plugin now provides default values for
+ codetorque.initialIDValue.code and
+ codetorque.initialIDStep.code so that the id table initialization
+ sql is now generated correctly.
+/li
+li
TRQS223: The get${pVarName} method in the Object.vm template does not
return related objects with a negative PK. Thanks to Nick Curry for
the patch.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/xdocs properties-reference.xml
seade 2004/08/18 17:41:32
Modified:src/generator/xdocs properties-reference.xml
Log:
Document torque.sql.dir
Revision ChangesPath
1.6 +8 -1 db-torque/src/generator/xdocs/properties-reference.xml
Index: properties-reference.xml
===
RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties-reference.xml 11 Sep 2003 22:51:39 - 1.5
+++ properties-reference.xml 19 Aug 2004 00:41:32 - 1.6
@@ -79,7 +79,7 @@
tdcode torque.output.dir /code/td
tdcode ${torque.home}/src /code/td
td
-The base directory for the output of SQL and Java files.
+The base directory for the output files.
/td
/tr
tr
@@ -101,6 +101,13 @@
tdcode ${torque.output.dir}/java /code/td
td
The directory to place all of the generated Java code in.
+ /td
+/tr
+tr
+ tdcode torque.sql.dir /code/td
+ tdcode ${torque.output.dir}/sql /code/td
+ td
+The directory to place all of the generated SQL in.
/td
/tr
tr
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/xdocs properties-reference.xml
seade 2004/08/18 17:41:47
Modified:src/generator/xdocs Tag: TORQUE_3_1_BRANCH
properties-reference.xml
Log:
Document torque.sql.dir
Revision ChangesPath
No revision
No revision
1.4.2.2 +8 -1 db-torque/src/generator/xdocs/properties-reference.xml
Index: properties-reference.xml
===
RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- properties-reference.xml 11 Sep 2003 22:46:10 - 1.4.2.1
+++ properties-reference.xml 19 Aug 2004 00:41:47 - 1.4.2.2
@@ -79,7 +79,7 @@
tdcode torque.output.dir /code/td
tdcode ${torque.home}/src /code/td
td
-The base directory for the output of SQL and Java files.
+The base directory for the output files.
/td
/tr
tr
@@ -101,6 +101,13 @@
tdcode ${torque.output.dir}/java /code/td
td
The directory to place all of the generated Java code in.
+ /td
+/tr
+tr
+ tdcode torque.sql.dir /code/td
+ tdcode ${torque.output.dir}/sql /code/td
+ td
+The directory to place all of the generated SQL in.
/td
/tr
tr
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque README.txt
seade 2004/08/18 18:12:21 Modified:.README.txt Log: Update README file to reflect reality. Revision ChangesPath 1.10 +35 -10db-torque/README.txt Index: README.txt === RCS file: /home/cvs/db-torque/README.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- README.txt20 Jan 2004 23:14:15 - 1.9 +++ README.txt19 Aug 2004 01:12:21 - 1.10 @@ -4,19 +4,44 @@ Torque is an Object/Relational persistence layer. -profile/RDBMS-specific configuration profiles. -target/ Temporary directory for building the project. -examples/ Example XML Torque schemas that are part of the distribution. -notes/ Misc. notes. -src/Location of Java sources and Torque templates. -xdocs/ Torque documention in Anakia formatted tags. +Use Torque generator to generate your object model classes and associated SQL. + +Use the Torque maven-plugin or Ant to invoke Torque generator. + +The Torque runtime provides the necessary libraries to compile and use the +object model classes produced by Torque generator. It also provides an Ant +build file for generating Torque.properties - the Torque runtime configuration +properties file. + +database/ --- Contains database specific property files used + during the generating of runtime configuration + property files. +docs/ --- Contains a copy of the Torque documentation, + including the API JavaDocs. +lib/ --- Contains the jar files required by the Torque + runtime. +master/build.xml --- The Ant build file for regenerating Torque.properties. +master/default.prperties + --- The properties that will be used when regenerating + Torque.properties. +master/Torque.master + --- The unprocessed property file template. +componentConfiguration.xml +roleConfiguration.xml + --- These are included to assist with using Torque as + component in a container (e.g. one of the Avalon + containers). +LICENSE.txt --- The License for the Torque runtime. +README.txt--- This file. +Torque.properties --- A sample generated runtime configuration file - this + will be replaced when you regenerate the runtime + configuration. -- B U I L D I N G -- -Building Torque from CVS is now very easy. Torque has been Maven-enabled. -Please refer to the Maven Getting Started document for instructions on building. -This document is available here: -http://maven.apache.org/getting-started.html +Building Torque from CVS is fairly straight forward - follow the links to +the Developer Guide for further details: + http://db.apache.org/torque/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs release-changes.xml
seade 2004/08/18 18:34:35 Modified:xdocsTag: TORQUE_3_1_BRANCH release-changes.xml Log: Oops. Revision ChangesPath No revision No revision 1.3.2.10 +2 -2 db-torque/xdocs/release-changes.xml Index: release-changes.xml === RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v retrieving revision 1.3.2.9 retrieving revision 1.3.2.10 diff -u -r1.3.2.9 -r1.3.2.10 --- release-changes.xml 19 Aug 2004 00:18:50 - 1.3.2.9 +++ release-changes.xml 19 Aug 2004 01:34:35 - 1.3.2.10 @@ -35,8 +35,8 @@ ul li The maven-plugin now provides default values for - codetorque.initialIDValue.code and - codetorque.initialIDStep.code so that the id table initialization + codetorque.initialIDValue/code and + codetorque.initialIDStep/code so that the id table initialization sql is now generated correctly. /li li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs developer-guide.xml
seade 2004/08/18 18:38:45 Modified:xdocsdeveloper-guide.xml Log: Update Developer Guide to reflect reality. Revision ChangesPath 1.14 +40 -22db-torque/xdocs/developer-guide.xml Index: developer-guide.xml === RCS file: /home/cvs/db-torque/xdocs/developer-guide.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- developer-guide.xml 16 Aug 2004 03:11:09 - 1.13 +++ developer-guide.xml 19 Aug 2004 01:38:45 - 1.14 @@ -7,6 +7,7 @@ author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]John McNally/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -18,36 +19,53 @@ /p source![CDATA[ -jakarta-turbine-torque/ - examples/ --- example schema and config files - profile/--- testing profiles - src/--- sources -conf/ --- runtime configuration -dtd/ --- DTD for schema.xml files -generator/--- home of torque-gen -java/ --- java sources -rttest/ --- sources for the runtime tests -schema/ --- needed schema files (IDBroker) -templates/--- templates for sql- and om- generation -test/ --- junit tests - xdocs/ --- docs in anakia xml format +db-torque/ + examples/--- example schema and config files + profile/ --- testing profiles + src/ --- sources +conf/ --- runtime configuration +generator/ --- home of torque-gen + src/ --- sources +conf/ --- generator configuration and ant buildfile +dtd/ --- DTD for schema.xml files +java/ --- java sources for generator +schema/--- needed schema files (IDBroker) +templates/ --- templates for sql- and om- generation +test/ --- junit tests + xdocs/ --- docs for generator in anakia xml format +java/ --- java sources for runtime +maven-plugin --- home of maven-plugin + xdocs/ --- docs for maven-plugin in anakia xml format +rttest/--- sources for the runtime tests +test/ --- junit tests + xdocs/ --- docs for runtime in anakia xml format ]]/source /section section name=Building p -Building Torque from CVS is now very easy because it has been -Maven-enabled. Before you begin, you'll need to check out the -codedb-torque/code CVS repository (if you are not familiar with the -Apache CVS repositories, please refer to the +The Torque build process uses +a href=http://maven.apache.org;Maven/a. Before you begin, you'll +need to check out the codedb-torque/code CVS repository (if you are +not familiar with the Apache CVS repositories, please refer to the a href=http://www.apache.org/dev/version-control.html;documentation/a). +Specific information for Torque is available on the +a href=cvs-usage.htmlSource Repository/a page. /p p -codemaven jar:jar/code builds the jar. br/ -Please refer to the Maven -a href=http://maven.apache.org/start/index.html; -Getting Started/a document for instructions on how to build the -project using Maven. +To build the Torque generator jar execute codemaven jar:jar/code in +the codesrc/generator/code directory (codemaven +jar:install/code to install a copy of the jar in your local Maven +repository). + /p + p +To build and install the Torque maven-plugin execute codemaven +plugin:install/code in the codesrc/maven-plugin/code directory. + /p + p +To build the Torque runtime jar execute codemaven jar:jar/code in +the root directory of the project (codemaven jar:install/code to +install a copy of the jar in your local Maven repository). /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs developer-guide.xml
seade 2004/08/18 18:38:59 Modified:xdocsTag: TORQUE_3_1_BRANCH developer-guide.xml Log: Update Developer Guide to reflect reality. Revision ChangesPath No revision No revision 1.10.4.4 +40 -22db-torque/xdocs/developer-guide.xml Index: developer-guide.xml === RCS file: /home/cvs/db-torque/xdocs/developer-guide.xml,v retrieving revision 1.10.4.3 retrieving revision 1.10.4.4 diff -u -r1.10.4.3 -r1.10.4.4 --- developer-guide.xml 16 Aug 2004 03:04:38 - 1.10.4.3 +++ developer-guide.xml 19 Aug 2004 01:38:59 - 1.10.4.4 @@ -7,6 +7,7 @@ author email=[EMAIL PROTECTED]Jason van Zyl/author author email=[EMAIL PROTECTED]John McNally/author author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -18,36 +19,53 @@ /p source![CDATA[ -jakarta-turbine-torque/ - examples/ --- example schema and config files - profile/--- testing profiles - src/--- sources -conf/ --- runtime configuration -dtd/ --- DTD for schema.xml files -generator/--- home of torque-gen -java/ --- java sources -rttest/ --- sources for the runtime tests -schema/ --- needed schema files (IDBroker) -templates/--- templates for sql- and om- generation -test/ --- junit tests - xdocs/ --- docs in anakia xml format +db-torque/ + examples/--- example schema and config files + profile/ --- testing profiles + src/ --- sources +conf/ --- runtime configuration +generator/ --- home of torque-gen + src/ --- sources +conf/ --- generator configuration and ant buildfile +dtd/ --- DTD for schema.xml files +java/ --- java sources for generator +schema/--- needed schema files (IDBroker) +templates/ --- templates for sql- and om- generation +test/ --- junit tests + xdocs/ --- docs for generator in anakia xml format +java/ --- java sources for runtime +maven-plugin --- home of maven-plugin + xdocs/ --- docs for maven-plugin in anakia xml format +rttest/--- sources for the runtime tests +test/ --- junit tests + xdocs/ --- docs for runtime in anakia xml format ]]/source /section section name=Building p -Building Torque from CVS is now very easy because it has been -Maven-enabled. Before you begin, you'll need to check out the -codedb-torque/code CVS repository (if you are not familiar with the -Apache CVS repositories, please refer to the +The Torque build process uses +a href=http://maven.apache.org;Maven/a. Before you begin, you'll +need to check out the codedb-torque/code CVS repository (if you are +not familiar with the Apache CVS repositories, please refer to the a href=http://www.apache.org/dev/version-control.html;documentation/a). +Specific information for Torque is available on the +a href=cvs-usage.htmlSource Repository/a page. /p p -codemaven jar:jar/code builds the jar.br/ -Please refer to the Maven -a href=http://maven.apache.org/start/index.html; -Getting Started/a document for instructions on how to build the -project using Maven. +To build the Torque generator jar execute codemaven jar:jar/code in +the codesrc/generator/code directory (codemaven +jar:install/code to install a copy of the jar in your local Maven +repository). + /p + p +To build and install the Torque maven-plugin execute codemaven +plugin:install/code in the codesrc/maven-plugin/code directory. + /p + p +To build the Torque runtime jar execute codemaven jar:jar/code in +the root directory of the project (codemaven jar:install/code to +install a copy of the jar in your local Maven repository). /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/xdocs sybase-howto.xml postgres-howto.xml mssql-howto.xml oracle-howto.xml
seade 2004/08/18 19:25:06 Modified:xdocsTag: TORQUE_3_1_BRANCH sybase-howto.xml postgres-howto.xml mssql-howto.xml oracle-howto.xml Log: The database specific Howto documents are way out of date. I have added a note inviting users to contribute updates. Revision ChangesPath No revision No revision 1.2.2.1 +12 -0 db-torque/xdocs/sybase-howto.xml Index: sybase-howto.xml === RCS file: /home/cvs/db-torque/xdocs/sybase-howto.xml,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- sybase-howto.xml 8 Jan 2003 16:42:34 - 1.2 +++ sybase-howto.xml 19 Aug 2004 02:25:05 - 1.2.2.1 @@ -8,6 +8,18 @@ body +section name=Introductory note + +p +This HOWTO was written some time ago and was targeted at the +version of Torque that was coupled with the +a href=http://jakarta.apache.org/turbine/;Turbine/a application framework. +Contributions towards updating the information below can be submitted to the +a href=mailto:[EMAIL PROTECTED]Torque Dev mailing list/a. +/p + +/section + section name=Sybase Howto p 1.6.2.1 +12 -0 db-torque/xdocs/postgres-howto.xml Index: postgres-howto.xml === RCS file: /home/cvs/db-torque/xdocs/postgres-howto.xml,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- postgres-howto.xml28 Jan 2003 01:46:22 - 1.6 +++ postgres-howto.xml19 Aug 2004 02:25:06 - 1.6.2.1 @@ -8,6 +8,18 @@ body +section name=Introductory note + +p +This HOWTO was written some time ago and was targeted at the +version of Torque that was coupled with the +a href=http://jakarta.apache.org/turbine/;Turbine/a application framework. +Contributions towards updating the information below can be submitted to the +a href=mailto:[EMAIL PROTECTED]Torque Dev mailing list/a. +/p + +/section + section name=PostgreSQL Howto p 1.7.2.1 +12 -0 db-torque/xdocs/mssql-howto.xml Index: mssql-howto.xml === RCS file: /home/cvs/db-torque/xdocs/mssql-howto.xml,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- mssql-howto.xml 27 May 2003 17:55:33 - 1.7 +++ mssql-howto.xml 19 Aug 2004 02:25:06 - 1.7.2.1 @@ -8,6 +8,18 @@ body +section name=Introductory note + +p +This HOWTO was written some time ago and was targeted at the +version of Torque that was coupled with the +a href=http://jakarta.apache.org/turbine/;Turbine/a application framework. +Contributions towards updating the information below can be submitted to the +a href=mailto:[EMAIL PROTECTED]Torque Dev mailing list/a. +/p + +/section + section name=Microsoft SQL Server#x99; Howto p 1.2.2.2 +8 -6 db-torque/xdocs/oracle-howto.xml Index: oracle-howto.xml === RCS file: /home/cvs/db-torque/xdocs/oracle-howto.xml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- oracle-howto.xml 16 Aug 2004 04:03:42 - 1.2.2.1 +++ oracle-howto.xml 19 Aug 2004 02:25:06 - 1.2.2.2 @@ -11,10 +11,11 @@ section name=Introductory note p -This HOWTO was written some time ago and was targeted at Oracle 8i. If any of -the information below needs to be updated for later releases then please send -a note to the a href=mailto:[EMAIL PROTECTED]Turbine Dev mailing -list/a. +This HOWTO was written some time ago and was targeted at Oracle 8i and the +version of Torque that was coupled with the +a href=http://jakarta.apache.org/turbine/;Turbine/a application framework. +Contributions towards updating the information below can be submitted to the +a href=mailto:[EMAIL PROTECTED]Torque Dev mailing list/a. /p p @@ -29,8 +30,9 @@ p This HOWTO aims to be a simple guide to make Turbine run with an existing -Oracle 8i database. The process of making Turbine run are not covered in -this guide, proceed to a href=install.htmlTurbine Installation/a for +Oracle 8i database. The process of making Turbine run is not covered in +this guide, proceed to the +a href=http://jakarta.apache.org/turbine/;Turbine/a site for help on how to install Turbine. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/xdocs index.xml
seade 2004/08/18 19:54:58 Modified:src/generator/xdocs Tag: TORQUE_3_1_BRANCH index.xml Log: Update the information concerning the Torque maven plugin and fixed a couple of typos. Revision ChangesPath No revision No revision 1.3.2.1 +16 -6 db-torque/src/generator/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/index.xml,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- index.xml 11 Jul 2003 05:56:22 - 1.3 +++ index.xml 19 Aug 2004 02:54:57 - 1.3.2.1 @@ -4,6 +4,7 @@ properties titleTorque generator/title author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -17,11 +18,23 @@ /p p -Torque offers an a href=http://ant.apache.org/;Ant/a build +Torque offers a a href=http://maven.apache.org/;Maven/a plugin +(a href=../maven-plugin/maven-plugin/a) that can be used to +invoke the generator. + /p + + p +Torque also offers an a href=http://ant.apache.org/;Ant/a build file (codebuild-torque.xml/code) which could be added to your project. It defines the following targets: /p + p +The following tasks are available as both Ant tasks +(codeant @task@/code) and, after installing maven-plugin as +Maven goals (codemaven torque:@task@/code): + /p + subsection name=SQL tasks ul li @@ -73,7 +86,7 @@ ul li strongom/strongbr/ -generates the Object/Peer/Manager modell for Torque. +generates the Object/Peer/Manager model for Torque. /li p/ li @@ -99,7 +112,7 @@ /li /ul /subsection - subsection name=other tasks + subsection name=Other tasks ul li strongdoc/strongbr/ @@ -109,9 +122,6 @@ /ul /subsection - p -a href=http://maven.apache.org;Maven/a offers a plugin for Torque. - /p /section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/generator/xdocs index.xml
seade 2004/08/18 19:55:13 Modified:src/generator/xdocs index.xml Log: Update the information concerning the Torque maven plugin and fixed a couple of typos. Revision ChangesPath 1.4 +16 -6 db-torque/src/generator/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/db-torque/src/generator/xdocs/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.xml 11 Jul 2003 05:56:22 - 1.3 +++ index.xml 19 Aug 2004 02:55:13 - 1.4 @@ -4,6 +4,7 @@ properties titleTorque generator/title author email=[EMAIL PROTECTED]Martin Poeschl/author +author email=[EMAIL PROTECTED]Scott Eade/author /properties body @@ -17,11 +18,23 @@ /p p -Torque offers an a href=http://ant.apache.org/;Ant/a build +Torque offers a a href=http://maven.apache.org/;Maven/a plugin +(a href=../maven-plugin/maven-plugin/a) that can be used to +invoke the generator. + /p + + p +Torque also offers an a href=http://ant.apache.org/;Ant/a build file (codebuild-torque.xml/code) which could be added to your project. It defines the following targets: /p + p +The following tasks are available as both Ant tasks +(codeant @task@/code) and, after installing maven-plugin as +Maven goals (codemaven torque:@task@/code): + /p + subsection name=SQL tasks ul li @@ -73,7 +86,7 @@ ul li strongom/strongbr/ -generates the Object/Peer/Manager modell for Torque. +generates the Object/Peer/Manager model for Torque. /li p/ li @@ -99,7 +112,7 @@ /li /ul /subsection - subsection name=other tasks + subsection name=Other tasks ul li strongdoc/strongbr/ @@ -109,9 +122,6 @@ /ul /subsection - p -a href=http://maven.apache.org;Maven/a offers a plugin for Torque. - /p /section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
