[jboss-svn-commits] JBL Code SVN: r30087 - in labs/jbosstm/workspace/whitingjr/trunk/performance/src/main: java/org/jboss/jbossts/tomcat and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 10 12:20:24 EST 2009
Author: whitingjr
Date: 2009-11-10 12:20:22 -0500 (Tue, 10 Nov 2009)
New Revision: 30087
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/MCXaDataSourceWrapper.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/tomcat/XADataSourceWrapper.java
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/embedded-jboss-beans.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties
Log:
Added support for XA database.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/MCXaDataSourceWrapper.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/MCXaDataSourceWrapper.java 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/performance/MCXaDataSourceWrapper.java 2009-11-10 17:20:22 UTC (rev 30087)
@@ -40,6 +40,10 @@
{
private Hashtable initialContextProperties;
private static final Logger logger = Logger.getLogger(MCXaDataSourceWrapper.class);
+ /* credentials repeater here on behalf of connection wrapper, dispite the credentials
+ * have been set on the driver class. */
+ private String user;
+ private String password;
public Hashtable getInitialContextProperties()
{
@@ -66,9 +70,11 @@
return getTransactionalDriver().connect(url, properties);
}
- public MCXaDataSourceWrapper(String name, XADataSource theDataSource)
+ public MCXaDataSourceWrapper(String name, XADataSource theDataSource, String userName, String passwrd)
{
super(name, theDataSource);
+ this.user = userName;
+ this.password = passwrd;
}
@Override
public Connection getConnection() throws SQLException
@@ -79,6 +85,10 @@
Properties properties = new Properties();
properties.setProperty("Context.INITIAL_CONTEXT_FACTORY", (String)this.initialContextProperties.get(Context.INITIAL_CONTEXT_FACTORY));
properties.setProperty("Context.URL_PKG_PREFIXES", (String)this.initialContextProperties.get(Context.URL_PKG_PREFIXES));
+ logger.debug("user["+this.user+"]");
+ logger.debug("password["+this.password+"]");
+ properties.setProperty(TransactionalDriver.userName, this.user);
+ properties.setProperty(TransactionalDriver.password, this.password);
return getTransactionalConnection(url, properties);
- }
+ }
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/tomcat/XADataSourceWrapper.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/tomcat/XADataSourceWrapper.java 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/java/org/jboss/jbossts/tomcat/XADataSourceWrapper.java 2009-11-10 17:20:22 UTC (rev 30087)
@@ -21,18 +21,16 @@
package org.jboss.jbossts.tomcat;
-import javax.sql.XADataSource;
-import javax.sql.XAConnection;
-import javax.sql.DataSource;
-import javax.naming.Context;
-import java.sql.SQLException;
-import java.sql.Connection;
import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
import java.util.Properties;
+import javax.sql.DataSource;
+import javax.sql.XAConnection;
+import javax.sql.XADataSource;
+
import com.arjuna.ats.jdbc.TransactionalDriver;
-import com.arjuna.ats.jdbc.common.jdbcPropertyManager;
-import com.arjuna.common.util.propertyservice.PropertyManager;
/**
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-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/META-INF/persistence.xml 2009-11-10 17:20:22 UTC (rev 30087)
@@ -28,27 +28,9 @@
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>
<property name="use_sql_comments" value="false"/>
+ <property name="org.hibernate.SQL" value="true"/>
+
- <!-- We have a JTA data source...
- <property name="hibernate.connection.driver_class"
- value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.connection.url"
- value="jdbc:hsqldb:hsql://localhost"/>
- <property name="hibernate.connection.username"
- value="sa"/>
-
- <property name="hibernate.c3p0.min_size"
- value="5"/>
- <property name="hibernate.c3p0.max_size"
- value="20"/>
- <property name="hibernate.c3p0.timeout"
- value="300"/>
- <property name="hibernate.c3p0.max_statements"
- value="50"/>
- <property name="hibernate.c3p0.idle_test_period"
- value="3000"/>
- -->
-
<property name="hibernate.dialect"
value="${db-vendor-hibernate.dialect}"/>
@@ -61,6 +43,9 @@
-->
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.generate_statistics"
+ value="false"/>
+
<property name="hibernate.session_factory_name" value="java:/persistence/HibernateSessionFactory"/>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2009-11-10 17:20:22 UTC (rev 30087)
@@ -160,7 +160,7 @@
ADDED_ON ="2006-09-23 13:45:00"
/>
- <COMMENT
+ <COMMENT_T
COMMENT_ID ="1"
OBJ_VERSION ="0"
RATING ="OK"
Modified: 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.xml 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/embedded-jboss-beans.xml 2009-11-10 17:20:22 UTC (rev 30087)
@@ -1,5 +1,4 @@
<?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">
@@ -36,13 +35,13 @@
</constructor>
</bean>
- <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
+ <!-- bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
<property name="xidFactory"><inject bean="XidFactory"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
- </bean>
+ </bean-->
+
- <bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
- <demand>TransactionManagerInitializer</demand>
+ <bean name="UserTransaction" class="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple">
</bean>
<bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
@@ -51,125 +50,17 @@
<property name="bindTo">UserTransaction</property>
<property name="serializable">false</property>
</bean>
+ <bean name="TransactionManagerBinding" class="org.jboss.ejb3.embedded.JndiBinder">
+ <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
+ <property name="target"><inject bean="TransactionManager"/></property>
+ <property name="bindTo">java:/TransactionManager</property>
+ <property name="serializable">false</property>
+ </bean>
-
- <bean name="TransactionManager" class="java.lang.Object">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManagerInitializer"/>
- </constructor>
+ <bean name="TransactionManager" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple">
</bean>
<bean name="CachedConnectionManager" class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
<property name="transactionManager"><inject bean="TransactionManager"/></property>
</bean>
- <!--
- <bean class="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic,database=localDB">
- <property name="database">localDB</property>
- <property name="inProcessMode">true</property>
- <property name="dbDataDir">.</property>
- </bean>
- -->
-<!--
- <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">org.hsqldb.jdbcDriver</property>
- <property name="connectionURL">jdbc:hsqldb:.</property>
- <property name="userName">sa</property>
- <property name="jndiName">java:/DefaultDS</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="DefaultDS" class="java.lang.Object">
- <constructor factoryMethod="getDatasource">
- <factory bean="DefaultDSBootstrap"/>
- </constructor>
- </bean>
--->
-
- <!--
- <bean name="TimerServiceFactory" class="org.jboss.ejb3.timerservice.quartz.QuartzTimerServiceFactory">
- <property name="properties">
- org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
- org.quartz.jobStore.nonManagedTXDataSource=myDS
- org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
- org.quartz.jobStore.tablePrefix=QRTZ_
- org.quartz.jobStore.dataSource=myDS
-
- # To get it to work with hypersonic
- # FIXME: this doesn't lock the row
- org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
-
- # from quartz.properties
- org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
- org.quartz.scheduler.rmi.export=false
- org.quartz.scheduler.rmi.proxy=false
- org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
-
- org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
- org.quartz.threadPool.threadCount=10
- org.quartz.threadPool.threadPriority=5
- org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-
- org.quartz.jobStore.misfireThreshold=60000
- </property>
- <property name="dataSource">java:/DefaultDS</property>
- <property name="sqlProperties">
- CREATE_DB_ON_STARTUP = TRUE
-
- CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
- DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
- IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
- JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
- CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
- JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
- REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
- CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
- JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
- NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
- TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
- MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
- REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
- CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
- TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
- PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
- FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
- PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
- REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
- CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
- PRIMARY KEY (CALENDAR_NAME))
- CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
- PRIMARY KEY (TRIGGER_GROUP))
- CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
- TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
- FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
- IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
- CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
- LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
- PRIMARY KEY (INSTANCE_NAME))
- CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
- INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
- INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
- INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
- INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
- INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
- </property>
- </bean>
-
- -->
-
</deployment>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2009-11-10 17:20:22 UTC (rev 30087)
@@ -48,29 +48,46 @@
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</logger>
+ <logger name="com.arjuna.ats.internal.jdbc">
+ <level value="TRACE"/>
+ <appender-ref ref="CONSOLE"/>
+ </logger>
- <logger name="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+
+ <!-- logger name="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
<level value="TRACE"/>
<appender-ref ref="FILE"/>
+ </logger-->
+ <logger name="org.jboss.ejb3.embedded.UserTransactionImpl">
+ <level value="TRACE"/>
+ <appender-ref ref="CONSOLE"/>
</logger>
- <logger name="org.dbunit.database">
- <level value="ERROR"/>
- <appender-ref ref="FILE"/>
- </logger>
<logger name="org.jboss.jbossts.performance">
<level value="TRACE"/>
<appender-ref ref="FILE"/>
</logger>
+ <logger name="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple">
+ <level value="TRACE"/>
+ <appender-ref ref="CONSOLE"/>
+ </logger>
- <!--logger name="org.hibernate">
- <level value="INFO"/>
+ <logger name="org.hibernate.transaction.JTATransaction">
+ <level value="TRACE"/>
<appender-ref ref="CONSOLE"/>
</logger>
+ <logger name="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple">
+ <level value="TRACE"/>
+ <appender-ref ref="CONSOLE"/>
+ </logger>
+ <logger name="oracle.jdbc">
+ <level value="TRACE"/>
+ <appender-ref ref="FILE"/>
+ </logger>
+ <logger name="com.arjuna.ats.arjuna.coordinator.BasicAction">
+ <level value="TRACE"/>
+ <appender-ref ref="CONSOLE"/>
+ </logger>
- <logger name="org.hsql">
- <level value="INFO"/>
- <appender-ref ref="CONSOLE"/>
- </logger-->
<root>
<priority value="ERROR" />
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties 2009-11-10 15:04:49 UTC (rev 30086)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties 2009-11-10 17:20:22 UTC (rev 30087)
@@ -57,7 +57,8 @@
# Note: com.mentorgen.tools.profile is always excluded
#
exclude=org.apache.lo4j.*,org.testng.*,org.jboss.*,org.dbunit
-include=${db-vendor-profiling},com.arjuna,org.jboss.jbossts.performance.MCXaDataSourceWrapper,org.hibernate.ejb.EntityManagerImpl,auction.dao.ejb3
+#include=${db-vendor-profiling},org.jboss.jbossts.performance.MCXaDataSourceWrapper,org.hibernate.ejb.EntityManagerImpl
+include=${db-vendor-profiling}
#
# Track Object Allocation (very expensive)
# values: on, off
More information about the jboss-svn-commits
mailing list