[jboss-cvs] JBossAS SVN: r63051 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-15 11:00:18 -0400 (Tue, 15 May 2007)
New Revision: 63051

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java
Log:
remove jboss transaction dependency

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java	2007-05-15 14:59:50 UTC (rev 63050)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/spi/Util.java	2007-05-15 15:00:18 UTC (rev 63051)
@@ -44,14 +44,18 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
+import javax.transaction.InvalidTransactionException;
+import javax.transaction.SystemException;
 import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
 
 import org.jboss.crypto.digest.DigestCallback;
 import org.jboss.logging.Logger;
 import org.jboss.security.Base64Encoder;
 import org.jboss.security.Base64Utils;
 import org.jboss.security.SimpleGroup;
-import org.jboss.tm.TransactionDemarcationSupport; 
+//import org.jboss.tm.TransactionDemarcationSupport; 
+import org.jboss.security.plugins.TransactionManagerLocator;
 
 /**
  * Common login module utility methods
@@ -168,11 +172,32 @@
       HashMap setsMap = new HashMap();
       PreparedStatement ps = null;
       ResultSet rs = null;
+      
+      TransactionManagerLocator tml = new TransactionManagerLocator();
+      TransactionManager tm;
+      try
+      {
+         tm = tml.getTM("java:/TransactionManager");
+      }
+      catch (NamingException e1)
+      {
+         throw new RuntimeException(e1);
+      }
+      if(tm == null)
+         throw new IllegalStateException("Transaction Manager is null");
 
       Transaction tx = null;
       if (suspendResume)
       {
-         tx = TransactionDemarcationSupport.suspendAnyTransaction();
+        // tx = TransactionDemarcationSupport.suspendAnyTransaction();
+         try
+         {
+            tx = tm.suspend();
+         }
+         catch (SystemException e)
+         {
+            throw new RuntimeException(e);
+         }
          if( trace )
             log.trace("suspendAnyTransaction");
       }
@@ -277,7 +302,15 @@
          }
          if (suspendResume)
          {
-            TransactionDemarcationSupport.resumeAnyTransaction(tx);
+            //TransactionDemarcationSupport.resumeAnyTransaction(tx);
+            try
+            {
+               tm.resume(tx);
+            }
+            catch (Exception e)
+            {
+               throw new RuntimeException(e);
+            }
             if( trace )
                log.trace("resumeAnyTransaction");
          }