You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/05/06 05:59:56 UTC
cvs commit: incubator-geronimo/modules/connector/src/test-data/connector_1_5 geronimo-ra.xml
djencks 2004/05/05 20:59:56
Modified: modules/connector/src/test/org/apache/geronimo/connector/deployment
RAR_1_0DConfigBeanTest.java
RAR_1_5DConfigBeanTest.java
modules/connector/src/test/org/apache/geronimo/connector/mock
MockManagedConnectionFactory.java
modules/connector/src/test/org/apache/geronimo/connector/outbound
ConnectionManagerStressTest.java
ConnectionManagerTestUtils.java
ManagedConnectionFactoryWrapperTest.java
TransactionCachingInterceptorTest.java
modules/connector/src/test-data/connector_1_0
geronimo-ra.xml
modules/connector/src/test-data/connector_1_5
geronimo-ra.xml
Log:
Changed schema and Changed tests for connection manager refactoring
Revision Changes Path
1.5 +4 -4 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java
Index: RAR_1_0DConfigBeanTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RAR_1_0DConfigBeanTest.java 21 Mar 2004 22:24:39 -0000 1.4
+++ RAR_1_0DConfigBeanTest.java 6 May 2004 03:59:55 -0000 1.5
@@ -73,7 +73,7 @@
ConfigPropertySettings connectionDefinitionSetting1 = connectionDefinitionInstance1.getConfigProperty()[0];
connectionDefinitionSetting1.setConfigPropertyValue("TestCDValue1");
//connection manager properties
- connectionDefinitionInstance1.setBlockingTimeout(3000);
+// connectionDefinitionInstance1.setBlockingTimeout(3000);
//check the results
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -91,7 +91,7 @@
assertEquals("TestCDValue1", connectiondefinitionInstanceType.getConfigPropertySettingArray(0).getStringValue());
//connection manager
GerConnectionmanagerType connectionmanagerType = connectiondefinitionInstanceType.getConnectionmanager();
- assertEquals(3000, connectionmanagerType.getBlockingTimeout().intValue());
+// assertEquals(3000, connectionmanagerType.getBlockingTimeout().intValue());
//and read back into dconfigbeans
rarConfiguration.restore(new ByteArrayInputStream(bytes));
@@ -103,7 +103,7 @@
connectionDefinitionSetting1 = connectionDefinitionInstances[0].getConfigProperty()[0];
assertEquals("TestCDValue1", connectionDefinitionSetting1.getConfigPropertyValue());
//connection manager
- assertEquals(3000, connectionDefinitionInstances[0].getBlockingTimeout());
+// assertEquals(3000, connectionDefinitionInstances[0].getBlockingTimeout());
}
1.4 +4 -4 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java
Index: RAR_1_5DConfigBeanTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RAR_1_5DConfigBeanTest.java 10 Mar 2004 09:58:33 -0000 1.3
+++ RAR_1_5DConfigBeanTest.java 6 May 2004 03:59:55 -0000 1.4
@@ -108,7 +108,7 @@
ConfigPropertySettings connectionDefinitionSetting1 = connectionDefinitionInstance1.getConfigProperty()[0];
connectionDefinitionSetting1.setConfigPropertyValue("TestCDValue1");
//connection manager properties
- connectionDefinitionInstance1.setBlockingTimeout(3000);
+// connectionDefinitionInstance1.setBlockingTimeout(3000);
//check the results
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -137,7 +137,7 @@
assertEquals("TestCDValue1", connectiondefinitionInstanceType.getConfigPropertySettingArray(0).getStringValue());
//connection manager
GerConnectionmanagerType connectionmanagerType = connectiondefinitionInstanceType.getConnectionmanager();
- assertEquals(3000, connectionmanagerType.getBlockingTimeout().intValue());
+// assertEquals(3000, connectionmanagerType.getBlockingTimeout().intValue());
//and read back into dconfigbeans
rarConfiguration.restore(new ByteArrayInputStream(bytes));
@@ -168,7 +168,7 @@
connectionDefinitionSetting1 = connectionDefinitionInstances[0].getConfigProperty()[0];
assertEquals("TestCDValue1", connectionDefinitionSetting1.getConfigPropertyValue());
//connection manager
- assertEquals(3000, connectionDefinitionInstances[0].getBlockingTimeout());
+// assertEquals(3000, connectionDefinitionInstances[0].getBlockingTimeout());
}
1.6 +2 -1 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
Index: MockManagedConnectionFactory.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MockManagedConnectionFactory.java 22 Apr 2004 17:06:30 -0000 1.5
+++ MockManagedConnectionFactory.java 6 May 2004 03:59:56 -0000 1.6
@@ -118,6 +118,7 @@
} else {
for (Iterator iterator = connectionSet.iterator(); iterator.hasNext();) {
ManagedConnection managedConnection = (ManagedConnection) iterator.next();
+// return managedConnection;
if (managedConnections.contains(managedConnection)) {
MockManagedConnection mockManagedConnection = (MockManagedConnection) managedConnection;
if ((subject == null ? mockManagedConnection.getSubject() == null : subject.equals(mockManagedConnection.getSubject())
1.2 +15 -5 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java
Index: ConnectionManagerStressTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionManagerStressTest.java 22 Apr 2004 17:06:30 -0000 1.1
+++ ConnectionManagerStressTest.java 6 May 2004 03:59:56 -0000 1.2
@@ -33,13 +33,14 @@
private static final Log log = LogFactory.getLog(ConnectionManagerStressTest.class);
- protected int repeatCount = 100;
- protected int threadCount = 50;
+ protected int repeatCount = 200;
+ protected int threadCount = 100;
private Object startBarrier = new Object();
private Object stopBarrier = new Object();
private int startedThreads = 0;
private int stoppedThreads = 0;
private long totalDuration = 0;
+ private int slowCount = 0;
private Object mutex = new Object();
private Exception e = null;
@@ -59,6 +60,7 @@
public void run() {
TransactionContext.setContext(new UnspecifiedTransactionContext());
long localStartTime = 0;
+ int localSlowCount = 0;
try {
synchronized (startBarrier) {
++startedThreads;
@@ -70,7 +72,13 @@
localStartTime = System.currentTimeMillis();
for (int i = 0; i < repeatCount; i++) {
try {
+ long start = System.currentTimeMillis();
defaultComponentInterceptor.invoke(new DefaultComponentContext());
+ long duration = System.currentTimeMillis() - start;
+ if (duration > 100) {
+ localSlowCount++;
+ System.out.println("got a cx: " + i + ", time: " + (duration));
+ }
} catch (Throwable throwable) {
throwable.printStackTrace();
}
@@ -85,7 +93,8 @@
}
long localDuration = System.currentTimeMillis() - localStartTime;
synchronized (mutex) {
- totalDuration += localDuration;
+ totalDuration += localDuration;
+ slowCount += localSlowCount;
}
}
}
@@ -105,7 +114,8 @@
while (stoppedThreads < threadCount) stopBarrier.wait();
}
long duration = System.currentTimeMillis() - startTime;
- log.info("no tx run, thread count: " + threadCount + ", connection count: " + repeatCount + ", duration: " + duration + ", total duration: " + totalDuration + ", ms per cx request: " + (totalDuration/(threadCount * repeatCount)));
+ log.info("no tx run, thread count: " + threadCount + ", connection count: " + repeatCount + ", duration: " + duration + ", total duration: " + totalDuration + ", ms per cx request: " + (totalDuration / (threadCount * repeatCount)));
+ System.out.println("no tx run, thread count: " + threadCount + ", connection count: " + repeatCount + ", duration: " + duration + ", total duration: " + totalDuration + ", ms per cx request: " + (totalDuration / (threadCount * repeatCount)) + ", slow cx request count: " + slowCount);
//return startTime;
if (e != null) {
throw e;
1.8 +19 -13 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
Index: ConnectionManagerTestUtils.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConnectionManagerTestUtils.java 22 Apr 2004 17:06:30 -0000 1.7
+++ ConnectionManagerTestUtils.java 6 May 2004 03:59:56 -0000 1.8
@@ -28,6 +28,10 @@
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.connector.outbound.connectiontracking.DefaultComponentInterceptor;
import org.apache.geronimo.connector.outbound.connectiontracking.defaultimpl.DefaultComponentContext;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
import org.apache.geronimo.connector.mock.MockConnectionFactory;
import org.apache.geronimo.connector.mock.MockConnection;
@@ -46,19 +50,23 @@
*
* */
public class ConnectionManagerTestUtils extends TestCase implements DefaultInterceptor, RealmBridge {
- protected boolean useConnectionRequestInfo = false;
- protected boolean useSubject = true;
protected boolean useTransactionCaching = true;
protected boolean useLocalTransactions = false;
+ protected boolean useThreadCaching = false;
protected boolean useTransactions = true;
- protected int maxSize = 50;
+ protected int maxSize = 100;
protected int blockingTimeout = 100;
+ protected boolean useConnectionRequestInfo = false;
+ protected boolean useSubject = true;
+ private boolean matchOne = true;
+ private boolean matchAll = false;
+ private boolean selectOneNoMatch = false;
protected String name = "testCF";
//dependencies
protected RealmBridge realmBridge = this;
protected ConnectionTrackingCoordinator connectionTrackingCoordinator;
protected TransactionManager transactionManager;
- protected ConnectionManagerDeployment connectionManagerDeployment;
+ protected AbstractConnectionManager connectionManagerDeployment;
protected MockConnectionFactory connectionFactory;
protected MockManagedConnectionFactory mockManagedConnectionFactory;
protected DefaultComponentContext defaultComponentContext;
@@ -67,6 +75,8 @@
protected MockManagedConnection mockManagedConnection;
protected Subject subject;
protected UserTransactionImpl userTransaction;
+ protected TransactionSupport transactionSupport = new XATransactions(useTransactionCaching, useThreadCaching);
+ protected PoolingSupport poolingSupport = new PartitionedPool(useConnectionRequestInfo, useSubject, maxSize, blockingTimeout, matchOne, matchAll, selectOneNoMatch);
protected void setUp() throws Exception {
connectionTrackingCoordinator = new ConnectionTrackingCoordinator();
@@ -74,14 +84,10 @@
mockManagedConnectionFactory = new MockManagedConnectionFactory();
subject = new Subject();
ContextManager.setCurrentCaller(subject);
- connectionManagerDeployment = new ConnectionManagerDeployment(useConnectionRequestInfo,
- useSubject,
- useTransactionCaching,
- useLocalTransactions,
- useTransactions,
- maxSize,
- blockingTimeout,
- //name,
+ connectionManagerDeployment = new GenericConnectionManager(
+ transactionSupport,
+ poolingSupport,
+ name,
realmBridge,
connectionTrackingCoordinator);
connectionManagerDeployment.doStart();
1.2 +7 -9 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
Index: ManagedConnectionFactoryWrapperTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ManagedConnectionFactoryWrapperTest.java 9 Mar 2004 18:02:03 -0000 1.1
+++ ManagedConnectionFactoryWrapperTest.java 6 May 2004 03:59:56 -0000 1.2
@@ -36,6 +36,8 @@
import org.apache.geronimo.connector.mock.MockConnectionFactory;
import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.naming.deployment.RefAdapter;
@@ -182,14 +184,10 @@
GBeanMBean ctc = new GBeanMBean(ConnectionTrackingCoordinator.getGBeanInfo());
ctcName = ObjectName.getInstance("test:role=ConnectionTrackingCoordinator");
kernel.loadGBean(ctcName, ctc);
- GBeanMBean cmf = new GBeanMBean(ConnectionManagerDeployment.getGBeanInfo());
- cmf.setAttribute("UseConnectionRequestInfo", Boolean.FALSE);
- cmf.setAttribute("UseSubject", Boolean.FALSE);
- cmf.setAttribute("UseTransactionCaching", Boolean.FALSE);
- cmf.setAttribute("UseLocalTransactions", Boolean.FALSE);
- cmf.setAttribute("UseTransactions", Boolean.FALSE);
- cmf.setAttribute("MaxSize", new Integer(10));
- cmf.setAttribute("BlockingTimeout", new Integer(5000));
+ GBeanMBean cmf = new GBeanMBean(GenericConnectionManager.getGBeanInfo());
+ cmf.setAttribute("TransactionSupport", NoTransactions.INSTANCE);
+ cmf.setAttribute("Pooling", new NoPool());
+ cmf.setAttribute("Name", "TestCF");
cmf.setReferencePatterns("ConnectionTracker", Collections.singleton(ctcName));
cmfName = ObjectName.getInstance("test:role=ConnectionManagerFactory");
kernel.loadGBean(cmfName, cmf);
1.7 +2 -2 incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
Index: TransactionCachingInterceptorTest.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransactionCachingInterceptorTest.java 20 Apr 2004 18:29:39 -0000 1.6
+++ TransactionCachingInterceptorTest.java 6 May 2004 03:59:56 -0000 1.7
@@ -41,7 +41,7 @@
protected void setUp() throws Exception {
super.setUp();
transactionManager = new TransactionManagerImpl();
- transactionCachingInterceptor = new TransactionCachingInterceptor(this, this);
+ transactionCachingInterceptor = new TransactionCachingInterceptor(this);
}
protected void tearDown() throws Exception {
1.11 +26 -23 incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml
Index: geronimo-ra.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geronimo-ra.xml 12 Mar 2004 17:58:45 -0000 1.10
+++ geronimo-ra.xml 6 May 2004 03:59:56 -0000 1.11
@@ -27,13 +27,15 @@
<config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
</connectionmanager>
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
@@ -43,14 +45,14 @@
<config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
<config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
<connectionmanager>
- <realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
</connectionmanager>
</connectiondefinition-instance>
<connectiondefinition-instance>
@@ -58,17 +60,18 @@
<config-property-setting name="OutboundStringProperty">StringValue3</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
</connectionmanager>
</connectiondefinition-instance>
</connection-definition>
- <transaction-support>XATransaction</transaction-support>
</outbound-resourceadapter>
</resourceadapter>
1.14 +27 -22 incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
Index: geronimo-ra.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geronimo-ra.xml 8 Apr 2004 20:35:32 -0000 1.13
+++ geronimo-ra.xml 6 May 2004 03:59:56 -0000 1.14
@@ -32,13 +32,15 @@
<config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
</connectionmanager>
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
@@ -49,13 +51,15 @@
<config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>true</useConnectionRequestInfo>
- <useSubject>false</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
</connectionmanager>
</connectiondefinition-instance>
</connection-definition>
@@ -66,17 +70,18 @@
<config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
- <blockingTimeout>5000</blockingTimeout>
- <maxSize>10</maxSize>
- <useTransactions>true</useTransactions>
- <useLocalTransactions>false</useLocalTransactions>
- <useTransactionCaching>true</useTransactionCaching>
- <useConnectionRequestInfo>false</useConnectionRequestInfo>
- <useSubject>true</useSubject>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
</connectionmanager>
</connectiondefinition-instance>
</connection-definition>
- <transaction-support>XATransaction</transaction-support>
</outbound-resourceadapter>
<adminobject>
<adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>