[jboss-svn-commits] JBL Code SVN: r30543 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource: xa and 1 other directory.

Tue Dec 8 12:27:45 EST 2009

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

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties
Log:
Refactored codebase to support blended datasources.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties
===================================================================

--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties	2009-12-08 17:27:16 UTC (rev 30542)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties	2009-12-08 17:27:45 UTC (rev 30543)
@@ -1 +1 @@
-datasoure.xml=<!-- Enable a JCA datasource available through JNDI --><bean name="caveatEmptorDatasourceFactoryA" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceA</property><property name="driverClass">${db-vendor-jdbc-same.driverClass}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL}</property><property name="userName">${db-vendor-jdbc-userName}</property><property name="password">${db-vendor-jdbc-password}</property><property name="minSize">${db-pool-min.size}</property><property name="maxSize">${db-pool-max.size}</property> <property name="blockingTimeout">${db-connection-blocking.timeout}</property> <property name="idleTimeout">${db-connection-idle.timeout}</property> <property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextP!
 roperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryA" /></constructor></bean>
\ No newline at end of file
+datasoure.xml.A=<bean name="caveatEmptorDatasourceFactoryA" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceA</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.A}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.A}</property><property name="userName">${db-vendor-jdbc-userName.A}</property><property name="password">${db-vendor-jdbc-password.A}</property><property name="minSize">${db-pool-min.size.A}</property><property name="maxSize">${db-pool-max.size.A}</property> <property name="blockingTimeout">${db-connection-blocking.timeout.A}</property> <property name="idleTimeout">${db-connection-idle.timeout.A}</property> <property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialConte!
 xtProperties"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryA" /></constructor></bean>
\ No newline at end of file

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties	2009-12-08 17:27:16 UTC (rev 30542)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties	2009-12-08 17:27:45 UTC (rev 30543)
@@ -1,2 +1,2 @@
-#datasoure.xml=<bean name="TransactionalResourceFactory" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasource</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String"><entry><key>url</key><value>${db-vendor-jdbc-connectionURL}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName}</value></entry><entry><key>databaseName</key><value>${db-vendor-jdbc-database}</value></entry><entry><key>ConnectionCachingEnabled</key><value>${db-connection.caching}</value></entry><entry><key>MinSize</key><value>${db-pool-min.size}</value></entry><entry><key>MaxSize</key><value>${db-pool-max.size}</value></entry><entry><key>BlockingTimeout</key><value>${db-connection-blocking.timeout}</value></entry><entry><key>IdleTimeout</key><value>${db-connection-idle.timeout}</value></entry><entry><key>User</key><value>${db-vendor-jdb!
 c-userName}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password}</value></entry></map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasource" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactory" /></constructor></bean><bean name="DataSourceBinding" class="org.jboss.ejb3.embedded.JndiBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasource"/></property><property name="bindTo">java:/caveatemptorTestingDatasource</property><property name="ser!
 ializable">false</property></bean>
-datasoure.xml=<bean name="TransactionalResourceFactoryA" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceA</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.A}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryA" /></constructor></bean><bean name="DataSourceBindingA" class="org.jboss.ejb3.embedded.JndiBin!
 der"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceA"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceA</property><property name="serializable">false</property></bean><bean name="TransactionalResourceFactoryB" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceB</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.B}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="Transacti!
 onManager"/></property></bean><bean name="caveatemptorTestingD!
 atasourc
eB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryB" /></constructor></bean><bean name="DataSourceBindingB" class="org.jboss.ejb3.embedded.JndiBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceB"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceB</property><property name="serializable">false</property></bean>
+datasoure.xml.A=<bean name="TransactionalResourceFactoryA" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceA</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.A}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass.A}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryA" /></constructor></bean><bean name="DataSourceBindingA" class="org.jboss.ejb3.embedded.Jnd!
 iBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceA"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceA</property><property name="serializable">false</property></bean>
+datasoure.xml.B=<bean name="TransactionalResourceFactoryB" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceB</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.B}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass.B}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryB" /></constructor></bean><bean name="DataSourceBindingB" class="org.jboss.ejb3.embedded.Jnd!
 iBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceB"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceB</property><property name="serializable">false</property></bean>

