[hornetq-commits] JBoss hornetq SVN: r7998 - in trunk/src/main/org/hornetq/ra: inflow and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-09-28 07:00:38 -0400 (Mon, 28 Sep 2009)
New Revision: 7998

Modified:
   trunk/src/main/org/hornetq/ra/HornetQRAProperties.java
   trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java
   trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
Log:
removed transaction manager refrences in RA adapter

Modified: trunk/src/main/org/hornetq/ra/HornetQRAProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAProperties.java	2009-09-28 08:59:11 UTC (rev 7997)
+++ trunk/src/main/org/hornetq/ra/HornetQRAProperties.java	2009-09-28 11:00:38 UTC (rev 7998)
@@ -47,10 +47,6 @@
    /** Use Local TX instead of XA */
    private Boolean localTx = false;
 
-   private String transactionManagerLocatorClass = "org.hornetq.integration.jboss.tm.JBoss5TransactionManagerLocator";
-
-   private String transactionManagerLocatorMethod = "getTm";
-
    /**
     * Constructor
     */
@@ -189,24 +185,4 @@
 
       return useXA != null && useXA;
    }
-
-   public void setTransactionManagerLocatorClass(String transactionManagerLocatorClass)
-   {
-      this.transactionManagerLocatorClass = transactionManagerLocatorClass;
-   }
-
-   public String getTransactionManagerLocatorClass()
-   {
-      return transactionManagerLocatorClass;
-   }
-
-   public void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod)
-   {
-      this.transactionManagerLocatorMethod = transactionManagerLocatorMethod;
-   }
-
-   public String getTransactionManagerLocatorMethod()
-   {
-      return transactionManagerLocatorMethod;
-   }
 }

Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2009-09-28 08:59:11 UTC (rev 7997)
+++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2009-09-28 11:00:38 UTC (rev 7998)
@@ -212,36 +212,6 @@
       log.info("HornetQ resource adapter stopped");
    }
 
-   public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass)
-   {
-      if (trace)
-      {
-         log.trace("setTransactionManagerLocatorClass(" + transactionManagerLocatorClass + ")");
-      }
-
-      raProperties.setTransactionManagerLocatorClass(transactionManagerLocatorClass);
-   }
-
-   public String getTransactionManagerLocatorClass()
-   {
-      return raProperties.getTransactionManagerLocatorClass();
-   }
-
-   public void setTransactionManagerLocatorMethod(final String transactionManagerLocatorMethod)
-   {
-      if (trace)
-      {
-         log.trace("setTransactionManagerLocatorMethod(" + transactionManagerLocatorMethod + ")");
-      }
-
-      raProperties.setTransactionManagerLocatorMethod(transactionManagerLocatorMethod);
-   }
-
-   public String getTransactionManagerLocatorMethod()
-   {
-      return raProperties.getTransactionManagerLocatorMethod();
-   }
-
    public void setConnectorClassName(final String connectorClassName)
    {
       if (trace)

Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java	2009-09-28 08:59:11 UTC (rev 7997)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java	2009-09-28 11:00:38 UTC (rev 7998)
@@ -97,11 +97,6 @@
 
    private HornetQDestination destination;
 
-   /**
-    * The TransactionManager
-    */
-   private TransactionManager tm;
-
    private final List<HornetQMessageHandler> handlers = new ArrayList<HornetQMessageHandler>();
 
    private org.hornetq.jms.client.HornetQConnectionFactory factory;
@@ -209,37 +204,6 @@
    }
 
    /**
-    * Get the transaction manager
-    *
-    * @return The value
-    */
-   public TransactionManager getTransactionManager()
-   {
-      if (trace)
-      {
-         log.trace("getTransactionManager()");
-      }
-
-      if (tm == null)
-      {
-         try
-         {
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
-            Class aClass = loader.loadClass(ra.getTransactionManagerLocatorClass());
-            Object o = aClass.newInstance();
-            Method m = aClass.getMethod(ra.getTransactionManagerLocatorMethod());
-            tm = (TransactionManager) m.invoke(o);
-         }
-         catch (Exception e)
-         {
-            log.warn("unable to create TransactionManager from " + ra.getTransactionManagerLocatorClass() + "." + ra.getTransactionManagerLocatorMethod());
-         }
-      }
-
-      return tm;
-   }
-
-   /**
     * Is the destination a topic
     *
     * @return The value