[jboss-cvs] JBossAS SVN: r112232 - in projects/jboss-jca/branches/Branch_1_0: core/src/main/java/org/jboss/jca/core/connectionmanager and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 13 14:41:43 EDT 2011
Author: jesper.pedersen
Date: 2011-09-13 14:41:43 -0400 (Tue, 13 Sep 2011)
New Revision: 112232
Modified:
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ccm/CachedConnectionManager.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManager.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerTestCase.java
projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyRaXmlTestCase.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyTestCase.java
projects/jboss-jca/branches/Branch_1_0/embedded/src/main/resources/jca.xml
projects/jboss-jca/branches/Branch_1_0/sjc/src/main/resources/bootstrap/jca.xml
Log:
[JBJCA-672] ConnectionManager shutdown never called
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ccm/CachedConnectionManager.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ccm/CachedConnectionManager.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ccm/CachedConnectionManager.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -70,4 +70,14 @@
* @param connection connection handle
*/
public void unregisterConnection(ConnectionCacheListener cm, Object connection);
+
+ /**
+ * Start
+ */
+ public void start();
+
+ /**
+ * Stop
+ */
+ public void stop();
}
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -30,7 +30,6 @@
import org.jboss.jca.core.connectionmanager.listener.ConnectionState;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
import org.jboss.jca.core.spi.transaction.TransactionIntegration;
-import org.jboss.jca.core.spi.transaction.usertx.UserTransactionRegistry;
import java.io.IOException;
import java.io.NotSerializableException;
@@ -95,9 +94,6 @@
/** Startup/ShutDown flag */
private final AtomicBoolean shutdown = new AtomicBoolean(false);
- /** User transaction registry */
- private UserTransactionRegistry userTransactionRegistry;
-
/** Cached connection manager */
private CachedConnectionManager cachedConnectionManager;
@@ -138,24 +134,12 @@
}
/**
- * Set the user transaction registry
- * @param utr The value
- */
- public void setUserTransactionRegistry(UserTransactionRegistry utr)
- {
- this.userTransactionRegistry = utr;
- }
-
- /**
* Sets cached connection manager.
* @param cachedConnectionManager cached connection manager
*/
public void setCachedConnectionManager(CachedConnectionManager cachedConnectionManager)
{
this.cachedConnectionManager = cachedConnectionManager;
-
- if (userTransactionRegistry != null && cachedConnectionManager != null)
- userTransactionRegistry.addListener(cachedConnectionManager);
}
/**
@@ -168,18 +152,15 @@
}
/**
- * Sets shut down flag.
- * @param shutDown shut down flag
+ * Shutdown
*/
- public void setShutDown(boolean shutDown)
+ public void shutdown()
{
- this.shutdown.set(shutDown);
+ getLogger().debug(jndiName + ": shutdown");
+ shutdown.set(true);
- if (shutDown)
- {
- if (userTransactionRegistry != null && cachedConnectionManager != null)
- userTransactionRegistry.removeListener(cachedConnectionManager);
- }
+ if (pool != null)
+ pool.shutdown();
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManager.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManager.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManager.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -101,4 +101,9 @@
* @param c connection
*/
public void unregisterAssociation(ConnectionListener cl, Object c);
+
+ /**
+ * Shutdown
+ */
+ public void shutdown();
}
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -28,7 +28,6 @@
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
import org.jboss.jca.core.connectionmanager.tx.TxConnectionManagerImpl;
import org.jboss.jca.core.spi.transaction.TransactionIntegration;
-import org.jboss.jca.core.spi.transaction.usertx.UserTransactionRegistry;
import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
import javax.transaction.TransactionManager;
@@ -103,7 +102,7 @@
useCcm, ccm,
flushStrategy,
allocationRetry, allocationRetryWaitMillis,
- null, null);
+ null);
setNoTxProperties(cm);
return cm;
@@ -180,7 +179,7 @@
useCcm, ccm,
flushStrategy,
allocationRetry, allocationRetryWaitMillis,
- txIntegration.getTransactionManager(), txIntegration.getUserTransactionRegistry());
+ txIntegration.getTransactionManager());
setTxProperties(cm, interleaving, xaResourceTimeout, isSameRMOverride, wrapXAResource, padXid);
return cm;
@@ -198,7 +197,6 @@
* @param allocationRetry The allocation retry value
* @param allocationRetryWaitMillis The allocation retry millis value
* @param tm The transaction manager
- * @param utr The user transaction registry
*/
private void setProperties(AbstractConnectionManager cm,
Pool pool,
@@ -209,8 +207,7 @@
FlushStrategy flushStrategy,
Integer allocationRetry,
Long allocationRetryWaitMillis,
- TransactionManager tm,
- UserTransactionRegistry utr)
+ TransactionManager tm)
{
pool.setConnectionListenerFactory(cm);
cm.setPool(pool);
@@ -226,8 +223,6 @@
if (allocationRetryWaitMillis != null)
cm.setAllocationRetryWaitMillis(allocationRetryWaitMillis.longValue());
- cm.setUserTransactionRegistry(utr);
-
if (useCcm)
cm.setCachedConnectionManager(ccm);
}
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerImpl.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -28,6 +28,7 @@
import org.jboss.jca.core.connectionmanager.listener.ConnectionCacheListener;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
import org.jboss.jca.core.spi.transaction.TxUtils;
+import org.jboss.jca.core.spi.transaction.usertx.UserTransactionRegistry;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -81,6 +82,9 @@
private TransactionSynchronizationRegistry transactionSynchronizationRegistry;
+ /** User transaction registry */
+ private UserTransactionRegistry userTransactionRegistry;
+
/**
* ThreadLocal that holds current calling meta-programming aware
* object, used in case someone is idiotic enough to cache a
@@ -109,12 +113,15 @@
* Creates a new instance.
* @param transactionManager The transaction manager
* @param transactionSynchronizationRegistry the transaction synchronization registry
+ * @param userTransactionRegistry The user transaction registry
*/
public CachedConnectionManagerImpl(TransactionManager transactionManager,
- TransactionSynchronizationRegistry transactionSynchronizationRegistry)
+ TransactionSynchronizationRegistry transactionSynchronizationRegistry,
+ UserTransactionRegistry userTransactionRegistry)
{
this.transactionManager = transactionManager;
this.transactionSynchronizationRegistry = transactionSynchronizationRegistry;
+ this.userTransactionRegistry = userTransactionRegistry;
}
/**
@@ -154,6 +161,24 @@
}
/**
+ * Start
+ */
+ public void start()
+ {
+ if (userTransactionRegistry != null)
+ userTransactionRegistry.addListener(this);
+ }
+
+ /**
+ * Stop
+ */
+ public void stop()
+ {
+ if (userTransactionRegistry != null)
+ userTransactionRegistry.removeListener(this);
+ }
+
+ /**
* {@inheritDoc}
*/
public void userTransactionStarted() throws SystemException
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -276,6 +276,8 @@
*/
public void emptyManagedConnectionPool(ManagedConnectionPool pool)
{
+ log.debug(poolName + ": emptyManagedConnectionPool(" + pool + ")");
+
if (pool != null)
{
Iterator<ManagedConnectionPool> it = mcpPools.values().iterator();
@@ -306,6 +308,8 @@
*/
public void flush(boolean kill)
{
+ log.debug(poolName + ": flush(" + kill + ")");
+
Set<ManagedConnectionPool> clearMcpPools = new HashSet<ManagedConnectionPool>();
Iterator<ManagedConnectionPool> it = mcpPools.values().iterator();
@@ -577,6 +581,8 @@
*/
public void shutdown()
{
+ log.debug(poolName + ": shutdown");
+
flush(true);
}
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerTestCase.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/ccm/CachedConnectionManagerTestCase.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.connectionmanager.ConnectionRecord;
import org.jboss.jca.core.connectionmanager.listener.ConnectionCacheListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
+import org.jboss.jca.core.spi.transaction.usertx.UserTransactionRegistry;
import java.util.Arrays;
import java.util.LinkedList;
@@ -69,7 +70,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionRecord cr0 = mock(ConnectionRecord.class);
@@ -112,7 +114,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ccm.getCurrentObjects().set(null);
//then
@@ -131,7 +134,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionRecord cr0 = mock(ConnectionRecord.class);
@@ -176,7 +180,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ccm.getCurrentObjects().set(null);
//then (parameters are not important the key of this test is that given ccm have no associations
@@ -195,7 +200,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionRecord cr0 = mock(ConnectionRecord.class);
@@ -242,7 +248,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm2 = mock(ConnectionCacheListener.class);
@@ -293,7 +300,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ccm.getCurrentObjects().set(null);
//then (parameters are not important the key of this test is that given ccm have no associations
@@ -312,7 +320,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionRecord cr0 = mock(ConnectionRecord.class);
@@ -358,7 +367,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
ConnectionRecord cr0 = mock(ConnectionRecord.class);
@@ -406,7 +416,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
//when
ccm.pushMetaAwareObject(mock(Object.class), null);
@@ -428,7 +439,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
@@ -478,7 +490,8 @@
//given
TransactionManager tm = mock(TransactionManager.class);
TransactionSynchronizationRegistry tsr = mock(TransactionSynchronizationRegistry.class);
- CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr);
+ UserTransactionRegistry utr = mock(UserTransactionRegistry.class);
+ CachedConnectionManagerImpl ccm = new CachedConnectionManagerImpl(tm, tsr, utr);
ConnectionCacheListener cm0 = mock(ConnectionCacheListener.class);
ConnectionCacheListener cm1 = mock(ConnectionCacheListener.class);
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -76,7 +76,7 @@
{
AbstractConnectionManager connectionManager = new MockConnectionManager();
assertNull(connectionManager.getCachedConnectionManager());
- connectionManager.setCachedConnectionManager(new CachedConnectionManagerImpl(null, null));
+ connectionManager.setCachedConnectionManager(new CachedConnectionManagerImpl(null, null, null));
assertNotNull(connectionManager.getCachedConnectionManager());
}
@@ -208,7 +208,7 @@
public void testGetManagedConnectionInShutdownedManager() throws ResourceException
{
AbstractConnectionManager connectionManager = new MockConnectionManager();
- connectionManager.setShutDown(true);
+ connectionManager.shutdown();
connectionManager.getManagedConnection(null, null);
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -211,6 +211,7 @@
{
List<Object> cfs = new ArrayList<Object>(1);
List<String> jndis = new ArrayList<String>(1);
+ List<ConnectionManager> cms = new ArrayList<ConnectionManager>(1);
List<XAResourceRecovery> recoveryModules = new ArrayList<XAResourceRecovery>(1);
List<org.jboss.jca.core.api.management.DataSource> mgts =
new ArrayList<org.jboss.jca.core.api.management.DataSource>(1);
@@ -236,6 +237,8 @@
org.jboss.jca.core.api.management.DataSource mgtDataSource =
new org.jboss.jca.core.api.management.DataSource(false);
+ ConnectionManager[] cm = new ConnectionManager[1];
+
if (dataSource.getDriverClass() == null && dataSource.getDriver() != null &&
dataSource instanceof DataSourceImpl)
{
@@ -278,12 +281,13 @@
}
Object cf = deployDataSource(dataSource, jndiName,
- uniqueJdbcLocalId, mgtDataSource, jdbcLocalDeploymentCl);
+ uniqueJdbcLocalId, cm, mgtDataSource, jdbcLocalDeploymentCl);
bindConnectionFactory(deploymentName, jndiName, cf);
cfs.add(cf);
jndis.add(jndiName);
+ cms.add(cm[0]);
mgts.add(mgtDataSource);
}
catch (Throwable t)
@@ -320,8 +324,10 @@
{
org.jboss.jca.core.api.management.DataSource mgtDataSource =
new org.jboss.jca.core.api.management.DataSource(true);
- XAResourceRecovery recovery = null;
+ XAResourceRecovery[] recovery = new XAResourceRecovery[1];
+ ConnectionManager[] cm = new ConnectionManager[1];
+
if (xaDataSource.getXaDataSourceClass() == null && xaDataSource.getDriver() != null &&
xaDataSource instanceof XADataSourceImpl)
{
@@ -331,17 +337,18 @@
}
Object cf = deployXADataSource(xaDataSource,
- jndiName, uniqueJdbcXAId,
+ jndiName, uniqueJdbcXAId, cm,
recovery,
mgtDataSource,
jdbcXADeploymentCl);
- recoveryModules.add(recovery);
+ recoveryModules.add(recovery[0]);
bindConnectionFactory(deploymentName, jndiName, cf);
cfs.add(cf);
jndis.add(jndiName);
+ cms.add(cm[0]);
mgts.add(mgtDataSource);
}
catch (Throwable t)
@@ -360,6 +367,7 @@
return new CommonDeployment(url, deploymentName, true, null, null, cfs.toArray(new Object[cfs.size()]),
jndis.toArray(new String[jndis.size()]),
+ cms.toArray(new ConnectionManager[cms.size()]),
null, null,
recoveryModules.toArray(new XAResourceRecovery[recoveryModules.size()]),
null,
@@ -411,16 +419,15 @@
* @param ds The datasource
* @param jndiName The JNDI name
* @param uniqueId The unique id for the resource adapter
+ * @param cma The connection manager array
* @param mgtDs The management of a datasource
* @param cl The class loader
* @return The connection factory
* @exception Throwable Thrown if an error occurs during deployment
*/
- private Object deployDataSource(DataSource ds, String jndiName, String uniqueId,
+ private Object deployDataSource(DataSource ds, String jndiName, String uniqueId, ConnectionManager[] cma,
org.jboss.jca.core.api.management.DataSource mgtDs, ClassLoader cl) throws Throwable
{
- log.debug("DataSource=" + ds);
-
ManagedConnectionFactory mcf = createMcf(ds, uniqueId, cl);
initAndInjectClassLoaderPlugin(mcf, ds);
@@ -497,6 +504,7 @@
}
cm.setJndiName(jndiName);
+ cma[0] = cm;
String poolName = null;
if (ds.getPoolName() != null)
@@ -566,19 +574,18 @@
* @param ds The datasource
* @param jndiName The JNDI name
* @param uniqueId The unique id for the resource adapter
+ * @param cma The connection manager array
* @param recovery The recovery module
* @param mgtDs The management of a datasource
* @param cl The class loader
* @return The connection factory
* @exception Throwable Thrown if an error occurs during deployment
*/
- private Object deployXADataSource(XaDataSource ds, String jndiName, String uniqueId,
- XAResourceRecovery recovery,
+ private Object deployXADataSource(XaDataSource ds, String jndiName, String uniqueId, ConnectionManager[] cma,
+ XAResourceRecovery[] recovery,
org.jboss.jca.core.api.management.DataSource mgtDs, ClassLoader cl)
throws Throwable
{
- log.debug("XaDataSource=" + ds);
-
ManagedConnectionFactory mcf = createMcf(ds, uniqueId, cl);
initAndInjectClassLoaderPlugin(mcf, ds);
@@ -663,6 +670,7 @@
xaResourceTimeout, isSameRMOverride, wrapXAResource, padXid);
cm.setJndiName(jndiName);
+ cma[0] = cm;
String poolName = null;
if (ds.getPoolName() != null)
@@ -803,7 +811,7 @@
recoveryImpl.setJndiName(cm.getJndiName());
getTransactionIntegration().getRecoveryRegistry().addXAResourceRecovery(recoveryImpl);
- recovery = recoveryImpl;
+ recovery[0] = recoveryImpl;
}
// Prefill
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -916,6 +916,7 @@
List<Object> beanValidationObjects = new ArrayList<Object>();
List<Object> cfs = new ArrayList<Object>();
List<String> cfJndiNames = new ArrayList<String>();
+ List<ConnectionManager> cfCMs = new ArrayList<ConnectionManager>();
List<Object> aos = new ArrayList<Object>();
List<String> aoJndiNames = new ArrayList<String>();
List<XAResourceRecovery> recoveryModules = new ArrayList<XAResourceRecovery>(1);
@@ -1305,6 +1306,7 @@
cfJndiNames.add(jndiName);
cm.setJndiName(jndiName);
+ cfCMs.add(cm);
String poolName = null;
@@ -1324,6 +1326,7 @@
cfJndiNames.addAll(Arrays.asList(bindCfJndiNames));
cm.setJndiName(bindCfJndiNames[0]);
+ cfCMs.add(cm);
String poolName = null;
@@ -1721,16 +1724,15 @@
recoveryImpl =
getTransactionIntegration().
- createXAResourceRecovery(mcf,
- padXid,
- isSameRMOverride,
- wrapXAResource,
- recoverUser,
- recoverPassword,
- recoverSecurityDomain,
- getSubjectFactory(
- recoverSecurityDomain),
- plugin);
+ createXAResourceRecovery(mcf,
+ padXid,
+ isSameRMOverride,
+ wrapXAResource,
+ recoverUser,
+ recoverPassword,
+ recoverSecurityDomain,
+ getSubjectFactory(recoverSecurityDomain),
+ plugin);
}
}
}
@@ -1767,6 +1769,7 @@
cfJndiNames.add(jndiName);
cm.setJndiName(jndiName);
+ cfCMs.add(cm);
String poolName = null;
if (connectionDefinition != null)
@@ -1786,6 +1789,7 @@
cfJndiNames.addAll(Arrays.asList(bindCfJndiNames));
cm.setJndiName(bindCfJndiNames[0]);
+ cfCMs.add(cm);
String poolName = null;
if (connectionDefinition != null)
@@ -1946,12 +1950,13 @@
Object[] cfObjs = cfs.size() > 0 ? cfs.toArray(new Object[cfs.size()]) : null;
String[] cfJndis = cfJndiNames.size() > 0 ? cfJndiNames.toArray(new String[cfJndiNames.size()]) : null;
+ ConnectionManager[] cfCM = cfCMs.size() > 0 ? cfCMs.toArray(new ConnectionManager[cfCMs.size()]) : null;
Object[] aoObjs = aos.size() > 0 ? aos.toArray(new Object[aos.size()]) : null;
String[] aoJndis = aoJndiNames.size() > 0 ? aoJndiNames.toArray(new String[aoJndiNames.size()]) : null;
return new CommonDeployment(url, deploymentName, activateDeployment,
resourceAdapter, resourceAdapterKey,
- cfObjs, cfJndis,
+ cfObjs, cfJndis, cfCM,
aoObjs, aoJndis,
recoveryModules.toArray(new XAResourceRecovery[recoveryModules.size()]),
mgtConnector, null, cl, log);
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -23,6 +23,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.DataSource;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.deployers.DeployersLogger;
@@ -55,6 +56,8 @@
private final String[] cfJndiNames;
+ private final ConnectionManager[] cfCMs;
+
private final Object[] aos;
private final String[] aoJndiNames;
@@ -79,6 +82,7 @@
* @param resourceAdapterKey resourceAdapter key
* @param cfs The connection factories
* @param cfJndiNames The JNDI names for the connection factories
+ * @param cfCM The connection managers
* @param aos The admin objects
* @param aoJndiNames The JNDI names for the admin objects
* @param recoveryModules The recovery modules
@@ -89,7 +93,7 @@
*/
public CommonDeployment(URL url, String deploymentName, boolean activateDeployment,
ResourceAdapter resourceAdapter, String resourceAdapterKey,
- Object[] cfs, String[] cfJndiNames,
+ Object[] cfs, String[] cfJndiNames, ConnectionManager[] cfCM,
Object[] aos, String[] aoJndiNames,
XAResourceRecovery[] recoveryModules,
Connector connector, DataSource[] dataSources,
@@ -103,6 +107,7 @@
this.resourceAdapterKey = resourceAdapterKey;
this.cfs = cfs != null ? Arrays.copyOf(cfs, cfs.length) : null;
this.cfJndiNames = cfJndiNames != null ? Arrays.copyOf(cfJndiNames, cfJndiNames.length) : null;
+ this.cfCMs = cfCM != null ? Arrays.copyOf(cfCM, cfCM.length) : null;
this.aos = aos != null ? Arrays.copyOf(aos, aos.length) : null;
this.aoJndiNames = aoJndiNames != null ? Arrays.copyOf(aoJndiNames, aoJndiNames.length) : null;
this.recoveryModules = recoveryModules;
@@ -182,6 +187,16 @@
}
/**
+ * Get the connection managers.
+ *
+ * @return The value
+ */
+ public final ConnectionManager[] getConnectionManagers()
+ {
+ return cfCMs != null ? Arrays.copyOf(cfCMs, cfCMs.length) : null;
+ }
+
+ /**
* Get the aos.
*
* @return the aos.
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
@@ -81,6 +82,9 @@
/** The JNDI names of the connection factories */
protected String[] cfJndis;
+ /** The connection managers */
+ protected ConnectionManager[] cfCMs;
+
/** The admin objects */
protected Object[] aos;
@@ -120,6 +124,7 @@
* @param resourceAdapterRepository The resource adapter repository
* @param cfs The connection factories
* @param cfJndis The JNDI names of the connection factories
+ * @param cfCMs The connection managers
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
* @param recoveryModules The recovery modules
@@ -135,7 +140,7 @@
String raKey,
JndiStrategy jndiStrategy, MetadataRepository metadataRepository,
ResourceAdapterRepository resourceAdapterRepository,
- Object[] cfs, String[] cfJndis,
+ Object[] cfs, String[] cfJndis, ConnectionManager[] cfCMs,
Object[] aos, String[] aoJndis,
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
@@ -152,6 +157,7 @@
this.rar = resourceAdapterRepository;
this.cfs = cfs;
this.cfJndis = cfJndis;
+ this.cfCMs = cfCMs;
this.aos = aos;
this.aoJndis = aoJndis;
this.recoveryModules = recoveryModules;
@@ -255,6 +261,14 @@
}
}
+ if (cfCMs != null)
+ {
+ for (ConnectionManager cm : cfCMs)
+ {
+ cm.shutdown();
+ }
+ }
+
if (cfs != null && cfJndis != null)
{
try
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -230,7 +230,7 @@
kernel.getName());
return new DsXmlDeployment(c.getURL(), c.getDeploymentName(),
- c.getCfs(), c.getCfJndiNames(),
+ c.getCfs(), c.getCfJndiNames(), c.getConnectionManagers(),
c.getRecovery(), getXAResourceRecoveryRegistry(),
c.getDataSources(), getManagementRepository(),
onames, kernel.getMBeanServer(),
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.management.DataSource;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.naming.ExplicitJndiStrategy;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
@@ -64,6 +65,9 @@
/** The JNDI names */
private String[] jndis;
+ /** The connection managers */
+ private ConnectionManager[] cms;
+
/** XAResource recovery modules */
private XAResourceRecovery[] recoveryModules;
@@ -91,6 +95,7 @@
* @param deploymentName The unique deployment name
* @param cfs The connection factories
* @param jndis The JNDI names for the factories
+ * @param cms The connection managers
* @param recoveryModules The recovery modules
* @param recoveryRegistry The recovery registry
* @param dataSources The management view of the datasources
@@ -101,7 +106,7 @@
*/
public DsXmlDeployment(URL deployment,
String deploymentName,
- Object[] cfs, String[] jndis,
+ Object[] cfs, String[] jndis, ConnectionManager[] cms,
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
DataSource[] dataSources, ManagementRepository managementRepository,
List<ObjectName> onames, MBeanServer mbeanServer,
@@ -111,6 +116,7 @@
this.deploymentName = deploymentName;
this.cfs = cfs;
this.jndis = jndis;
+ this.cms = cms;
this.recoveryModules = recoveryModules;
this.recoveryRegistry = recoveryRegistry;
this.dataSources = dataSources;
@@ -178,6 +184,14 @@
}
}
+ if (cms != null)
+ {
+ for (ConnectionManager cm : cms)
+ {
+ cm.shutdown();
+ }
+ }
+
if (cfs != null)
{
JndiStrategy jndiStrategy = new ExplicitJndiStrategy();
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -493,7 +493,7 @@
return new RAActivatorDeployment(c.getURL(), c.getDeploymentName(), c.getResourceAdapter(),
c.getResourceAdapterKey(),
jndiStrategy, metadataRepository, resourceAdapterRepository,
- c.getCfs(), c.getCfJndiNames(),
+ c.getCfs(), c.getCfJndiNames(), c.getConnectionManagers(),
c.getAos(), c.getAoJndiNames(),
c.getRecovery(), getTransactionIntegration().getRecoveryRegistry(),
((RAConfiguration)getConfiguration()).getManagementRepository(),
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
@@ -55,6 +56,7 @@
* @param resourceAdapterRepository The resource adapter repository
* @param cfs The connection factories
* @param cfJndis The JNDI names for the connection factories
+ * @param cfCMs The connection managers
* @param aos The admin objects
* @param aoJndis The JNDI names for the admin objects
* @param recoveryModules The recovery modules
@@ -69,7 +71,7 @@
public RAActivatorDeployment(URL deployment, String deploymentName, ResourceAdapter ra, String raKey,
JndiStrategy jndiStrategy,
MetadataRepository mdr, ResourceAdapterRepository resourceAdapterRepository,
- Object[] cfs, String[] cfJndis,
+ Object[] cfs, String[] cfJndis, ConnectionManager[] cfCMs,
Object[] aos, String[] aoJndis,
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
@@ -77,7 +79,7 @@
ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, true, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
- cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
+ cfs, cfJndis, cfCMs, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
connector, server, objectNames, cl, log);
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -182,7 +182,7 @@
return new RADeployment(c.getURL(), c.getDeploymentName(), c.isActivateDeployment(), c.getResourceAdapter(),
c.getResourceAdapterKey(),
jndiStrategy, metadataRepository, resourceAdapterRepository,
- c.getCfs(), c.getCfJndiNames(),
+ c.getCfs(), c.getCfJndiNames(), c.getConnectionManagers(),
c.getAos(), c.getAoJndiNames(),
c.getRecovery(), getTransactionIntegration().getRecoveryRegistry(),
destination,
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
@@ -63,6 +64,7 @@
* @param resourceAdapterRepository The resource adapter repository
* @param cfs The connection factories
* @param cfJndis The JNDI names of the connection factories
+ * @param cfCMs The connection managers
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
* @param recoveryModules The recovery modules
@@ -79,7 +81,7 @@
String raKey,
JndiStrategy jndiStrategy, MetadataRepository mdr,
ResourceAdapterRepository resourceAdapterRepository,
- Object[] cfs, String[] cfJndis,
+ Object[] cfs, String[] cfJndis, ConnectionManager[] cfCMs,
Object[] aos, String[] aoJndis,
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
File tmpDirectory,
@@ -88,7 +90,7 @@
ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, activator, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
- cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
+ cfs, cfJndis, cfCMs, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
connector, server, objectNames, cl, log);
this.tmpDirectory = tmpDirectory;
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -299,7 +299,7 @@
return new RaXmlDeployment(c.getURL(), deployment, c.getDeploymentName(), c.getResourceAdapter(),
c.getResourceAdapterKey(),
jndiStrategy, metadataRepository, resourceAdapterRepository,
- c.getCfs(), c.getCfJndiNames(),
+ c.getCfs(), c.getCfJndiNames(), c.getConnectionManagers(),
c.getAos(), c.getAoJndiNames(),
c.getRecovery(), getTransactionIntegration().getRecoveryRegistry(),
((RAConfiguration)getConfiguration()).getManagementRepository(), c.getConnector(),
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -24,6 +24,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
@@ -56,6 +57,7 @@
* @param resourceAdapterRepository The resource adapter repository
* @param cfs The connection factories
* @param cfJndis The JNDI names of the connection factories
+ * @param cfCMs The connection managers
* @param aos The admin objects
* @param aoJndis The JNDI names of the admin objects
* @param recoveryModules The recovery modules
@@ -71,7 +73,7 @@
String raKey,
JndiStrategy jndiStrategy, MetadataRepository mdr,
ResourceAdapterRepository resourceAdapterRepository,
- Object[] cfs, String[] cfJndis,
+ Object[] cfs, String[] cfJndis, ConnectionManager[] cfCMs,
Object[] aos, String[] aoJndis,
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
@@ -79,7 +81,7 @@
ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, true, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
- cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
+ cfs, cfJndis, cfCMs, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
connector, server, objectNames, cl, log);
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyRaXmlTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyRaXmlTestCase.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyRaXmlTestCase.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -76,7 +76,8 @@
ConfigPropertyManagedConnection.class, ConfigPropertyConnectionFactory.class,
ConfigPropertyManagedConnectionMetaData.class,
ConfigPropertyConnectionFactoryImpl.class, ConfigPropertyConnection.class,
- ConfigPropertyConnectionImpl.class);
+ ConfigPropertyConnectionImpl.class, ConfigPropertyAdminObjectInterface.class,
+ ConfigPropertyAdminObjectImpl.class);
raa.addAsLibrary(ja);
raa.addAsManifestResource(deploymentName + "/META-INF/ra.xml", "ra.xml");
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyTestCase.java 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ConfigPropertyTestCase.java 2011-09-13 18:41:43 UTC (rev 112232)
@@ -74,7 +74,8 @@
ConfigPropertyManagedConnection.class, ConfigPropertyConnectionFactory.class,
ConfigPropertyManagedConnectionMetaData.class,
ConfigPropertyConnectionFactoryImpl.class, ConfigPropertyConnection.class,
- ConfigPropertyConnectionImpl.class);
+ ConfigPropertyConnectionImpl.class, ConfigPropertyAdminObjectInterface.class,
+ ConfigPropertyAdminObjectImpl.class);
raa.addAsLibrary(ja);
raa.addAsManifestResource(deploymentName + "/META-INF/ra.xml", "ra.xml");
Modified: projects/jboss-jca/branches/Branch_1_0/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/embedded/src/main/resources/jca.xml 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/embedded/src/main/resources/jca.xml 2011-09-13 18:41:43 UTC (rev 112232)
@@ -150,6 +150,7 @@
<constructor>
<parameter><inject bean="TransactionIntegration" property="TransactionManager"/></parameter>
<parameter><inject bean="TransactionIntegration" property="TransactionSynchronizationRegistry"/></parameter>
+ <parameter><inject bean="TransactionIntegration" property="UserTransactionRegistry"/></parameter>
</constructor>
<property name="Debug">false</property>
<property name="Error">false</property>
Modified: projects/jboss-jca/branches/Branch_1_0/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/sjc/src/main/resources/bootstrap/jca.xml 2011-09-13 18:36:58 UTC (rev 112231)
+++ projects/jboss-jca/branches/Branch_1_0/sjc/src/main/resources/bootstrap/jca.xml 2011-09-13 18:41:43 UTC (rev 112232)
@@ -153,6 +153,7 @@
<constructor>
<parameter><inject bean="TransactionIntegration" property="TransactionManager"/></parameter>
<parameter><inject bean="TransactionIntegration" property="TransactionSynchronizationRegistry"/></parameter>
+ <parameter><inject bean="TransactionIntegration" property="UserTransactionRegistry"/></parameter>
</constructor>
<property name="Debug">false</property>
<property name="Error">false</property>
More information about the jboss-cvs-commits
mailing list