[jboss-cvs] JBossAS SVN: r80597 - in trunk: connector/src/main/org/jboss/resource/connectionmanager and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 6 11:28:12 EST 2008
Author: adrian at jboss.org
Date: 2008-11-06 11:28:12 -0500 (Thu, 06 Nov 2008)
New Revision: 80597
Added:
trunk/server/src/etc/deploy/ejb2-container-jboss-beans.xml
trunk/server/src/main/org/jboss/ejb/EJB2UserTransactionProvider.java
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
trunk/server/src/etc/deploy/transaction-jboss-beans.xml
trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java
Log:
[JBAS-5927][JBAS-6159] - Update to integration 5.0.1.GA which includes UserTransaction/CCM abstraction
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-06 16:10:25 UTC (rev 80596)
+++ trunk/component-matrix/pom.xml 2008-11-06 16:28:12 UTC (rev 80597)
@@ -66,7 +66,7 @@
<version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
<version.org.jboss.cluster.cache.spi>1.0.0.GA</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.cache.jbc>1.0.1.CR1</version.org.jboss.cluster.cache.jbc>
- <version.org.jboss.integration>5.0.0.GA</version.org.jboss.integration>
+ <version.org.jboss.integration>5.0.1.GA</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.metadata>1.0.0.CR5</version.org.jboss.metadata>
<version.org.jboss.naming>5.0.0.GA</version.org.jboss.naming>
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java 2008-11-06 16:10:25 UTC (rev 80596)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java 2008-11-06 16:28:12 UTC (rev 80597)
@@ -42,8 +42,10 @@
import javax.transaction.TransactionManager;
import org.jboss.ejb.EnterpriseContext;
+import org.jboss.jca.spi.ComponentStack;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.tm.TxUtils;
+import org.jboss.tm.usertx.UserTransactionListener;
import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
import org.jboss.util.Strings;
@@ -62,6 +64,8 @@
public class CachedConnectionManager
extends ServiceMBeanSupport
implements ServerVMClientUserTransaction.UserTransactionStartedListener,
+ UserTransactionListener,
+ ComponentStack,
CachedConnectionManagerMBean
{
private boolean specCompliant;
@@ -182,20 +186,7 @@
return result;
}
}
-
- protected void startService()
- throws Exception
- {
- ServerVMClientUserTransaction.getSingleton().registerTxStartedListener(this);
- EnterpriseContext.setUserTransactionStartedListener(this);
- }
- protected void stopService() throws Exception
- {
- ServerVMClientUserTransaction.getSingleton().unregisterTxStartedListener(this);
- EnterpriseContext.setUserTransactionStartedListener(null);
- }
-
//Object registration for meta-aware objects (i.e. this is called by interceptors)
/**
Added: trunk/server/src/etc/deploy/ejb2-container-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/ejb2-container-jboss-beans.xml (rev 0)
+++ trunk/server/src/etc/deploy/ejb2-container-jboss-beans.xml 2008-11-06 16:28:12 UTC (rev 80597)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The provider for EJB2 UserTransactions -->
+ <bean name="EJB2UserTransactionprovider" class="org.jboss.ejb.EJB2UserTransactionProvider">
+ <constructor factoryClass="org.jboss.ejb.EJB2UserTransactionProvider" factoryMethod="getSingleton"/>
+ </bean>
+
+</deployment>
Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2008-11-06 16:10:25 UTC (rev 80596)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2008-11-06 16:28:12 UTC (rev 80597)
@@ -42,4 +42,20 @@
</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>
+
</deployment>
Added: trunk/server/src/main/org/jboss/ejb/EJB2UserTransactionProvider.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EJB2UserTransactionProvider.java (rev 0)
+++ trunk/server/src/main/org/jboss/ejb/EJB2UserTransactionProvider.java 2008-11-06 16:28:12 UTC (rev 80597)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb;
+
+import org.jboss.tm.usertx.UserTransactionProvider;
+import org.jboss.tm.usertx.UserTransactionRegistry;
+
+/**
+ * EJB2UserTransactionProvider.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class EJB2UserTransactionProvider implements UserTransactionProvider
+{
+ /** The singleton */
+ private static EJB2UserTransactionProvider singleton = new EJB2UserTransactionProvider();
+
+ /** The registry */
+ private volatile UserTransactionRegistry registry;
+
+ /**
+ * Get the singleton
+ *
+ * @return the singleton
+ */
+ public static EJB2UserTransactionProvider getSingleton()
+ {
+ return singleton;
+ }
+
+ public void setTransactionRegistry(UserTransactionRegistry registry)
+ {
+ this.registry = registry;
+ }
+
+ /**
+ * Fire the user transaction started event
+ */
+ void userTransactionStarted()
+ {
+ UserTransactionRegistry registry = this.registry;
+ if (registry != null)
+ registry.userTransactionStarted();
+ }
+}
Modified: trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java 2008-11-06 16:10:25 UTC (rev 80596)
+++ trunk/server/src/main/org/jboss/ejb/EnterpriseContext.java 2008-11-06 16:28:12 UTC (rev 80597)
@@ -603,6 +603,7 @@
tm.begin();
//notify checked out connections
+ EJB2UserTransactionProvider.getSingleton().userTransactionStarted();
if (tsl != null)
tsl.userTransactionStarted();
More information about the jboss-cvs-commits
mailing list