From 2dd5b7737bfdcb6ab7e3763927735c8f4c063bfc Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Tue, 30 Mar 2010 14:02:40 +0000
Subject: [PATCH] resolve https://issues.apache.org/activemq/browse/AMQ-2670 -
 revert XA connection manager, using out of band recovery via JMS api is a
 workaround for jboss pending RAR based auto recovery or enlistment, comments
 in the jira with the relevant config

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@929145 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/broker/TransactionBroker.java    |  6 ++
 .../ActiveMQXAManagedConnectionFactory.java   | 65 -------------------
 2 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQXAManagedConnectionFactory.java

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
index 9c79179d81..be8428cd42 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
@@ -128,12 +128,18 @@ public class TransactionBroker extends BrokerFilter {
             for (Iterator<Transaction> iter = xaTransactions.values().iterator(); iter.hasNext();) {
                 Transaction tx = iter.next();
                 if (tx.isPrepared()) {
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug("prepared transaction: " + tx.getTransactionId());
+                    }
                     txs.add(tx.getTransactionId());
                 }
             }
         }
         XATransactionId rc[] = new XATransactionId[txs.size()];
         txs.toArray(rc);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("prepared transacton list size: " + rc.length);
+        }
         return rc;
     }
 
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQXAManagedConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQXAManagedConnectionFactory.java
deleted file mode 100644
index 0fd5b79771..0000000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQXAManagedConnectionFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.ra;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionManager;
-
-import org.apache.activemq.ActiveMQXAConnectionFactory;
-
-/**
- * Impl that will create an XAConnectionFactory that allows 
- * org.jboss.jms.server.recovery.MessagingXAResourceRecovery to deal with recovery via jms apis
- * on the connectionfactory registered in jndi 
- * to use, reference in the ra.xml as follows:
- * {@code <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQXAManagedConnectionFactory</managedconnectionfactory-class>}
- *               
- */
-public class ActiveMQXAManagedConnectionFactory extends ActiveMQManagedConnectionFactory {
-
-   private static final long serialVersionUID = 2032273395660212918L;
-
-   /**
-    * This method returns an ActiveMQXAConnectonFactory<br/>
-    * 
-    * @see javax.resource.spi.ManagedConnectionFactory#createConnectionFactory(javax.resource.spi.ConnectionManager)
-    */
-   @Override
-   public Object createConnectionFactory(ConnectionManager manager) throws ResourceException {
-      return new ActiveMQXAConnectionFactory( getInfo().getUserName(), getInfo().getPassword(), getInfo().getServerUrl());
-   }
-   
-   /**
-    * @see java.lang.Object#equals(java.lang.Object)
-    */
-   @Override
-   public boolean equals(Object object) {
-      if (object == null || object.getClass() != ActiveMQXAManagedConnectionFactory.class) {
-          return false;
-      }
-      return ((ActiveMQXAManagedConnectionFactory)object).getInfo().equals(getInfo());
-   }
-
-   /**
-    * @see java.lang.Object#hashCode()
-    */
-   @Override
-   public int hashCode() {
-      return getInfo().hashCode();
-   }
-}