[jboss-cvs] JBossAS SVN: r81816 - in projects/ejb3/trunk/embedded/src/main: java/org/jboss/ejb3/embedded/service and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-11-29 13:10:45 -0500 (Sat, 29 Nov 2008)
New Revision: 81816

Modified:
   projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/connectionmanager/EmbeddedCachedConnectionManager.java
   projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/service/SimpleTransactionService.java
   projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml
Log:
EJBTHREE-1028: using ComponentStack jca-spi

Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/connectionmanager/EmbeddedCachedConnectionManager.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/connectionmanager/EmbeddedCachedConnectionManager.java	2008-11-29 17:41:48 UTC (rev 81815)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/connectionmanager/EmbeddedCachedConnectionManager.java	2008-11-29 18:10:45 UTC (rev 81816)
@@ -25,19 +25,21 @@
 
 import javax.resource.ResourceException;
 
-import org.jboss.ejb3.connectionmanager.CachedConnectionManager;
+import org.jboss.jca.spi.ComponentStack;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public class EmbeddedCachedConnectionManager implements CachedConnectionManager
+public class EmbeddedCachedConnectionManager implements ComponentStack
 {
-   public void popMetaDataAwareObject(Set<String> unsharableResources) throws ResourceException
+   @SuppressWarnings("unchecked")
+   public void popMetaAwareObject(Set unsharableResources) throws ResourceException
    {
    }
 
-   public void pushMetaDataAwareObject(Object key, Set<String> unsharableResources) throws ResourceException
+   @SuppressWarnings("unchecked")
+   public void pushMetaAwareObject(Object key, Set unsharableResources) throws ResourceException
    {
    }
 

Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/service/SimpleTransactionService.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/service/SimpleTransactionService.java	2008-11-29 17:41:48 UTC (rev 81815)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/service/SimpleTransactionService.java	2008-11-29 18:10:45 UTC (rev 81816)
@@ -23,6 +23,7 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.transaction.TransactionManager;
 
 import com.arjuna.ats.jta.utils.JNDIManager;
 
@@ -34,14 +35,25 @@
  */
 public class SimpleTransactionService
 {
+   private static final String TM_JNDI_NAME = "java:/TransactionManager";
+   private InitialContext ctx;
+   private TransactionManager tm;
+
+   public TransactionManager getTransactionManager()
+   {
+      return tm;
+   }
+   
    public void start() throws Exception
    {
+      ctx = new InitialContext();
       JNDIManager.bindJTAImplementation();
+      this.tm = (TransactionManager) ctx.lookup(TM_JNDI_NAME);
    }
    
    public void stop() throws NamingException
    {
-      InitialContext ctx = new InitialContext();
-      ctx.unbind("java:/TransactionManager");
+      ctx.unbind(TM_JNDI_NAME);
+      ctx.close();
    }
-}
+}
\ No newline at end of file

Modified: projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml	2008-11-29 17:41:48 UTC (rev 81815)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/transactionmanager-beans.xml	2008-11-29 18:10:45 UTC (rev 81816)
@@ -4,4 +4,10 @@
    <bean name="TransactionManager" class="org.jboss.ejb3.embedded.service.SimpleTransactionService">
       <depends>NamingServer</depends>
    </bean>
+   
+   <bean name="RealTransactionManager">
+      <constructor factoryMethod="getTransactionManager">
+         <factory bean="TransactionManager"/>
+      </constructor>
+   </bean>
 </deployment>