[jboss-svn-commits] JBL Code SVN: r30542 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql: database-locations/remote-db and 1 other directory.

Tue Dec 8 12:27:17 EST 2009

Author: whitingjr
Date: 2009-12-08 12:27:16 -0500 (Tue, 08 Dec 2009)
New Revision: 30542

Added:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/second-resource-installation.properties
Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/db-installation.properties
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties
Log:
Refactored codebase to support blended datasources.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/db-installation.properties
===================================================================

--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/db-installation.properties	2009-12-08 17:26:53 UTC (rev 30541)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/db-installation.properties	2009-12-08 17:27:16 UTC (rev 30542)
@@ -1,6 +1,17 @@
+
+# Resource A
+
+# specify which packages or classes are to be profiled. These will be identical across any database installation
+db-vendor-profiling.A=org.postgresql
+# inclusion xpaths
+db-vendor-package.xpath.A=org.postgresql
+
+db-vendor.method.xpaths.A=
+
+
 # driver settings
 
-db-vendor-jdbc-connectionURL.A=jdbc:postgresql://${db-vendor-jdbc-serverName.A}/${db-vendor-jdbc-database.A}
+db-vendor-jdbc-connectionURL.A=jdbc:arjuna:pgsql1//${db-vendor-jdbc-serverName.A}/${db-vendor-jdbc-database.A}
 db-vendor-jdbc-userName.A=dtf11
 db-vendor-jdbc-password.A=dtf11
 
@@ -8,11 +19,18 @@
 db-vendor-jdbc-serverName.A=larry.buildnet.ncl.jboss.com
 db-vendor-jdbc-database.A=jbossts
 
+db-vendor-jdbc-same.driverClass.A=org.postgresql.ds.PGConnectionPoolDataSource
+db-vendor-jdbc-xa.driverClass.A=org.postgresql.xa.PGXADataSource
 
-db-vendor-jdbc-connectionURL.B=jdbc:postgresql://${db-vendor-jdbc-serverName.B}/${db-vendor-jdbc-database.B}
-db-vendor-jdbc-userName.B=dtf11
-db-vendor-jdbc-password.B=dtf11
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory.A=org.dbunit.ext.postgresql.PostgresqlDataTypeFactory
 
-# use filter chaining expandproperties to populate the connectionURL with the following host
-db-vendor-jdbc-serverName.B=larry.buildnet.ncl.jboss.com
-db-vendor-jdbc-database.B=jbossts
+# database dialect
+db-vendor-hibernate.dialect.A=org.hibernate.dialect.PostgreSQLDialect
+
+# class used to relax integrity constraint
+db-vendor-constraint-class.A=org.jboss.jbossts.performance.persistence.vendor.PostgreSQL
+
+db-connection.caching.A=false
+
+db-vendor-driver.configuration.xml.A=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>

Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/second-resource-installation.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/second-resource-installation.properties	                        (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/second-resource-installation.properties	2009-12-08 17:27:16 UTC (rev 30542)
@@ -0,0 +1,36 @@
+
+# Resource B
+
+# specify which packages or classes are to be profiled. These will be identical across any database installation
+db-vendor-profiling.B=org.postgresql
+# inclusion xpaths
+db-vendor-package.xpath.B=org.postgresql
+
+db-vendor.method.xpaths.B=
+
+
+# driver settings
+
+db-vendor-jdbc-connectionURL.B=jdbc:arjuna:pgsql2//${db-vendor-jdbc-serverName.B}/${db-vendor-jdbc-database.B}
+db-vendor-jdbc-userName.B=dtf11
+db-vendor-jdbc-password.B=dtf11
+
+# use filter chaining expandproperties to populate the connectionURL with the following host
+db-vendor-jdbc-serverName.B=larry.buildnet.ncl.jboss.com
+db-vendor-jdbc-database.B=jbossts
+
+db-vendor-jdbc-same.driverClass.B=org.postgresql.ds.PGConnectionPoolDataSource
+db-vendor-jdbc-xa.driverClass.B=org.postgresql.xa.PGXADataSource
+
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory.B=org.dbunit.ext.postgresql.PostgresqlDataTypeFactory
+
+# database dialect
+db-vendor-hibernate.dialect.B=org.hibernate.dialect.PostgreSQLDialect
+
+# class used to relax integrity constraint
+db-vendor-constraint-class.B=org.jboss.jbossts.performance.persistence.vendor.PostgreSQL
+
+db-connection.caching.B=false
+
+db-vendor-driver.configuration.xml.B=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties	2009-12-08 17:26:53 UTC (rev 30541)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties	2009-12-08 17:27:16 UTC (rev 30542)
@@ -1,27 +1,8 @@
-# specify which packages or classes are to be profiled. These will be identical across any database installation
-#db-vendor-profiling=org.postgresql
-db-vendor-profiling=org.postgresql
-# inclusion xpaths
-db-vendor-package.xpath=org.postgresql
-
-db-vendor.method.xpaths
-
 # report to profiling system vendor support for xa, used to verify command line parameters
 db.supports.xa=true
 
-# db vendor driver class
-db-vendor-jdbc-same.driverClass=org.postgresql.ds.PGConnectionPoolDataSource
-db-vendor-jdbc-xa.driverClass=org.postgresql.xa.PGXADataSource
+# needs 'user', 'password', 'serverName', 'databaseName'
 
-# dbunit vendor db factory for data types
-db-vendor-dbunit-datatype.factory=org.dbunit.ext.postgresql.PostgresqlDataTypeFactory
+#db-vendor-driver.configuration.xml.A=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>
+#db-vendor-driver.configuration.xml.B=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>
 
-# database dialect
-db-vendor-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-# class used to relax integrity constraint
-db-vendor-constraint-class=org.jboss.jbossts.performance.persistence.vendor.PostgreSQL
-
-db-vendor-driver.configuration.xml.A=<entry><key>url</key><value>${db-vendor-jdbc-connectionURL.A}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry><entry><key>ConnectionCachingEnabled</key><value>${db-connection.caching}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>
-db-vendor-driver.configuration.xml.B=<entry><key>url</key><value>${db-vendor-jdbc-connectionURL.B}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry><entry><key>ConnectionCachingEnabled</key><value>${db-connection.caching}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>
-

