[jboss-svn-commits] JBL Code SVN: r30719 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/java/org/jboss/jbossts/performance and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 16 11:53:48 EST 2009
Author: whitingjr
Date: 2009-12-16 11:53:47 -0500 (Wed, 16 Dec 2009)
New Revision: 30719
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/TransactionXADataSourceFactory.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/shared-database.properties
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:
Added configuration properties for second resource. Allows freedom to configure xa or local-tx datasource for either vendor and the installation.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -3,10 +3,12 @@
# required
transaction.strategy=jta-managed
-db.installation=remote-db
-db.vendor=postgresql
-jdbc-datasource=xa
-second.resource.db.vendor=oracle
+resource.A.db.installation=co-located-db
+resource.A.db.vendor=oracle
+resource.A.jdbc-datasource=xa
+resource.B.db.installation=remote-db
+resource.B.db.vendor=oracle
+resource.B.jdbc-datasource=local-tx
# optional
@@ -14,6 +16,6 @@
# does the profiled wait for a debugger to be attached ?
# y or n
-suspend=n
+suspend=y
-testcase.xpaths=auction.dao.ejb3.GenericEJB3DAO:makePersistent,auction.dao.ejb3.GenericEJB3DAO:findById,org.hibernate.ejb.AbstractEntityManagerImpl:joinTransaction,org.jboss.jbossts.performance.resource.MultiResourceTest:runTestBodyorg.hibernate.impl.SessionImpl:beginTransaction,org.hibernate.ejb.AbstractEntityManagerImpl:find,org.hibernate.ejb.AbstractEntityManagerImpl:flush,org.hibernate.impl.SessionImpl:getTransaction,org.hibernate.transaction.JTATransaction:commit,org.hibernate.ejb.EntityManagerImpl:close
\ No newline at end of file
+testcase.xpaths=auction.dao.ejb3.GenericEJB3DAO:makePersistent
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-12-16 16:53:47 UTC (rev 30719)
@@ -44,17 +44,17 @@
<property name="test.output.dir" value="target" />
<property file="build.properties" />
- <property name="required-args" value="-Dtransaction.strategy=value -Ddb.installation=value -Ddb.vendor=value -Djdbc-datasource=value" />
- <property name="optional-args" value="-Dtransaction.log.store=value -Dsecond.resource.db.vendor=value" />
+ <property name="required-args" value="-Dtransaction.strategy=value -Dresource.A.db.installation=value -Dresource.A.db.vendor=value -Dresource.A.jdbc-datasource=value" />
+ <property name="optional-args" value="-Dtransaction.log.store=value -Dresource.B.db.installation=value -Dresource.B.db.vendor=value -Dresource.B.jdbc-datasource=value" />
<property name="driver.home" value="lib/dbdrivers" />
<property name="properties.home" value="src/main/resources/properties" />
<path id="database.driver">
- <fileset dir="${driver.home}/${db.vendor}">
+ <fileset dir="${driver.home}/${resource.A.db.vendor}">
<include name="*.jar" />
</fileset>
- <fileset dir="${driver.home}/${second.resource.db.vendor}">
+ <fileset dir="${driver.home}/${resource.B.db.vendor}">
<include name="*.jar" />
</fileset>
</path>
@@ -110,9 +110,9 @@
<not>
<and>
<isset property="transaction.strategy" />
- <isset property="db.installation" />
- <isset property="db.vendor" />
- <isset property="jdbc-datasource" />
+ <isset property="resource.A.db.installation" />
+ <isset property="resource.A.db.vendor" />
+ <isset property="resource.A.jdbc-datasource" />
</and>
</not>
</condition>
@@ -133,9 +133,9 @@
<condition>
<not>
<or>
- <equals arg1="${db.installation}" arg2="embedded-db" />
- <equals arg1="${db.installation}" arg2="co-located-db" />
- <equals arg1="${db.installation}" arg2="remote-db" />
+ <equals arg1="${resource.A.db.installation}" arg2="embedded-db" />
+ <equals arg1="${resource.A.db.installation}" arg2="co-located-db" />
+ <equals arg1="${resource.A.db.installation}" arg2="remote-db" />
</or>
</not>
</condition>
@@ -145,8 +145,8 @@
<condition>
<not>
<or>
- <equals arg1="${jdbc-datasource}" arg2="local-tx" />
- <equals arg1="${jdbc-datasource}" arg2="xa" />
+ <equals arg1="${resource.A.jdbc-datasource}" arg2="local-tx" />
+ <equals arg1="${resource.A.jdbc-datasource}" arg2="xa" />
</or>
</not>
</condition>
@@ -171,10 +171,10 @@
<resourcecount refid="database.driver" when="equal" count="0" />
</condition>
</fail>
- <fail message="Database properties have not been configured for the installation. [${properties.home}/${db.vendor}/database-locations/${db.installation}]">
+ <fail message="Database properties have not been configured for the installation. [${properties.home}/${resource.A.db.vendor}/database-locations/${resource.A.db.installation}]">
<condition>
<not>
- <available file="${properties.home}/database/${db.vendor}/database-locations/${db.installation}" />
+ <available file="${properties.home}/database/${resource.A.db.vendor}/database-locations/${resource.A.db.installation}" />
</not>
</condition>
</fail>
@@ -193,9 +193,20 @@
</fail>
</target>
- <target name="second-resource" if="second.resource.db.vendor">
- <property name="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}" />
-
+ <target name="second-resource" if="resource.B.db.vendor">
+ <loadproperties srcfile="${properties.home}/jdbc-resource/${resource.B.jdbc-datasource}/datasource.properties" />
+ <loadproperties srcfile="${properties.home}/database/${resource.B.db.vendor}/db-profile.properties" />
+ <loadproperties srcfile="${properties.home}/database/${resource.B.db.vendor}/db-profile.properties" />
+ <loadproperties srcfile="${properties.home}/database/${resource.B.db.vendor}/database-locations/${resource.B.db.installation}/resourceB/connection.properties">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadproperties>
+ <loadproperties srcfile="${properties.home}/database/${resource.B.db.vendor}/database-locations/${resource.B.db.installation}/resourceB/resource.properties">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadproperties>
</target>
<target name="prepare" depends="check-arguments, check-setup, second-resource">
@@ -204,34 +215,22 @@
<mkdir dir="build/classes" />
<mkdir dir="build/classes/META-INF" />
- <property name="db-vendor-profiling" value="${db-vendor-profiling.A}" />
-
<!-- load properties, specific first then general -->
<loadproperties srcfile="${properties.home}/log-store/store-data.properties" />
- <loadproperties srcfile="${properties.home}/jdbc-resource/${jdbc-datasource}/datasource.properties" />
- <loadproperties srcfile="${properties.home}/database/${db.vendor}/db-profile.properties" />
- <loadproperties srcfile="${properties.home}/database/${second.resource.db.vendor}/db-profile.properties" />
- <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceA/connection.properties">
+ <loadproperties srcfile="${properties.home}/jdbc-resource/${resource.A.jdbc-datasource}/datasource.properties" />
+ <loadproperties srcfile="${properties.home}/database/${resource.A.db.vendor}/db-profile.properties" />
+
+ <loadproperties srcfile="${properties.home}/database/${resource.A.db.vendor}/database-locations/${resource.A.db.installation}/resourceA/connection.properties">
<filterchain>
<expandproperties />
</filterchain>
</loadproperties>
- <loadproperties srcfile="${properties.home}/database/${db.vendor}/database-locations/${db.installation}/resourceA/resource.properties">
+ <loadproperties srcfile="${properties.home}/database/${resource.A.db.vendor}/database-locations/${resource.A.db.installation}/resourceA/resource.properties">
<filterchain>
<expandproperties />
</filterchain>
</loadproperties>
- <loadproperties srcfile="${properties.home}/database/${second.resource.db.vendor}/database-locations/${db.installation}/resourceB/connection.properties">
- <filterchain>
- <expandproperties />
- </filterchain>
- </loadproperties>
- <loadproperties srcfile="${properties.home}/database/${second.resource.db.vendor}/database-locations/${db.installation}/resourceB/resource.properties">
- <filterchain>
- <expandproperties />
- </filterchain>
- </loadproperties>
- <loadproperties srcfile="${properties.home}/database/${db.vendor}/db-profile.properties" />
+
<loadproperties srcfile="${properties.home}/database/shared-database.properties" />
<copy file="src/main/resources/profile-remote.properties" tofile="build/classes/profile.properties">
<filterchain>
@@ -244,7 +243,12 @@
<expandproperties />
</filterchain>
</copy>
- <copy file="src/main/resources/META-INF/caveatemptor-beans.xml" tofile="build/classes/META-INF/caveatemptor-beans-${db.vendor}.xml">
+ <xslt in="src/main/resources/META-INF/caveatemptor-beans.xml" out="build/classes/META-INF/caveatemptor-beans-property-ready.xml" style="src/main/resources/xsl/jdbc-datasource/prepare-jdbc-resolving-properties.xsl">
+ <outputproperty name="indent" value="yes" />
+ <param name="resource.A.jdbc" expression="${resource.A.jdbc-datasource}" />
+ <param name="resource.B.jdbc" expression="${resource.B.jdbc-datasource}" />
+ </xslt>
+ <copy file="build/classes/META-INF/caveatemptor-beans-property-ready.xml" tofile="build/classes/META-INF/caveatemptor-beans.xml">
<filterchain>
<expandproperties />
<expandproperties />
@@ -252,9 +256,9 @@
</filterchain>
</copy>
<!-- Use stylesheet to transform result tree, each vendor datasource has specific needs. -->
- <xslt in="build/classes/META-INF/caveatemptor-beans-${db.vendor}.xml" out="build/classes/META-INF/caveatemptor-beans.xml" style="src/main/resources/xsl/database/${db.vendor}/${db.vendor}.xsl">
+ <!--xslt in="build/classes/META-INF/caveatemptor-beans-${db.vendor}.xml" out="build/classes/META-INF/caveatemptor-beans.xml" style="src/main/resources/xsl/database/${db.vendor}/${db.vendor}.xsl">
<outputproperty name="indent" value="yes" />
- </xslt>
+ </xslt-->
<xslt in="src/main/resources/basedata.xml" out="build/classes/basedata.xml" style="src/main/resources/xsl/basedata.xsl">
<outputproperty name="indent" value="yes" />
</xslt>
@@ -283,7 +287,7 @@
<delete dir="logs/profiled" />
<mkdir dir="logs/profiled" />
<property name="db-vendor-package.xpath" value="${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}"/>
-
+ <property name="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}" />
</target>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/TransactionXADataSourceFactory.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/TransactionXADataSourceFactory.java 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/TransactionXADataSourceFactory.java 2009-12-16 16:53:47 UTC (rev 30719)
@@ -30,8 +30,6 @@
import java.util.Properties;
import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ConnectionRequestInfo;
@@ -41,7 +39,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.jboss.deployment.DeploymentException;
import org.jboss.jbossts.tomcat.TransactionalResourceFactory;
import org.jboss.resource.adapter.jdbc.xa.XAManagedConnectionFactory;
import org.jboss.resource.connectionmanager.CachedConnectionManager;
@@ -49,8 +46,7 @@
import org.jboss.resource.connectionmanager.InternalManagedConnectionPool;
import org.jboss.resource.connectionmanager.JBossManagedConnectionPool;
import org.jboss.resource.connectionmanager.TxConnectionManager;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.util.naming.Util;
+import org.jboss.resource.connectionmanager.JBossManagedConnectionPool.BasePool;
public class TransactionXADataSourceFactory extends TransactionalResourceFactory
@@ -64,7 +60,7 @@
private XAManagedConnectionFactory managedConnectionFactory = new XAManagedConnectionFactory();
CachedConnectionManager cachedConnectionManager;
private InternalManagedConnectionPool.PoolParams poolParams = new InternalManagedConnectionPool.PoolParams();
- private JBossManagedConnectionPool.OnePool pool = new JBossManagedConnectionPool.OnePool(this.managedConnectionFactory, this.poolParams, false, jbLogger);
+ private BasePool pool = new JBossManagedConnectionPool.OnePool(this.managedConnectionFactory, this.poolParams, false, jbLogger);
private TxConnectionManager connectionManager;
private TransactionManager transactionManager;
private Map<String, String> daProperties;
@@ -213,4 +209,37 @@
{
this.managedConnectionFactory.setPassword(password);
}
+
+ public void setBackgroundInterval(long interval)
+ {
+ this.poolParams.backgroundInterval = interval;
+ }
+ public long getBackgroundInterval()
+ {
+ return this.poolParams.backgroundInterval;
+ }
+ public void setBackgroundValidation(boolean isTrue)
+ {
+ this.poolParams.backgroundValidation = isTrue;
+ }
+ public boolean getBackgroundValidation()
+ {
+ return this.poolParams.backgroundValidation;
+ }
+ public void setSharePreparedStatements(boolean isTrue)
+ {
+ this.managedConnectionFactory.setSharePreparedStatements(isTrue);
+ }
+ public boolean getSharePreparedStatements()
+ {
+ return this.managedConnectionFactory.getSharePreparedStatements();
+ }
+ public void setPreparedStatementCacheSize(int size)
+ {
+ this.managedConnectionFactory.setPreparedStatementCacheSize(size);
+ }
+ public int getPreparedStatementCacheSize()
+ {
+ return this.managedConnectionFactory.getPreparedStatementCacheSize();
+ }
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml 2009-12-16 16:53:47 UTC (rev 30719)
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
-
-
- ${datasoure.xml.A}
- ${datasoure.xml.B}
-
</deployment>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -20,17 +20,23 @@
# class used to relax integrity constraint
db-vendor-constraint-class.A=${oracle.db-vendor-constraint-class}
+# vendor specific properties
db-connection.caching.A=false
-db-statement.cache.size.A=10
-db-statement.caching.enabled.A=true
+db-statement.cache.size.A=0
+db-statement.caching.enabled.A=false
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.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><entry><key>ImplicitCachingEnabled</key><value>${db-statement.caching.enabled.A}</value></entry>
db.supports.xa.A=${oracle.db.supports.xa}
-db-vendor-driver.cachePreparedStatements.A=${oracle.db-vendor.cache.statements}
+# JBoss managed connection factory settings
+db-connection-share.prepared.statements.A=${oracle.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.A=${oracle.db-connection-prepared.statement.cache.size}
+
db-pool-min.size.A=${oracle.db-pool-min.size}
db-pool-max.size.A=${oracle.db-pool-max.size}
db-connection-blocking.timeout.A=${oracle.db-connection-blocking.timeout}
db-connection-idle.timeout.A=${oracle.db-connection-idle.timeout}
+db-connection-background.interval.A=${oracle.db-connection-background.interval}
+db-connection-background.validation.A=${oracle.db-connection-background.validation}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -20,18 +20,23 @@
# class used to relax integrity constraint
db-vendor-constraint-class.B=${oracle.db-vendor-constraint-class}
+# vendor specific properties
db-connection.caching.B=false
+db-statement.cache.size.B=0
+db-statement.caching.enabled.B=false
-db-statement.cache.size.B=10
-db-statement.caching.enabled.B=true
-
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.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><entry><key>ImplicitCachingEnabled</key><value>${db-statement.caching.enabled.B}</value></entry>
db.supports.xa.B=${oracle.db.supports.xa}
-db-vendor-driver.cachePreparedStatements.B=${oracle.db-vendor.cache.statements}
+# JBoss managed connection factory settings
+db-connection-share.prepared.statements.B=${oracle.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.B=${oracle.db-connection-prepared.statement.cache.size}
+
db-pool-min.size.B=${oracle.db-pool-min.size}
db-pool-max.size.B=${oracle.db-pool-max.size}
db-connection-blocking.timeout.B=${oracle.db-connection-blocking.timeout}
db-connection-idle.timeout.B=${oracle.db-connection-idle.timeout}
+db-connection-background.interval.B=${oracle.db-connection-background.interval}
+db-connection-background.validation.B=${oracle.db-connection-background.validation}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -22,15 +22,23 @@
# class used to relax integrity constraint
db-vendor-constraint-class.A=${oracle.db-vendor-constraint-class}
+# vendor specific properties
db-connection.caching.A=false
-db-statement.cache.size.A=10
-db-statement.caching.enabled.A=true
+db-statement.cache.size.A=0
+db-statement.caching.enabled.A=false
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.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><entry><key>ImplicitCachingEnabled</key><value>${db-statement.caching.enabled.A}</value></entry>
db.supports.xa.A=${oracle.db.supports.xa}
+# JBoss managed connection factory settings
+
+db-connection-share.prepared.statements.A=${oracle.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.A=${oracle.db-connection-prepared.statement.cache.size}
+
db-pool-min.size.A=${oracle.db-pool-min.size}
db-pool-max.size.A=${oracle.db-pool-max.size}
db-connection-blocking.timeout.A=${oracle.db-connection-blocking.timeout}
db-connection-idle.timeout.A=${oracle.db-connection-idle.timeout}
+db-connection-background.interval.A=${oracle.db-connection-background.interval}
+db-connection-background.validation.A=${oracle.db-connection-background.validation}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -22,15 +22,23 @@
# class used to relax integrity constraint
db-vendor-constraint-class.B=${oracle.db-vendor-constraint-class}
+# vendor specific properties
db-connection.caching.B=false
-db-statement.cache.size.B=10
-db-statement.caching.enabled.B=true
+db-statement.cache.size.B=0
+db-statement.caching.enabled.B=false
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.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><entry><key>ImplicitCachingEnabled</key><value>${db-statement.caching.enabled.B}</value></entry>
db.supports.xa.B=${oracle.db.supports.xa}
+# JBoss managed connection factory settings
+
+db-connection-share.prepared.statements.B=${oracle.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.B=${oracle.db-connection-prepared.statement.cache.size}
+
db-pool-min.size.B=${oracle.db-pool-min.size}
db-pool-max.size.B=${oracle.db-pool-max.size}
db-connection-blocking.timeout.B=${oracle.db-connection-blocking.timeout}
db-connection-idle.timeout.B=${oracle.db-connection-idle.timeout}
+db-connection-background.interval.B=${oracle.db-connection-background.interval}
+db-connection-background.validation.B=${oracle.db-connection-background.validation}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -27,3 +27,7 @@
oracle.db-pool-max.size=20
oracle.db-connection-blocking.timeout=1000
oracle.db-connection-idle.timeout=2000
+oracle.db-connection-background.interval=1000
+oracle.db-connection-background.validation=false
+oracle.db-connection-share.prepared.statements=true
+oracle.db-connection-prepared.statement.cache.size=20
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/shared-database.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/shared-database.properties 2009-12-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/shared-database.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -8,10 +8,3 @@
# dbunit vendor db factory for data types
db-vendor-dbunit-datatype.factory=org.dbunit.dataset.datatype.DefaultDataTypeFactory
-db-pool-min.size=0
-db-pool-max.size=10
-db-connection-blocking.timeout=1000
-db-connection-idle.timeout=100000
-
-# pooling configuration
-db-connection.caching=false
\ No newline at end of file
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-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -1,2 +1,2 @@
-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>
-datasoure.xml.B=<bean name="caveatEmptorDatasourceFactoryB" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceB</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.B}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.B}</property><property name="userName">${db-vendor-jdbc-userName.B}</property><property name="password">${db-vendor-jdbc-password.B}</property><property name="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property> <property name="blockingTimeout">${db-connection-blocking.timeout.B}</property> <property name="idleTimeout">${db-connection-idle.timeout.B}</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="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryB" /></constructor></bean>
\ No newline at end of file
+local-tx.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="idleTimeout">${db-connection-idle.timeout.A}</property><property name="blockingTimeout">${db-connection-blocking.timeout.A}</property><!-- not supported property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property--><property name="preparedStatementCacheSize"!
>${db-connection-prepared.statement.cache.size.A}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.A}</property><property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryA" /></constructor></bean>
+local-tx.datasoure.xml.B=<bean name="caveatEmptorDatasourceFactoryB" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceB</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.B}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.B}</property><property name="userName">${db-vendor-jdbc-userName.B}</property><property name="password">${db-vendor-jdbc-password.B}</property><property name="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property><property name="idleTimeout">${db-connection-idle.timeout.B}</property><property name="blockingTimeout">${db-connection-blocking.timeout.B}</property><!-- not supported property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property--><property name="preparedStatementCacheSize"!
>${db-connection-prepared.statement.cache.size.B}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.B}</property><property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryB" /></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-16 16:48:00 UTC (rev 30718)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties 2009-12-16 16:53:47 UTC (rev 30719)
@@ -1,2 +1,2 @@
-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>
+xa.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="minSize">${db-pool-min.size.A}</property><property name="maxSize">${db-pool-max.size.A}</property><property name="idleTimeout">${db-connection-idle.timeout.A}</property><property name="blockingTimeout">${db-connection-blocking.timeout.A}</property><property name="backgroundInterval">${db-connection-background.interval.A}</property><property name="backgroundValidation">${db-connection-background.validation.A}</property><property name="preparedStatementCacheSize">${db-connection-prepared.statement.ca!
che.size.A}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.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.JndiBinder"><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>
+xa.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="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property><property name="idleTimeout">${db-connection-idle.timeout.B}</property><property name="blockingTimeout">${db-connection-blocking.timeout.B}</property><property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property><property name="preparedStatementCacheSize">${db-connection-prepared.statement.ca!
che.size.B}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.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.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>
More information about the jboss-svn-commits
mailing list