[jboss-svn-commits] JBL Code SVN: r29792 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/resources and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 23 10:46:43 EDT 2009
Author: whitingjr
Date: 2009-10-23 10:46:43 -0400 (Fri, 23 Oct 2009)
New Revision: 29792
Added:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans-5.1.0GA.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/db-installation.properties
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
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/persistence.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/hsql/database-locations/co-located-db/db-installation.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml
Log:
Added new configuration for libraries.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2009-10-23 14:46:43 UTC (rev 29792)
@@ -6,7 +6,6 @@
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="lib/caveatemptor-jpa.jar"/>
<classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
<classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
<classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/>
@@ -14,5 +13,6 @@
<classpathentry kind="lib" path="lib/hibernate3.jar"/>
<classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/>
<classpathentry kind="lib" path="lib/thirdparty-all.jar"/>
+ <classpathentry kind="lib" path="lib/caveatemptor-jpa.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2009-10-23 14:46:43 UTC (rev 29792)
@@ -16,9 +16,13 @@
Supports JDBC driver for multi vendors
Supports profiling configuration for vendor specific classes.
-0.0.3 Supports individual XA resource configurations.
+0.0.3 Supports Transaction XA single resource persistence configuration.
+ Support NoTransaction resource persistence configuration.
Checks command line XA parameter against vendor database driver support for XA.
-0.0.4 Added multi XA resource configuration in persistence.xml
+0.0.4 Added multi XA resource persistence configuration.
Supports filtering and merging of results into categories.
+Known issues:
+
+* Derby database implementation does not support relaxing integrety constraints. The sample data provided using DBUnit import needs constraints turning off. This makes Derby an unsuitable database to use with this performance framework.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -28,7 +28,7 @@
<pathelement path="/home/whitingjr/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" />
<pathelement path="lib/client.jar" />
<!--pathelement path="lib/caveatemptor-jpa.jar" /-->
- <!-- try exploding the jar to classpath -->
+ <pathelement path="/home/whitingjr/.m2/repository/org/dbunit/dbunit/2.4.6/dbunit-2.4.6.jar" />
</path>
<path id="demo.run.classpath">
@@ -109,7 +109,7 @@
<delete dir="build" />
<mkdir dir="build" />
<mkdir dir="build/classes" />
- <mkdir dir="build/classes/META-INF"/>
+ <mkdir dir="build/classes/META-INF" />
<!-- load properties, specific first then general -->
<loadproperties srcfile="src/main/resources/properties/database/${db.vendor}/database-locations/${db.installation}/db-installation.properties" />
@@ -144,7 +144,7 @@
</target>
<target name="run-demo-test" depends="compile" description="task to call the Demo application with profiling enabled.">
- <copy file="src/test/resources/testsuite-integration-demo.xml" tofile="build/classes/testsuite-integration-demo.xml"/>
+ <copy file="src/test/resources/testsuite-integration-demo.xml" tofile="build/classes/testsuite-integration-demo.xml" />
<testng outputDir="${test.output.dir}">
<jvmarg value="-javaagent:lib/profile.jar" />
<jvmarg value="-Dprofile.properties=build/classes/profile.properties" />
@@ -161,20 +161,20 @@
</target>
<target name="profile-ejb3" depends="compile">
- <copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml"/>
- <copy file="src/main/resources/embedded-jboss-beans.xml" todir="build/classes"/>
- <copy file="src/main/resources/ejb3-interceptors-aop.xml" todir="build/classes"/>
- <copy file="src/main/resources/jndi.properties" todir="build/classes"/>
- <copy file="src/main/resources/properties/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes"/>
- <!--copy todir="build/classes/META-INF">
- <fileset dir="src/main/resources/META-INF">
- <include name="*.xml"/>
- </fileset>
- </copy-->
- <copy todir="build/classes" file="src/main/resources/basedata.xml"/>
- <unzip dest="build/classes" src="lib/caveatemptor-jpa.jar" >
+ <copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+
+ <copy file="src/main/resources/embedded-jboss-beans.xml" todir="build/classes" />
+ <copy file="src/main/resources/ejb3-interceptors-aop.xml" todir="build/classes" />
+ <copy file="src/main/resources/jndi.properties" todir="build/classes" />
+ <copy file="src/main/resources/properties/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes" />
+ <copy todir="build/classes" file="src/main/resources/basedata.xml" />
+ <unzip dest="build/classes" src="lib/caveatemptor-jpa.jar">
<patternset>
- <include name="**/*.class"/>
+ <include name="**/*.class" />
</patternset>
</unzip>
@@ -184,7 +184,7 @@
<classpath>
<path refid="demo.test.classpath" />
</classpath>
- <xmlfileset file="build/classes/testsuite-integration.xml"/>
+ <xmlfileset file="build/classes/testsuite-integration.xml" />
</testng>
</target>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -33,7 +33,11 @@
<artifactId>jip-client</artifactId>
<version>1.0</version>
</dependency>
-
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.6</version>
+ </dependency>
</dependencies>
<build>
<plugins>
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-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/caveatemptor-beans.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -5,11 +5,28 @@
xmlns="urn:jboss:bean-deployer:2.0">
<!-- Enable a JCA datasource available through JNDI -->
+ <!-- bean name="caveatEmptorDatasourceFactory"
+ class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+ <property name="jndiName">java:/caveatemptorTestingDatasource</property>
+
+ <property name="driverClass">${db-vendor-jdbc-driverClass}</property>
+ <property name="connectionURL">${db-vendor-jdbc-connectionURL}</property>
+ <property name="userName">${db-vendor-jdbc-userName}</property>
+
+ <property name="minSize">0</property>
+ <property name="maxSize">10</property>
+ <property name="blockingTimeout">1000</property>
+ <property name="idleTimeout">100000</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="caveatEmptorDatasourceFactory"
class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
<property name="jndiName">java:/caveatemptorTestingDatasource</property>
- <!-- HSQL DB -->
<property name="driverClass">${db-vendor-jdbc-driverClass}</property>
<property name="connectionURL">${db-vendor-jdbc-connectionURL}</property>
<property name="userName">${db-vendor-jdbc-userName}</property>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -25,7 +25,7 @@
<!-- SQL stdout logging
-->
- <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>
<property name="use_sql_comments" value="true"/>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -6,26 +6,7 @@
-->
<dataset>
- <BILLING_DETAILS
- BILLING_DETAILS_ID ="1"
- BILLING_DETAILS_TYPE ="CC"
- OBJ_VERSION ="0"
- OWNER ="John Doe"
- CREATED ="2006-09-23 13:45:00"
- USER_ID ="1"
- BA_ACCOUNT ="[NULL]"
- BA_BANKNAME ="[NULL]"
- BA_SWIFT ="[NULL]"
- />
-
- <CREDIT_CARD CREDIT_CARD_ID ="1"
- CC_TYPE ="MASTERCARD"
- CC_NUMBER ="123123123123"
- CC_EXP_MONTH ="08"
- CC_EXP_YEAR ="2010"
- />
-
- <USERS
+ <USERS
USER_ID ="1"
OBJ_VERSION ="0"
FIRSTNAME ="John"
@@ -39,7 +20,7 @@
HOME_STREET ="Foostreet"
HOME_ZIPCODE ="22222"
HOME_CITY ="Foocity"
- DEFAULT_BILLING_DETAILS_ID ="1"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
/>
<USERS
@@ -59,6 +40,27 @@
DEFAULT_BILLING_DETAILS_ID ="[NULL]"
/>
+ <BILLING_DETAILS
+ BILLING_DETAILS_ID ="1"
+ BILLING_DETAILS_TYPE ="CC"
+ OBJ_VERSION ="0"
+ OWNER ="John Doe"
+ CREATED ="2006-09-23 13:45:00"
+ USER_ID ="1"
+ BA_ACCOUNT ="[NULL]"
+ BA_BANKNAME ="[NULL]"
+ BA_SWIFT ="[NULL]"
+ />
+
+ <CREDIT_CARD CREDIT_CARD_ID ="1"
+ CC_TYPE ="MASTERCARD"
+ CC_NUMBER ="123123123123"
+ CC_EXP_MONTH ="08"
+ CC_EXP_YEAR ="2010"
+ />
+
+
+
<ADDRESS
ADDRESS_ID ="1"
OBJ_VERSION ="0"
@@ -66,9 +68,48 @@
ZIPCODE ="12345"
CITY ="Shippingcity"
/>
+<ITEM
+ ITEM_ID ="1"
+ OBJ_VERSION ="0"
+ ITEM_NAME ="Testitem 1"
+ DESCRIPTION ="This is TestItem One."
+ INITIAL_PRICE ="99"
+ INITIAL_PRICE_CURRENCY ="USD"
+ RESERVE_PRICE ="123"
+ RESERVE_PRICE_CURRENCY ="USD"
+ START_DATE ="2006-09-23 13:45:00"
+ END_DATE ="2016-09-23 13:45:00"
+ ITEM_STATE ="ACTIVE"
+ APPROVED_BY_USER_ID ="1"
+ APPROVAL_DATETIME ="2006-09-23 13:45:00"
+ SELLER_ID ="1"
+ SUCCESSFUL_BID_ID ="[NULL]"
+ CREATED ="2006-09-23 13:45:00"
+ />
- <ITEM
+<BID
+ BID_ID ="1"
+ BID_AMOUNT ="100"
+ BID_AMOUNT_CURRENCY ="USD"
ITEM_ID ="1"
+ BIDDER_ID ="1"
+ BID_POSITION ="0"
+ CREATED ="2006-09-23 13:46:00"
+ />
+
+ <BID
+ BID_ID ="2"
+ BID_AMOUNT ="124"
+ BID_AMOUNT_CURRENCY ="USD"
+ ITEM_ID ="1"
+ BIDDER_ID ="1"
+ BID_POSITION ="1"
+ CREATED ="2006-09-23 13:47:00"
+ />
+
+
+<ITEM
+ ITEM_ID ="1"
OBJ_VERSION ="0"
ITEM_NAME ="Testitem 1"
DESCRIPTION ="This is TestItem One."
@@ -84,7 +125,7 @@
SELLER_ID ="1"
SUCCESSFUL_BID_ID ="2"
CREATED ="2006-09-23 13:45:00"
- />
+ />
<ITEM
ITEM_ID ="2"
@@ -105,26 +146,7 @@
CREATED ="2006-09-23 13:45:00"
/>
- <BID
- BID_ID ="1"
- BID_AMOUNT ="100"
- BID_AMOUNT_CURRENCY ="USD"
- ITEM_ID ="1"
- BIDDER_ID ="1"
- BID_POSITION ="0"
- CREATED ="2006-09-23 13:46:00"
- />
-
- <BID
- BID_ID ="2"
- BID_AMOUNT ="124"
- BID_AMOUNT_CURRENCY ="USD"
- ITEM_ID ="1"
- BIDDER_ID ="1"
- BID_POSITION ="1"
- CREATED ="2006-09-23 13:47:00"
- />
-
+
<CATEGORY
CATEGORY_ID ="1"
OBJ_VERSION ="0"
Copied: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans-5.1.0GA.xml (from rev 29643, labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml)
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans-5.1.0GA.xml (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans-5.1.0GA.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -0,0 +1,217 @@
+<?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">
+ <bean name="Naming" class="org.jnp.server.SingletonNamingServer" />
+
+ <bean name="InitialContextProperties" class="java.util.Hashtable">
+ <constructor>
+ <parameter class="java.util.Map">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>java.naming.factory.initial</key>
+ <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
+ </entry>
+ <entry>
+ <key>java.naming.factory.url.pkgs</key>
+ <value>org.jboss.naming:org.jnp.interfaces</value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
+ <property name="jndiProperties">
+ <inject bean="InitialContextProperties" />
+ </property>
+ </bean>
+
+ <!-- bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl" />
+
+ <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
+ <constructor>
+ <parameter class="org.jboss.tm.XidFactoryBase">
+ <inject bean="XidFactory" />
+ </parameter>
+ </constructor>
+ </bean-->
+
+ <!-- bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
+ <property name="xidFactory">
+ <inject bean="XidFactory" />
+ </property>
+ <property name="initialContextProperties">
+ <inject bean="InitialContextProperties" />
+ </property>
+ </bean-->
+
+ <!-- bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
+ <demand>TransactionManagerInitializer</demand>
+ </bean>
+
+ <bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
+ <property name="jndiProperties">
+ <inject bean="InitialContextProperties" />
+ </property>
+ <property name="target">
+ <inject bean="UserTransaction" />
+ </property>
+ <property name="bindTo">UserTransaction</property>
+ <property name="serializable">false</property>
+ </bean-->
+
+ <!-- bean name="TransactionManager" class="java.lang.Object">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManagerInitializer" />
+ </constructor>
+ </bean-->
+ <!-- bean name="CachedConnectionManager"
+ class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
+ <property name="transactionManager">
+ <inject bean="TransactionManager" />
+ </property>
+ </bean-->
+
+ <!-- configuration pulled from the AS 5.1 release - -->
+
+ <!-- JBossTS Recovery Manager -->
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">TransactionManager</property>
+ <property name="bindingName">recoveryManager</property>
+ <property name="port">4712</property>
+ <property name="description">Socket for JBossTS Recovery Manager</property>
+ </bean>
+
+ <!-- JBossTS Transaction Status Manager -->
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">TransactionManager</property>
+ <property name="bindingName">transactionStatusManager</property>
+ <property name="port">4713</property>
+ <property name="description">Socket for JBossTS Transaction Status Manager
+ </property>
+ </bean>
+
+ <!--
+ JBossTS SocketProcessId. The address part is ignored, it will always
+ use localhost/127.0.0.1.
+ -->
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">TransactionManager</property>
+ <property name="bindingName">socketProcessId</property>
+ <property name="port">4714</property>
+ <property name="description">Socket used to provide unique process id for
+ JBossTS. The address configuration is ignored; will always use
+ localhost/127.0.0.1</property>
+ </bean>
+
+ <!-- taken from jboss-5.1.0.GA/server/default/conf/bindingservice.beans/META-INF/bindings-jboss-beans.xml -->
+
+<!-- The actual SBM from which services obtain binding information -->
+ <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
+
+ <!-- Here we use the ServiceBindingManagementObject as a factory to create the SBM -->
+ <constructor factoryMethod="getServiceBindingManager">
+ <factory bean="ServiceBindingManagementObject"/>
+ </constructor>
+
+ </bean>
+
+<!-- taken from jboss-5.1.0.GA/server/default/deploy/transaction-jboss-beans.xml -->
+
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class)</annotation>
+
+ <property name="transactionTimeout">300</property>
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+
+ <property name="transactionStatusManagerInetAddress">
+ <value-factory bean="ServiceBindingManager"
+ method="getInetAddressBinding">
+ <parameter>TransactionManager</parameter>
+ <parameter>transactionStatusManager</parameter>
+ </value-factory>
+ </property>
+ <property name="transactionStatusManagerPort">
+ <value-factory bean="ServiceBindingManager"
+ method="getIntBinding" >
+ <parameter>TransactionManager</parameter>
+ <parameter>transactionStatusManager</parameter>
+ </value-factory>
+ </property>
+
+ <property name="recoveryInetAddress">
+ <value-factory bean="ServiceBindingManager"
+ method="getInetAddressBinding">
+ <parameter>TransactionManager</parameter>
+ <parameter>recoveryManager</parameter>
+ </value-factory>
+ </property>
+ <property name="recoveryPort">
+ <value-factory bean="ServiceBindingManager"
+ method="getIntBinding" >
+ <parameter>TransactionManager</parameter>
+ <parameter>recoveryManager</parameter>
+ </value-factory>
+ </property>
+
+ <property name="socketProcessIdPort">0</property>
+
+ </bean>
+
+ <!-- Make javax.transaction.TransactionManager available for injection -->
+ <bean name="RealTransactionManager">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManager"/>
+ </constructor>
+ </bean>
+
+ <!-- Handles user transaction providers and listeners -->
+ <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
+ <!-- Register providers -->
+ <incallback method="addProvider"/>
+ <uncallback method="removeProvider"/>
+ <!-- Register listeners -->
+ <incallback method="addListener"/>
+ <uncallback method="removeListener"/>
+ </bean>
+
+ <!-- The provider for default in process UserTransactions -->
+ <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
+ <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
+ <demand>TransactionManager</demand>
+ </bean>
+
+ <!-- CACHED CONNECTION MANAGER taken from jboss-5.1.0.GA/server/default/deploy/jca-jboss-beans.xml -->
+ <bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManager">
+
+ <!-- Expose via JMX -->
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jca:service=CachedConnectionManager", exposedInterface=org.jboss.resource.connectionmanager.CachedConnectionManagerMBean.class)</annotation>
+
+ <!-- Whether to track unclosed connections and close them -->
+ <property name="debug">true</property>
+
+ <!-- Whether to throw an error for unclosed connections (true) or just log a warning (false) -->
+ <property name="error">false</property>
+
+ <!-- The transaction manager -->
+ <property name="transactionManager"><inject bean="TransactionManager" property="transactionManager"/></property>
+
+ </bean>
+
+ <!-- The legacy JMX kernel taken from jboss-5.1.0.GA/server/default/conf/bootstrap/jmx.xml-->
+ <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="serverImpl"><inject bean="JBossServer"/></property>
+ <property name="serverInfo"><inject bean="ServerInfo"/></property>
+ </bean>
+
+ <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
+ <alias>jboss.system:type=ServerInfo</alias>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -7,6 +7,16 @@
<!-- Append messages to the console -->
<!-- ============================== -->
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="Target" value="log.txt" />
+ <param name="Threshold" value="TRACE" />
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+ </layout>
+ </appender>
+
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<param name="Threshold" value="TRACE" />
@@ -33,14 +43,14 @@
</logger>
<logger name="org.jboss.ejb3.embedded">
- <level value="TRACE"/>
+ <level value="ERROR"/>
<appender-ref ref="CONSOLE"/>
</logger>
- <!-- logger name="org.jboss">
- <level value="INFO"/>
- <appender-ref ref="CONSOLE"/>
+ <logger name="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+ <level value="TRACE"/>
+ <appender-ref ref="FILE"/>
</logger>
- <logger name="org.testng">
+ <!--logger name="org.testng">
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</logger>
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/db-installation.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/db-installation.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/database-locations/embedded-db/db-installation.properties 2009-10-23 14:46:43 UTC (rev 29792)
@@ -0,0 +1,10 @@
+# database dialect
+db-vendor-hibernate.dialect=org.hibernate.dialect.DerbyDialect
+
+# driver settings
+db-vendor-jdbc-driverClass=org.apache.derby.jdbc.EmbeddedDataSource
+db-vendor-jdbc-connectionURL=jdbc:derby:derbydb;create=true
+db-vendor-jdbc-userName=sa
+
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory=org.dbunit.dataset.datatype.DefaultDataTypeFactory
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/db-profile.properties 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/derby/db-profile.properties 2009-10-23 14:46:43 UTC (rev 29792)
@@ -3,3 +3,5 @@
# inclusion xpaths
db.xslt.xpaths=/*/@db-class='x.x.DriverClass'
+
+db.supports.xa=true
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/hsql/database-locations/co-located-db/db-installation.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/hsql/database-locations/co-located-db/db-installation.properties 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/hsql/database-locations/co-located-db/db-installation.properties 2009-10-23 14:46:43 UTC (rev 29792)
@@ -5,3 +5,7 @@
db-vendor-jdbc-driverClass=org.hsqldb.jdbcDriver
db-vendor-jdbc-connectionURL=jdbc:hsqldb:hsql://localhost
db-vendor-jdbc-userName=sa
+
+
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory=org.dbunit.ext.hsqldb.HsqldbDataTypeFactory
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml 2009-10-23 14:45:12 UTC (rev 29791)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml 2009-10-23 14:46:43 UTC (rev 29792)
@@ -25,6 +25,9 @@
<!-- Database dataset location for DBUnit -->
<parameter name="basedata_location" value="basedata.xml" />
+
+ <!-- Database dataset factory for DBUnit -->
+ <parameter name="datatype_factory" value="${db-vendor-dbunit-datatype.factory}"/>
<test name="Integration JPA">
<groups>
More information about the jboss-svn-commits
mailing list