[jboss-cvs] JBossAS SVN: r92435 - in projects/webbeans-ri-int/trunk: deployer/src/main/assembly/resources/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 12:41:47 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-17 12:41:47 -0400 (Mon, 17 Aug 2009)
New Revision: 92435
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
projects/webbeans-ri-int/trunk/ejb/pom.xml
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
projects/webbeans-ri-int/trunk/pom.xml
Log:
switch to using TMService
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-08-17 16:27:32 UTC (rev 92434)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-08-17 16:41:47 UTC (rev 92435)
@@ -25,7 +25,9 @@
<!-- Access to the JTA UserTransaction, and synchronization registration -->
<bean name="JBossTransactionServices" class="org.jboss.webbeans.integration.transaction.JBossTransactionServices">
- <property name="transactionManager"><inject bean="RealTransactionManager" option="callback" /></property>
+ <constructor>
+ <parameter><inject bean="TransactionManager"/></parameter>
+ </constructor>
</bean>
<!-- Access to the caller context Principal -->
Modified: projects/webbeans-ri-int/trunk/ejb/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-08-17 16:27:32 UTC (rev 92434)
+++ projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-08-17 16:41:47 UTC (rev 92435)
@@ -46,6 +46,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-integration</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss.test</groupId>
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java 2009-08-17 16:27:32 UTC (rev 92434)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java 2009-08-17 16:41:47 UTC (rev 92435)
@@ -19,15 +19,14 @@
import static javax.transaction.Status.STATUS_ACTIVE;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.jboss.webbeans.transaction.spi.TransactionServices;
+import com.arjuna.ats.jbossatx.jta.TransactionManagerService;
+
/**
* JBoss AS implementation of TransactionServices. The transaction manager for
* the application server is injected directly into this bean and used to
@@ -40,67 +39,36 @@
public class JBossTransactionServices implements TransactionServices
{
- private static final String JNDI_KEY = "UserTransaction";
-
/** The TM */
- private TransactionManager transactionManager;
- private final InitialContext initialContext;
+ private final TransactionManagerService transactionManager;
- public JBossTransactionServices()
+ public JBossTransactionServices(TransactionManagerService transactionManager)
{
- try
- {
- this.initialContext = new InitialContext();
- }
- catch (NamingException e)
- {
- throw new RuntimeException("Error creating initial context", e);
- }
+ this.transactionManager = transactionManager;
}
public boolean isTransactionActive()
{
try
{
- return getTransactionManager().getStatus() == STATUS_ACTIVE;
+ return getUserTransaction().getStatus() == STATUS_ACTIVE;
}
catch (SystemException e)
{
throw new RuntimeException("Failed to determine transaction status", e);
}
}
-
- /**
- * Get transaction manager.
- *
- * It might throw IllegalArgumentException if it's not yet configured as we
- * inject it via callback - only available in deploy/ when TM gets deployed.
- *
- * @return the transaction manager
- */
- protected TransactionManager getTransactionManager()
+
+ public TransactionManagerService getTransactionManager()
{
- if (transactionManager == null)
- throw new IllegalArgumentException("Transaction manager is not yet set.");
-
return transactionManager;
}
- /**
- * Set transaction manager.
- *
- * @param transactionManager the transaction manager
- */
- public void setTransactionManager(TransactionManager transactionManager)
- {
- this.transactionManager = transactionManager;
- }
-
public void registerSynchronization(Synchronization synchronizedObserver)
{
try
{
- getTransactionManager().getTransaction().registerSynchronization(synchronizedObserver);
+ getTransactionManager().getTransactionManager().getTransaction().registerSynchronization(synchronizedObserver);
}
catch (Exception e)
{
@@ -110,13 +78,6 @@
public UserTransaction getUserTransaction()
{
- try
- {
- return (UserTransaction) initialContext.lookup(JNDI_KEY);
- }
- catch (NamingException e)
- {
- throw new RuntimeException("Error getting UserTransaction from JNDI (" + JNDI_KEY + ")", e);
- }
+ return transactionManager.getUserTransaction();
}
}
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2009-08-17 16:27:32 UTC (rev 92434)
+++ projects/webbeans-ri-int/trunk/pom.xml 2009-08-17 16:41:47 UTC (rev 92435)
@@ -31,6 +31,7 @@
<version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
+ <version.jboss.transaction.spi>5.1.0.SP1</version.jboss.transaction.spi>
<version.jboss.metadata>1.0.0.GA</version.jboss.metadata>
<version.jbossxb>2.0.1.GA</version.jbossxb>
<version.jboss.ejb3>1.0.0</version.jboss.ejb3>
@@ -291,6 +292,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>${version.jboss.transaction.spi}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${version.jbossxb}</version>
More information about the jboss-cvs-commits
mailing list