mpoeschl 2003/08/18 08:20:09
Modified: src/conf/master default.properties build.xml Torque.master
src/conf/database weblogic oracle mysql mssql postgresql
sapdb sybase db2app instantdb db2400 hypersonic
db2net
. maven.xml
profile dobbs.postgresql.profile kschrader.profile
axion.profile postgres.profile jmcnally.profile
db2400.profile dobbs.oracle.profile mysql.profile
sybase.profile oracle.profile hsqldb.profile
dobbs.sapdb.profile
src/conf Torque.properties
Log:
Torque.master: set pool.validationQuery using a filter (replacing @VALIDATION_QUERY@)
this allows to define the validationQuery in profiles and conf/database/xyz files
(as the query depends on the used db this is needed to allow using the jdbc2pool as
default)
use jdbc2pool as default
add validationQuery property to all profiles and conf/database/xyz files
Revision Changes Path
1.5 +1 -1 db-torque/src/conf/master/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/db-torque/src/conf/master/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 28 Sep 2002 00:44:45 -0000 1.4
+++ default.properties 18 Aug 2003 15:20:09 -0000 1.5
@@ -5,4 +5,4 @@
torque.database.password = password
torque.database.driver = org.gjt.mm.mysql.Driver
torque.database.url = jdbc:mysql://localhost:3306/torque
-
+torque.database.validationQuery = SELECT 1
1.5 +1 -0 db-torque/src/conf/master/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-torque/src/conf/master/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 28 Nov 2002 14:06:12 -0000 1.4
+++ build.xml 18 Aug 2003 15:20:09 -0000 1.5
@@ -46,6 +46,7 @@
<filter token="DATABASE_DEFAULT" value="${torque.database.name}"/>
<filter token="PROJECT" value="${torque.project}"/>
<filter token="APPLICATION_ROOT" value="${application.root}"/>
+ <filter token="VALIDATION_QUERY" value="${torque.database.validationQuery}"/>
</target>
1.8 +18 -16 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Torque.master 9 Jan 2003 17:02:00 -0000 1.7
+++ Torque.master 18 Aug 2003 15:20:09 -0000 1.8
@@ -90,25 +90,27 @@
[EMAIL PROTECTED]@[EMAIL PROTECTED]@
## Using torque's old pool
[EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
[EMAIL PROTECTED]@.pool.defaultMaxConnections=10
[EMAIL PROTECTED]@.pool.maxExpiryTime=3600
[EMAIL PROTECTED]@.pool.connectionWaitTimeout=10
[EMAIL PROTECTED]@.connection.driver = @DATABASE_DRIVER@
[EMAIL PROTECTED]@.connection.url = @DATABASE_URL@
[EMAIL PROTECTED]@.connection.user = @DATABASE_USER@
[EMAIL PROTECTED]@.connection.password = @DATABASE_PASSWORD@
-
-## Using Jdbc2Pool
[EMAIL PROTECTED]@.factory=\
-# org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
[EMAIL PROTECTED]@.pool.defaultMaxActive=10
[EMAIL PROTECTED]@.pool.testOnBorrow=true
[EMAIL PROTECTED]@.pool.validationQuery=SELECT 1
+## this implementation is deprecated and has some known bugs!!!!
+## you should use the Jdbc2Pool
[EMAIL PROTECTED]@.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
[EMAIL PROTECTED]@.pool.defaultMaxConnections=10
[EMAIL PROTECTED]@.pool.maxExpiryTime=3600
[EMAIL PROTECTED]@.pool.connectionWaitTimeout=10
[EMAIL PROTECTED]@.connection.driver = @DATABASE_DRIVER@
[EMAIL PROTECTED]@.connection.url = @DATABASE_URL@
[EMAIL PROTECTED]@.connection.user = @DATABASE_USER@
[EMAIL PROTECTED]@.connection.password = @DATABASE_PASSWORD@
+
+## Using Jdbc2Pool
[EMAIL PROTECTED]@.factory=\
+ org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
[EMAIL PROTECTED]@.pool.defaultMaxActive=10
[EMAIL PROTECTED]@.pool.testOnBorrow=true
[EMAIL PROTECTED]@[EMAIL PROTECTED]@
[EMAIL PROTECTED]@.connection.driver = @DATABASE_DRIVER@
[EMAIL PROTECTED]@.connection.url = @DATABASE_URL@
[EMAIL PROTECTED]@.connection.user = @DATABASE_USER@
[EMAIL PROTECTED]@.connection.password = @DATABASE_PASSWORD@
## Using jndi
1.7 +1 -0 db-torque/src/conf/database/weblogic
Index: weblogic
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/weblogic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- weblogic 24 Jul 2003 12:41:45 -0000 1.6
+++ weblogic 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl =
buildDatabaseUrl =
databaseUrl =
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/oracle
Index: oracle
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/oracle,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oracle 24 Jul 2003 12:41:45 -0000 1.6
+++ oracle 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:oracle:thin:@localhost:1521:${tdk.project}
buildDatabaseUrl = jdbc:oracle:thin:@localhost:1521:${tdk.project}
databaseUrl = jdbc:oracle:thin:@localhost:1521:${tdk.project}
+torque.database.validationQuery = SELECT 1 FROM DUAL
1.7 +1 -0 db-torque/src/conf/database/mysql
Index: mysql
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/mysql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql 24 Jul 2003 12:41:45 -0000 1.6
+++ mysql 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:mysql://localhost:3306/mysql
buildDatabaseUrl = jdbc:mysql://localhost:3306/${tdk.project}
databaseUrl = jdbc:mysql://localhost:3306/${tdk.project}
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/mssql
Index: mssql
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/mssql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mssql 24 Jul 2003 12:41:45 -0000 1.6
+++ mssql 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl =
buildDatabaseUrl =
databaseUrl =
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/postgresql
Index: postgresql
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/postgresql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- postgresql 24 Jul 2003 12:41:45 -0000 1.6
+++ postgresql 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:postgresql://localhost:5432/template1
buildDatabaseUrl = jdbc:postgresql://localhost:5432/${tdk.project}
databaseUrl = jdbc:postgresql://localhost:5432/${tdk.project}
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/sapdb
Index: sapdb
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/sapdb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sapdb 24 Jul 2003 12:41:45 -0000 1.6
+++ sapdb 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:sapdb://localhost/${tdk.project}?sqlmode=oracle
buildDatabaseUrl = jdbc:sapdb://localhost/${tdk.project}?sqlmode=oracle
databaseUrl = jdbc:sapdb://localhost/${tdk.project}?sqlmode=oracle
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/sybase
Index: sybase
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/sybase,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sybase 24 Jul 2003 12:41:45 -0000 1.6
+++ sybase 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:sybase:Tds:localhost:5000/${tdk.project}
buildDatabaseUrl = jdbc:sybase:Tds:localhost:5000/${tdk.project}
databaseUrl = jdbc:sybase:Tds:localhost:5000/${tdk.project}
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/db2app
Index: db2app
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/db2app,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db2app 24 Jul 2003 12:41:45 -0000 1.6
+++ db2app 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl =
buildDatabaseUrl =
databaseUrl =
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/instantdb
Index: instantdb
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/instantdb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- instantdb 24 Jul 2003 12:41:45 -0000 1.6
+++ instantdb 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl =
buildDatabaseUrl =
databaseUrl = C:/TurbineDB/Turbine.prp
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/db2400
Index: db2400
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/db2400,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db2400 24 Jul 2003 12:41:45 -0000 1.6
+++ db2400 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl = jdbc:as400://yourAS400/${tdk.project}
buildDatabaseUrl = jdbc:as400://yourAS400/${tdk.project}
databaseUrl = jdbc:as400://yourAS400/${tdk.project}
+torque.database.validationQuery = SELECT 1
1.8 +1 -0 db-torque/src/conf/database/hypersonic
Index: hypersonic
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/hypersonic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hypersonic 24 Jul 2003 12:41:45 -0000 1.7
+++ hypersonic 18 Aug 2003 15:20:09 -0000 1.8
@@ -6,3 +6,4 @@
createDatabaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
buildDatabaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
databaseUrl = jdbc:hsqldb:${webappRoot}/WEB-INF/db/${tdk.project}
+torque.database.validationQuery = SELECT 1
1.7 +1 -0 db-torque/src/conf/database/db2net
Index: db2net
===================================================================
RCS file: /home/cvs/db-torque/src/conf/database/db2net,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db2net 24 Jul 2003 12:41:45 -0000 1.6
+++ db2net 18 Aug 2003 15:20:09 -0000 1.7
@@ -6,3 +6,4 @@
createDatabaseUrl =
buildDatabaseUrl =
databaseUrl =
+torque.database.validationQuery = SELECT 1
1.20 +81 -10 db-torque/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/db-torque/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 28 Jun 2003 19:46:02 -0000 1.19
+++ maven.xml 18 Aug 2003 15:20:09 -0000 1.20
@@ -104,16 +104,6 @@
</goal>
<goal
- name="runtime:test-ojb"
- prereqs="runtime:prepare"
- description="runtime tests for ojb tasksusing (set torque.testProfile in your
build.properties)">
-
- <ant antfile="build-test.xml"
- target="test-ojb"
- inheritAll="false"/>
- </goal>
-
- <goal
name="runtime:prepare"
prereqs="java:jar">
@@ -134,6 +124,7 @@
<filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
<filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
<filter token="DATABASE_ADAPTER" value="${torque.database}"/>
+ <filter token="VALIDATION_QUERY" value="${torque.database.validationQuery}"/>
<copy
tofile="${torque.distDir}/build.properties"
@@ -203,4 +194,84 @@
overwrite="yes"
/>
</goal>
+
+ <!-- ================================================================== -->
+ <!-- O J B R U N T I M E T E S T -->
+ <!-- ================================================================== -->
+
+ <goal
+ name="runtime:test-ojb"
+ prereqs="runtime:prepare-ojb"
+ description="runtime tests for ojb tasks (set torque.testProfile in your
build.properties)">
+
+ <ant antfile="build-test.xml"
+ target="test-ojb"
+ inheritAll="false"/>
+ </goal>
+
+ <goal
+ name="runtime:prepare-ojb"
+ prereqs="java:jar">
+
+ <!-- Set values in test profile -->
+ <property file="${torque.testProfile}"/>
+
+ <!-- Use the profile as the build.properties file
+ in the dist directory so that it is customizable
+ by each tester. -->
+ <echo message="Copying profile into distribution directory:
${torque.testProfile}"/>
+
+ <filter token="APPLICATION_ROOT" value="."/>
+ <filter token="DATABASE" value="${torque.database}"/>
+ <filter token="DATABASE_DEFAULT" value="${torque.defaultDatabase}"/>
+ <filter token="DATABASE_URL" value="${torque.database.url}"/>
+ <filter token="DATABASE_USER" value="${torque.database.user}"/>
+ <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/>
+ <filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
+ <filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
+ <filter token="DATABASE_ADAPTER" value="${torque.database}"/>
+
+ <copy
+ tofile="${test.ojb.distDir}/build.properties"
+ file="${torque.testProfile}"
+ overwrite="yes"
+ />
+
+ <!-- copy test schemas -->
+ <copy
+ todir="${test.ojb.distDir}/schema"
+ filtering="yes"
+ overwrite="yes">
+ <fileset dir="${test.ojb.srcDir}">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- copy test sources -->
+ <copy todir="${test.ojb.distDir}/src/java">
+ <fileset dir="${test.ojb.srcDir}"/>
+ </copy>
+
+ <copy
+ tofile="${test.ojb.distDir}/build-torque.xml"
+ file="${torque.generator.home}/src/conf/build-torque.xml"
+ overwrite="yes"
+ />
+ <copy
+ tofile="${test.ojb.distDir}/default.properties"
+ file="${src.dir}/generator/src/conf/default.properties"
+ overwrite="yes"
+ />
+
+ <!-- copy libs -->
+ <copy todir="${test.ojb.distDir}/lib">
+ <fileset dir="${torque.generator.home}/target/">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy file="${torque.testDatabaseJar}" todir="${test.ojb.distDir}/lib"/>
+ <copy file="${ojb.jar}" todir="${test.ojb.distDir}/lib"/>
+ <copy file="${commons-collections}" todir="${test.ojb.distDir}/lib"/>
+ </goal>
+
</project>
1.11 +1 -0 db-torque/profile/dobbs.postgresql.profile
Index: dobbs.postgresql.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/dobbs.postgresql.profile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dobbs.postgresql.profile 8 Jan 2003 16:43:54 -0000 1.10
+++ dobbs.postgresql.profile 18 Aug 2003 15:20:09 -0000 1.11
@@ -72,6 +72,7 @@
torque.database.user = dobbs
torque.database.password =
torque.database.host = 127.0.0.1
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.6 +1 -0 db-torque/profile/kschrader.profile
Index: kschrader.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/kschrader.profile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kschrader.profile 8 Jan 2003 16:43:54 -0000 1.5
+++ kschrader.profile 18 Aug 2003 15:20:09 -0000 1.6
@@ -73,6 +73,7 @@
torque.database.user = protot2
torque.database.password = protot2protot2
torque.database.host = cpddev2.engin.umich.edu
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.6 +1 -0 db-torque/profile/axion.profile
Index: axion.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/axion.profile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- axion.profile 20 Jun 2003 16:45:34 -0000 1.5
+++ axion.profile 18 Aug 2003 15:20:09 -0000 1.6
@@ -74,6 +74,7 @@
torque.database.user = sa
torque.database.password =
torque.database.host = 127.0.0.1
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.18 +1 -0 db-torque/profile/postgres.profile
Index: postgres.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/postgres.profile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- postgres.profile 20 Jun 2003 08:28:26 -0000 1.17
+++ postgres.profile 18 Aug 2003 15:20:09 -0000 1.18
@@ -73,6 +73,7 @@
torque.database.user = torque
torque.database.password = torque
torque.database.host = 127.0.0.1
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.8 +1 -0 db-torque/profile/jmcnally.profile
Index: jmcnally.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/jmcnally.profile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jmcnally.profile 8 Jan 2003 16:43:54 -0000 1.7
+++ jmcnally.profile 18 Aug 2003 15:20:09 -0000 1.8
@@ -72,6 +72,7 @@
torque.database.driver = org.gjt.mm.mysql.Driver
torque.database.user = root
torque.database.password =
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.7 +81 -80 db-torque/profile/db2400.profile
Index: db2400.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/db2400.profile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db2400.profile 8 Jan 2003 16:43:54 -0000 1.6
+++ db2400.profile 18 Aug 2003 15:20:09 -0000 1.7
@@ -1,80 +1,81 @@
-# location of jar that you will be using for testing
-# so that it can be copied into the dist/lib directory.
-# jt400.jar is required for this test and IS NOT included with torque
-# JTOpen can be downloaded from
http://www-124.ibm.com/developerworks/opensource/jt400/
-
-torque.testDatabaseJar = ${lib.repo}/jt400.jar
-torque.idMethod = idbroker
-torque.defaultDatabase = bookstore
-
-torque.sqlTest.defaultDatabase = torquetest
-torque.sqlTest.databaseUrl = jdbc:as400://testhost/torquetest
-
-lib.dir = ../lib
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E C O N F I G U R A T I O N F I L E
-#
-# -------------------------------------------------------------------
-
-torque.project = bookstore
-
-# -------------------------------------------------------------------
-#
-# T A R G E T D A T A B A S E
-#
-# -------------------------------------------------------------------
-
-torque.database = db2400
-
-# -------------------------------------------------------------------
-#
-# O B J E C T M O D E L I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addSaveMethod=true adds tracking code to determine how to save objects
-#
-# addGetByNameMethod=true adds methods to get fields by name/position
-#
-# complexObjectModel=true generates an om with collection support
-#
-# addTimeStamp=true puts time stamps in generated files
-#
-# addIntakeRetrievable=implement Intake's Retrievable interface
-# -------------------------------------------------------------------
-
-torque.targetPackage=org.apache.torque.test
-torque.basePrefix=Base
-torque.addSaveMethod=true
-torque.addGetByNameMethod=true
-torque.complexObjectModel=true
-torque.addTimeStamp=true
-torque.addIntakeRetrievable=false
-torque.useManagers=true
-
-# -------------------------------------------------------------------
-#
-# D A T A B A S E S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Torque system with the generated SQL.
-# -------------------------------------------------------------------
-
-torque.database.createUrl = jdbc:as400://testhost/torquetest
-torque.database.buildUrl = jdbc:as400://testhost/torquetest
-torque.database.url = jdbc:as400://testhost/torquetest
-torque.database.driver = com.ibm.as400.access.AS400JDBCDriver
-torque.database.user =
-torque.database.password =
-torque.database.host = testhost
-
-# Tells JDBC task that javaName attribute for the tables and columns
-# should be made same as SQL name.
-torque.sameJavaName=false
+# location of jar that you will be using for testing
+# so that it can be copied into the dist/lib directory.
+# jt400.jar is required for this test and IS NOT included with torque
+# JTOpen can be downloaded from
http://www-124.ibm.com/developerworks/opensource/jt400/
+
+torque.testDatabaseJar = ${lib.repo}/jt400.jar
+torque.idMethod = idbroker
+torque.defaultDatabase = bookstore
+
+torque.sqlTest.defaultDatabase = torquetest
+torque.sqlTest.databaseUrl = jdbc:as400://testhost/torquetest
+
+lib.dir = ../lib
+
+# -------------------------------------------------------------------
+#
+# T O R Q U E C O N F I G U R A T I O N F I L E
+#
+# -------------------------------------------------------------------
+
+torque.project = bookstore
+
+# -------------------------------------------------------------------
+#
+# T A R G E T D A T A B A S E
+#
+# -------------------------------------------------------------------
+
+torque.database = db2400
+
+# -------------------------------------------------------------------
+#
+# O B J E C T M O D E L I N F O R M A T I O N
+#
+# -------------------------------------------------------------------
+# These settings will allow you to customize the way your
+# Peer-based object model is created.
+# -------------------------------------------------------------------
+# addSaveMethod=true adds tracking code to determine how to save objects
+#
+# addGetByNameMethod=true adds methods to get fields by name/position
+#
+# complexObjectModel=true generates an om with collection support
+#
+# addTimeStamp=true puts time stamps in generated files
+#
+# addIntakeRetrievable=implement Intake's Retrievable interface
+# -------------------------------------------------------------------
+
+torque.targetPackage=org.apache.torque.test
+torque.basePrefix=Base
+torque.addSaveMethod=true
+torque.addGetByNameMethod=true
+torque.complexObjectModel=true
+torque.addTimeStamp=true
+torque.addIntakeRetrievable=false
+torque.useManagers=true
+
+# -------------------------------------------------------------------
+#
+# D A T A B A S E S E T T I N G S
+#
+# -------------------------------------------------------------------
+# JDBC connection settings. This is used by the JDBCToXML task that
+# will create an XML database schema from JDBC metadata. These
+# settings are also used by the SQL Ant task to initialize your
+# Torque system with the generated SQL.
+# -------------------------------------------------------------------
+
+torque.database.createUrl = jdbc:as400://testhost/torquetest
+torque.database.buildUrl = jdbc:as400://testhost/torquetest
+torque.database.url = jdbc:as400://testhost/torquetest
+torque.database.driver = com.ibm.as400.access.AS400JDBCDriver
+torque.database.user =
+torque.database.password =
+torque.database.host = testhost
+torque.database.validationQuery = SELECT 1
+
+# Tells JDBC task that javaName attribute for the tables and columns
+# should be made same as SQL name.
+torque.sameJavaName=false
1.9 +1 -0 db-torque/profile/dobbs.oracle.profile
Index: dobbs.oracle.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/dobbs.oracle.profile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dobbs.oracle.profile 8 Jan 2003 16:43:54 -0000 1.8
+++ dobbs.oracle.profile 18 Aug 2003 15:20:09 -0000 1.9
@@ -73,6 +73,7 @@
torque.database.password = dobbs
torque.database.host = linuxdb
#torque.database.schema = dobbs
+torque.database.validationQuery = SELECT 1 FROM DUAL
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.22 +3 -2 db-torque/profile/mysql.profile
Index: mysql.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/mysql.profile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mysql.profile 1 Aug 2003 07:14:04 -0000 1.21
+++ mysql.profile 18 Aug 2003 15:20:09 -0000 1.22
@@ -57,8 +57,8 @@
torque.addTimeStamp=true
torque.addIntakeRetrievable=false
#torque.addIntakeRetrievable=true
-torque.useManagers=true
-#torque.useManagers=false
+#torque.useManagers=true
+torque.useManagers=false
# -------------------------------------------------------------------
#
@@ -78,6 +78,7 @@
torque.database.user = root
torque.database.password =
torque.database.host = 127.0.0.1
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.9 +1 -0 db-torque/profile/sybase.profile
Index: sybase.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/sybase.profile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sybase.profile 8 Jan 2003 16:43:54 -0000 1.8
+++ sybase.profile 18 Aug 2003 15:20:09 -0000 1.9
@@ -72,6 +72,7 @@
torque.database.user = sa
torque.database.password =
torque.database.host = localhost
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.16 +1 -0 db-torque/profile/oracle.profile
Index: oracle.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/oracle.profile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- oracle.profile 8 Jan 2003 16:43:54 -0000 1.15
+++ oracle.profile 18 Aug 2003 15:20:09 -0000 1.16
@@ -74,6 +74,7 @@
torque.database.password = torque
torque.database.host = alpha.tucana.at
torque.database.schema = TORQUE
+torque.database.validationQuery = SELECT 1 FROM DUAL
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.9 +1 -0 db-torque/profile/hsqldb.profile
Index: hsqldb.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/hsqldb.profile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hsqldb.profile 29 Jun 2003 14:30:03 -0000 1.8
+++ hsqldb.profile 18 Aug 2003 15:20:09 -0000 1.9
@@ -72,6 +72,7 @@
torque.database.user = sa
torque.database.password =
torque.database.host = 127.0.0.1
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.11 +1 -0 db-torque/profile/dobbs.sapdb.profile
Index: dobbs.sapdb.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/dobbs.sapdb.profile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dobbs.sapdb.profile 8 Jan 2003 16:43:54 -0000 1.10
+++ dobbs.sapdb.profile 18 Aug 2003 15:20:09 -0000 1.11
@@ -72,6 +72,7 @@
torque.database.user = tdk
torque.database.password = tdk
torque.database.host = edobbs
+torque.database.validationQuery = SELECT 1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
1.10 +18 -16 db-torque/src/conf/Torque.properties
Index: Torque.properties
===================================================================
RCS file: /home/cvs/db-torque/src/conf/Torque.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Torque.properties 9 Jan 2003 17:02:00 -0000 1.9
+++ Torque.properties 18 Aug 2003 15:20:09 -0000 1.10
@@ -90,25 +90,27 @@
torque.database.bookstore.adapter=mysql
## Using torque's old pool
-torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
-torque.dsfactory.bookstore.pool.defaultMaxConnections=10
-torque.dsfactory.bookstore.pool.maxExpiryTime=3600
-torque.dsfactory.bookstore.pool.connectionWaitTimeout=10
-torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
-torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/torque
-torque.dsfactory.bookstore.connection.user = user
-torque.dsfactory.bookstore.connection.password = password
-
-## Using Jdbc2Pool
-#torque.dsfactory.bookstore.factory=\
-# org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
-#torque.dsfactory.bookstore.pool.defaultMaxActive=10
-#torque.dsfactory.bookstore.pool.testOnBorrow=true
-#torque.dsfactory.bookstore.pool.validationQuery=SELECT 1
+## this implementation is deprecated and has some known bugs!!!!
+## you should use the Jdbc2Pool
+#torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
+#torque.dsfactory.bookstore.pool.defaultMaxConnections=10
+#torque.dsfactory.bookstore.pool.maxExpiryTime=3600
+#torque.dsfactory.bookstore.pool.connectionWaitTimeout=10
#torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
#torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/torque
#torque.dsfactory.bookstore.connection.user = user
#torque.dsfactory.bookstore.connection.password = password
+
+## Using Jdbc2Pool
+torque.dsfactory.bookstore.factory=\
+ org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
+torque.dsfactory.bookstore.pool.defaultMaxActive=10
+torque.dsfactory.bookstore.pool.testOnBorrow=true
+torque.dsfactory.bookstore.pool.validationQuery=SELECT 1
+torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
+torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/torque
+torque.dsfactory.bookstore.connection.user = user
+torque.dsfactory.bookstore.connection.password = password
## Using jndi
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
