http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java
deleted file mode 100644
index 952588d..0000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java
+++ /dev/null
@@ -1,897 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import java.util.Arrays;
-import java.util.Enumeration;
-
-
-/**
- * A wrapper for a message
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAMessage implements Message
-{
-   /**
-    * Whether trace is enabled
-    */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /**
-    * The message
-    */
-   protected Message message;
-
-   /**
-    * The session
-    */
-   protected HornetQRASession session;
-
-   /**
-    * Create a new wrapper
-    *
-    * @param message the message
-    * @param session the session
-    */
-   public HornetQRAMessage(final Message message, final HornetQRASession 
session)
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + message + ", " + 
session + ")");
-      }
-
-      this.message = message;
-      this.session = session;
-   }
-
-   /**
-    * Acknowledge
-    *
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void acknowledge() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("acknowledge()");
-      }
-
-      session.getSession(); // Check for closed
-      message.acknowledge();
-   }
-
-   /**
-    * Clear body
-    *
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void clearBody() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("clearBody()");
-      }
-
-      message.clearBody();
-   }
-
-   /**
-    * Clear properties
-    *
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void clearProperties() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("clearProperties()");
-      }
-
-      message.clearProperties();
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public boolean getBooleanProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getBooleanProperty(" + name + ")");
-      }
-
-      return message.getBooleanProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public byte getByteProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getByteProperty(" + name + ")");
-      }
-
-      return message.getByteProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public double getDoubleProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDoubleProperty(" + name + ")");
-      }
-
-      return message.getDoubleProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public float getFloatProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getFloatProperty(" + name + ")");
-      }
-
-      return message.getFloatProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public int getIntProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getIntProperty(" + name + ")");
-      }
-
-      return message.getIntProperty(name);
-   }
-
-   /**
-    * Get correlation id
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public String getJMSCorrelationID() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSCorrelationID()");
-      }
-
-      return message.getJMSCorrelationID();
-   }
-
-   /**
-    * Get correlation id
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public byte[] getJMSCorrelationIDAsBytes() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSCorrelationIDAsBytes()");
-      }
-
-      return message.getJMSCorrelationIDAsBytes();
-   }
-
-   /**
-    * Get delivery mode
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public int getJMSDeliveryMode() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSDeliveryMode()");
-      }
-
-      return message.getJMSDeliveryMode();
-   }
-
-   /**
-    * Get destination
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public Destination getJMSDestination() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSDestination()");
-      }
-
-      return message.getJMSDestination();
-   }
-
-   /**
-    * Get expiration
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public long getJMSExpiration() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSExpiration()");
-      }
-
-      return message.getJMSExpiration();
-   }
-
-   /**
-    * Get message id
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public String getJMSMessageID() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSMessageID()");
-      }
-
-      return message.getJMSMessageID();
-   }
-
-   /**
-    * Get priority
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public int getJMSPriority() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSPriority()");
-      }
-
-      return message.getJMSPriority();
-   }
-
-   /**
-    * Get redelivered status
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public boolean getJMSRedelivered() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSRedelivered()");
-      }
-
-      return message.getJMSRedelivered();
-   }
-
-   /**
-    * Get reply to destination
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public Destination getJMSReplyTo() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSReplyTo()");
-      }
-
-      return message.getJMSReplyTo();
-   }
-
-   /**
-    * Get timestamp
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public long getJMSTimestamp() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSTimestamp()");
-      }
-
-      return message.getJMSTimestamp();
-   }
-
-   /**
-    * Get type
-    *
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public String getJMSType() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSType()");
-      }
-
-      return message.getJMSType();
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public long getLongProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getLongProperty(" + name + ")");
-      }
-
-      return message.getLongProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public Object getObjectProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getObjectProperty(" + name + ")");
-      }
-
-      return message.getObjectProperty(name);
-   }
-
-   /**
-    * Get property names
-    *
-    * @return The values
-    * @throws JMSException Thrown if an error occurs
-    */
-   @SuppressWarnings("rawtypes")
-   public Enumeration getPropertyNames() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getPropertyNames()");
-      }
-
-      return message.getPropertyNames();
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public short getShortProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getShortProperty(" + name + ")");
-      }
-
-      return message.getShortProperty(name);
-   }
-
-   /**
-    * Get property
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public String getStringProperty(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getStringProperty(" + name + ")");
-      }
-
-      return message.getStringProperty(name);
-   }
-
-   /**
-    * Do property exist
-    *
-    * @param name The name
-    * @return The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public boolean propertyExists(final String name) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("propertyExists(" + name + ")");
-      }
-
-      return message.propertyExists(name);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setBooleanProperty(final String name, final boolean value) 
throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setBooleanProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setBooleanProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setByteProperty(final String name, final byte value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setByteProperty(" + name + ", " + value 
+ ")");
-      }
-
-      message.setByteProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setDoubleProperty(final String name, final double value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setDoubleProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setDoubleProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setFloatProperty(final String name, final float value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setFloatProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setFloatProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setIntProperty(final String name, final int value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setIntProperty(" + name + ", " + value 
+ ")");
-      }
-
-      message.setIntProperty(name, value);
-   }
-
-   /**
-    * Set correlation id
-    *
-    * @param correlationID The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSCorrelationID(final String correlationID) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSCorrelationID(" + correlationID + 
")");
-      }
-
-      message.setJMSCorrelationID(correlationID);
-   }
-
-   /**
-    * Set correlation id
-    *
-    * @param correlationID The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSCorrelationIDAsBytes(final byte[] correlationID) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSCorrelationIDAsBytes(" + 
Arrays.toString(correlationID) + ")");
-      }
-
-      message.setJMSCorrelationIDAsBytes(correlationID);
-   }
-
-   /**
-    * Set delivery mode
-    *
-    * @param deliveryMode The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSDeliveryMode(final int deliveryMode) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSDeliveryMode(" + deliveryMode + 
")");
-      }
-
-      message.setJMSDeliveryMode(deliveryMode);
-   }
-
-   /**
-    * Set destination
-    *
-    * @param destination The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSDestination(final Destination destination) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSDestination(" + destination + 
")");
-      }
-
-      message.setJMSDestination(destination);
-   }
-
-   /**
-    * Set expiration
-    *
-    * @param expiration The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSExpiration(final long expiration) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSExpiration(" + expiration + ")");
-      }
-
-      message.setJMSExpiration(expiration);
-   }
-
-   /**
-    * Set message id
-    *
-    * @param id The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSMessageID(final String id) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSMessageID(" + id + ")");
-      }
-
-      message.setJMSMessageID(id);
-   }
-
-   /**
-    * Set priority
-    *
-    * @param priority The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSPriority(final int priority) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSPriority(" + priority + ")");
-      }
-
-      message.setJMSPriority(priority);
-   }
-
-   /**
-    * Set redelivered status
-    *
-    * @param redelivered The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSRedelivered(final boolean redelivered) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSRedelivered(" + redelivered + 
")");
-      }
-
-      message.setJMSRedelivered(redelivered);
-   }
-
-   /**
-    * Set reply to
-    *
-    * @param replyTo The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSReplyTo(final Destination replyTo) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSReplyTo(" + replyTo + ")");
-      }
-
-      message.setJMSReplyTo(replyTo);
-   }
-
-   /**
-    * Set timestamp
-    *
-    * @param timestamp The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSTimestamp(final long timestamp) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSTimestamp(" + timestamp + ")");
-      }
-
-      message.setJMSTimestamp(timestamp);
-   }
-
-   /**
-    * Set type
-    *
-    * @param type The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setJMSType(final String type) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSType(" + type + ")");
-      }
-
-      message.setJMSType(type);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setLongProperty(final String name, final long value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setLongProperty(" + name + ", " + value 
+ ")");
-      }
-
-      message.setLongProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setObjectProperty(final String name, final Object value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setObjectProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setObjectProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setShortProperty(final String name, final short value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setShortProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setShortProperty(name, value);
-   }
-
-   /**
-    * Set property
-    *
-    * @param name  The name
-    * @param value The value
-    * @throws JMSException Thrown if an error occurs
-    */
-   public void setStringProperty(final String name, final String value) throws 
JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setStringProperty(" + name + ", " + 
value + ")");
-      }
-
-      message.setStringProperty(name, value);
-   }
-
-   @Override
-   public long getJMSDeliveryTime() throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getJMSDeliveryTime()");
-      }
-      return message.getJMSDeliveryTime();
-   }
-
-   @Override
-   public void setJMSDeliveryTime(long deliveryTime) throws JMSException
-   {
-
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setJMSDeliveryTime(" + deliveryTime + 
")");
-      }
-      message.setJMSDeliveryTime(deliveryTime);
-   }
-
-   @Override
-   public <T> T getBody(Class<T> c) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getBody(" + c + ")");
-      }
-      return message.getBody(c);
-   }
-
-   @Override
-   public boolean isBodyAssignableTo(@SuppressWarnings("rawtypes")
-                                     Class c) throws JMSException
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("isBodyAssignableTo(" + c + ")");
-      }
-      return message.isBodyAssignableTo(c);
-   }
-
-   /**
-    * Return the hash code
-    *
-    * @return The hash code
-    */
-   @Override
-   public int hashCode()
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("hashCode()");
-      }
-
-      return message.hashCode();
-   }
-
-   /**
-    * Check for equality
-    *
-    * @param object The other object
-    * @return True / false
-    */
-   @Override
-   public boolean equals(final Object object)
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("equals(" + object + ")");
-      }
-
-      if (object != null && object instanceof HornetQRAMessage)
-      {
-         return message.equals(((HornetQRAMessage)object).message);
-      }
-      else
-      {
-         return message.equals(object);
-      }
-   }
-
-   /**
-    * Return string representation
-    *
-    * @return The string
-    */
-   @Override
-   public String toString()
-   {
-      if (HornetQRAMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("toString()");
-      }
-
-      return message.toString();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java
 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java
deleted file mode 100644
index 81e8ad6..0000000
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-
-
-/**
- * A wrapper for a message consumer
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAMessageConsumer implements MessageConsumer
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /** The wrapped message consumer */
-   protected MessageConsumer consumer;
-
-   /** The session for this consumer */
-   protected HornetQRASession session;
-
-   /**
-    * Create a new wrapper
-    * @param consumer the consumer
-    * @param session the session
-    */
-   public HornetQRAMessageConsumer(final MessageConsumer consumer, final 
HornetQRASession session)
-   {
-      this.consumer = consumer;
-      this.session = session;
-
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("new HornetQMessageConsumer " + this +
-                                            " consumer=" +
-                                            consumer +
-                                            " session=" +
-                                            session);
-      }
-   }
-
-   /**
-    * Close
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void close() throws JMSException
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("close " + this);
-      }
-      try
-      {
-         closeConsumer();
-      }
-      finally
-      {
-         session.removeConsumer(this);
-      }
-   }
-
-   /**
-    * Check state
-    * @exception JMSException Thrown if an error occurs
-    */
-   void checkState() throws JMSException
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("checkState()");
-      }
-      session.checkState();
-   }
-
-   /**
-    * Get message listener
-    * @return The listener
-    * @exception JMSException Thrown if an error occurs
-    */
-   public MessageListener getMessageListener() throws JMSException
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getMessageListener()");
-      }
-
-      checkState();
-      session.checkStrict();
-      return consumer.getMessageListener();
-   }
-
-   /**
-    * Set message listener
-    * @param listener The listener
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setMessageListener(final MessageListener listener) throws 
JMSException
-   {
-      session.lock();
-      try
-      {
-         checkState();
-         session.checkStrict();
-         if (listener == null)
-         {
-            consumer.setMessageListener(null);
-         }
-         else
-         {
-            consumer.setMessageListener(wrapMessageListener(listener));
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Get message selector
-    * @return The selector
-    * @exception JMSException Thrown if an error occurs
-    */
-   public String getMessageSelector() throws JMSException
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getMessageSelector()");
-      }
-
-      checkState();
-      return consumer.getMessageSelector();
-   }
-
-   /**
-    * Receive
-    * @return The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Message receive() throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("receive " + this);
-         }
-
-         checkState();
-         Message message = consumer.receive();
-
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("received " + this + " result=" + 
message);
-         }
-
-         if (message == null)
-         {
-            return null;
-         }
-         else
-         {
-            return wrapMessage(message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Receive
-    * @param timeout The timeout value
-    * @return The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Message receive(final long timeout) throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("receive " + this + " timeout=" + 
timeout);
-         }
-
-         checkState();
-         Message message = consumer.receive(timeout);
-
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("received " + this + " result=" + 
message);
-         }
-
-         if (message == null)
-         {
-            return null;
-         }
-         else
-         {
-            return wrapMessage(message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Receive
-    * @return The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Message receiveNoWait() throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("receiveNoWait " + this);
-         }
-
-         checkState();
-         Message message = consumer.receiveNoWait();
-
-         if (HornetQRAMessageConsumer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("received " + this + " result=" + 
message);
-         }
-
-         if (message == null)
-         {
-            return null;
-         }
-         else
-         {
-            return wrapMessage(message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Close consumer
-    * @exception JMSException Thrown if an error occurs
-    */
-   void closeConsumer() throws JMSException
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("closeConsumer()");
-      }
-
-      consumer.close();
-   }
-
-   /**
-    * Wrap message
-    * @param message The message to be wrapped
-    * @return The wrapped message
-    */
-   Message wrapMessage(final Message message)
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("wrapMessage(" + message + ")");
-      }
-
-      if (message instanceof BytesMessage)
-      {
-         return new HornetQRABytesMessage((BytesMessage)message, session);
-      }
-      else if (message instanceof MapMessage)
-      {
-         return new HornetQRAMapMessage((MapMessage)message, session);
-      }
-      else if (message instanceof ObjectMessage)
-      {
-         return new HornetQRAObjectMessage((ObjectMessage)message, session);
-      }
-      else if (message instanceof StreamMessage)
-      {
-         return new HornetQRAStreamMessage((StreamMessage)message, session);
-      }
-      else if (message instanceof TextMessage)
-      {
-         return new HornetQRATextMessage((TextMessage)message, session);
-      }
-      return new HornetQRAMessage(message, session);
-   }
-
-   /**
-    * Wrap message listener
-    * @param listener The listener to be wrapped
-    * @return The wrapped listener
-    */
-   MessageListener wrapMessageListener(final MessageListener listener)
-   {
-      if (HornetQRAMessageConsumer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getMessageSelector()");
-      }
-
-      return new HornetQRAMessageListener(listener, this);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java
 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java
deleted file mode 100644
index 79f4604..0000000
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.Message;
-import javax.jms.MessageListener;
-
-
-/**
- * A wrapper for a message listener
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAMessageListener implements MessageListener
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /** The message listener */
-   private final MessageListener listener;
-
-   /** The consumer */
-   private final HornetQRAMessageConsumer consumer;
-
-   /**
-    * Create a new wrapper
-    * @param listener the listener
-    * @param consumer the consumer
-    */
-   public HornetQRAMessageListener(final MessageListener listener, final 
HornetQRAMessageConsumer consumer)
-   {
-      if (HornetQRAMessageListener.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + listener + ", " + 
consumer + ")");
-      }
-
-      this.listener = listener;
-      this.consumer = consumer;
-   }
-
-   /**
-    * On message
-    * @param message The message
-    */
-   public void onMessage(Message message)
-   {
-      if (HornetQRAMessageListener.trace)
-      {
-         HornetQRALogger.LOGGER.trace("onMessage(" + message + ")");
-      }
-
-      message = consumer.wrapMessage(message);
-      listener.onMessage(message);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java
 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java
deleted file mode 100644
index a168c3e..0000000
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.CompletionListener;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-
-
-/**
- * HornetQMessageProducer.
- *
- * @author <a href="adr...@jboss.com">Adrian Brock</a>
- * @author <a href="jesper.peder...@jboss.org">Jesper Pedersen</a>
- */
-public class HornetQRAMessageProducer implements MessageProducer
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /** The wrapped message producer */
-   protected MessageProducer producer;
-
-   /** The session for this consumer */
-   protected HornetQRASession session;
-
-   /**
-    * Create a new wrapper
-    * @param producer the producer
-    * @param session the session
-    */
-   public HornetQRAMessageProducer(final MessageProducer producer, final 
HornetQRASession session)
-   {
-      this.producer = producer;
-      this.session = session;
-
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("new HornetQMessageProducer " + this +
-                                            " producer=" +
-                                            producer +
-                                            " session=" +
-                                            session);
-      }
-   }
-
-   /**
-    * Close
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void close() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("close " + this);
-      }
-      try
-      {
-         closeProducer();
-      }
-      finally
-      {
-         session.removeProducer(this);
-      }
-   }
-
-   /**
-    * Send message
-    * @param destination The destination
-    * @param message The message
-    * @param deliveryMode The delivery mode
-    * @param priority The priority
-    * @param timeToLive The time to live
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Destination destination,
-                    final Message message,
-                    final int deliveryMode,
-                    final int priority,
-                    final long timeToLive) throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this +
-                                               " destination=" +
-                                               destination +
-                                               " message=" +
-                                               message +
-                                               " deliveryMode=" +
-                                               deliveryMode +
-                                               " priority=" +
-                                               priority +
-                                               " ttl=" +
-                                               timeToLive);
-         }
-
-         checkState();
-
-         producer.send(destination, message, deliveryMode, priority, 
timeToLive);
-
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Send message
-    * @param destination The destination
-    * @param message The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Destination destination, final Message message) 
throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this + " destination=" + 
destination + " message=" + message);
-         }
-
-         checkState();
-
-         producer.send(destination, message);
-
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Send message
-    * @param message The message
-    * @param deliveryMode The delivery mode
-    * @param priority The priority
-    * @param timeToLive The time to live
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Message message, final int deliveryMode, final int 
priority, final long timeToLive) throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this +
-                                               " message=" +
-                                               message +
-                                               " deliveryMode=" +
-                                               deliveryMode +
-                                               " priority=" +
-                                               priority +
-                                               " ttl=" +
-                                               timeToLive);
-         }
-
-         checkState();
-
-         producer.send(message, deliveryMode, priority, timeToLive);
-
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Send message
-    * @param message The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Message message) throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this + " message=" + 
message);
-         }
-
-         checkState();
-
-         producer.send(message);
-
-         if (HornetQRAMessageProducer.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Get the delivery mode
-    * @return The mode
-    * @exception JMSException Thrown if an error occurs
-    */
-   public int getDeliveryMode() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDeliveryMode()");
-      }
-
-      return producer.getDeliveryMode();
-   }
-
-   /**
-    * Get the destination
-    * @return The destination
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Destination getDestination() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDestination()");
-      }
-
-      return producer.getDestination();
-   }
-
-   /**
-    * Disable message id
-    * @return True if disable
-    * @exception JMSException Thrown if an error occurs
-    */
-   public boolean getDisableMessageID() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDisableMessageID()");
-      }
-
-      return producer.getDisableMessageID();
-   }
-
-   /**
-    * Disable message timestamp
-    * @return True if disable
-    * @exception JMSException Thrown if an error occurs
-    */
-   public boolean getDisableMessageTimestamp() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDisableMessageTimestamp()");
-      }
-
-      return producer.getDisableMessageTimestamp();
-   }
-
-   /**
-    * Get the priority
-    * @return The priority
-    * @exception JMSException Thrown if an error occurs
-    */
-   public int getPriority() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getPriority()");
-      }
-
-      return producer.getPriority();
-   }
-
-   /**
-    * Get the time to live
-    * @return The ttl
-    * @exception JMSException Thrown if an error occurs
-    */
-   public long getTimeToLive() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getTimeToLive()");
-      }
-
-      return producer.getTimeToLive();
-   }
-
-   /**
-    * Set the delivery mode
-    * @param deliveryMode The mode
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setDeliveryMode(final int deliveryMode) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setDeliveryMode(" + deliveryMode + ")");
-      }
-
-      producer.setDeliveryMode(deliveryMode);
-   }
-
-   /**
-    * Set disable message id
-    * @param value The value
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setDisableMessageID(final boolean value) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setDisableMessageID(" + value + ")");
-      }
-
-      producer.setDisableMessageID(value);
-   }
-
-   /**
-    * Set disable message timestamp
-    * @param value The value
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setDisableMessageTimestamp(final boolean value) throws 
JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setDisableMessageTimestamp(" + value + 
")");
-      }
-
-      producer.setDisableMessageTimestamp(value);
-   }
-
-   /**
-    * Set the priority
-    * @param defaultPriority The value
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setPriority(final int defaultPriority) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setPriority(" + defaultPriority + ")");
-      }
-
-      producer.setPriority(defaultPriority);
-   }
-
-   /**
-    * Set the ttl
-    * @param timeToLive The value
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setTimeToLive(final long timeToLive) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setTimeToLive(" + timeToLive + ")");
-      }
-
-      producer.setTimeToLive(timeToLive);
-   }
-
-   @Override
-   public void setDeliveryDelay(long deliveryDelay) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setDeliveryDelay(" + deliveryDelay + 
")");
-      }
-      producer.setDeliveryDelay(deliveryDelay);
-   }
-
-   @Override
-   public long getDeliveryDelay() throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getDeliveryDelay()");
-      }
-      return producer.getDeliveryDelay();
-   }
-
-   @Override
-   public void send(Message message, CompletionListener completionListener) 
throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("send(" + message + ", " + 
completionListener + ")");
-      }
-      producer.send(message, completionListener);
-   }
-
-   @Override
-   public void send(Message message, int deliveryMode, int priority, long 
timeToLive, CompletionListener completionListener) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("send(" + message + ", " + deliveryMode 
+ ", " + priority + ", " + timeToLive +
-                  ", " + completionListener + ")");
-      }
-      producer.send(message, deliveryMode, priority, timeToLive, 
completionListener);
-   }
-
-   @Override
-   public void send(Destination destination, Message message, 
CompletionListener completionListener) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("send(" + destination + ", " + message + 
", " + completionListener + ")");
-      }
-      producer.send(destination, message, completionListener);
-   }
-
-   @Override
-   public void send(Destination destination, Message message, int 
deliveryMode, int priority, long timeToLive, CompletionListener 
completionListener) throws JMSException
-   {
-      if (HornetQRAMessageProducer.trace)
-      {
-         HornetQRALogger.LOGGER.trace("send(" + destination + ", " + message + 
", " + deliveryMode + ", " + priority +
-                  ", " + timeToLive + ", " + completionListener + ")");
-      }
-      producer.send(destination, message, deliveryMode, priority, timeToLive, 
completionListener);
-   }
-
-    /**
-    * Check state
-    * @exception JMSException Thrown if an error occurs
-    */
-   void checkState() throws JMSException
-   {
-      session.checkState();
-   }
-
-   /**
-    * Close producer
-    * @exception JMSException Thrown if an error occurs
-    */
-   void closeProducer() throws JMSException
-   {
-      producer.close();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java
deleted file mode 100644
index 78d510a..0000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.ManagedConnectionMetaData;
-
-
-/**
- * Managed connection meta data
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAMetaData implements ManagedConnectionMetaData
-{
-   /** Trace enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /** The managed connection */
-   private final HornetQRAManagedConnection mc;
-
-   /**
-    * Constructor
-    * @param mc The managed connection
-    */
-   public HornetQRAMetaData(final HornetQRAManagedConnection mc)
-   {
-      if (HornetQRAMetaData.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + mc + ")");
-      }
-
-      this.mc = mc;
-   }
-
-   /**
-    * Get the EIS product name
-    * @return The name
-    * @exception ResourceException Thrown if operation fails
-    */
-   public String getEISProductName() throws ResourceException
-   {
-      if (HornetQRAMetaData.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getEISProductName()");
-      }
-
-      return "HornetQ";
-   }
-
-   /**
-    * Get the EIS product version
-    * @return The version
-    * @exception ResourceException Thrown if operation fails
-    */
-   public String getEISProductVersion() throws ResourceException
-   {
-      if (HornetQRAMetaData.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getEISProductVersion()");
-      }
-
-      return "2.0";
-   }
-
-   /**
-    * Get the user name
-    * @return The user name
-    * @exception ResourceException Thrown if operation fails
-    */
-   public String getUserName() throws ResourceException
-   {
-      if (HornetQRAMetaData.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getUserName()");
-      }
-
-      return mc.getUserName();
-   }
-
-   /**
-     * Get the maximum number of connections -- RETURNS 0
-     * @return The number
-     * @exception ResourceException Thrown if operation fails
-     */
-   public int getMaxConnections() throws ResourceException
-   {
-      if (HornetQRAMetaData.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getMaxConnections()");
-      }
-
-      return 0;
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java
deleted file mode 100644
index d64eff8..0000000
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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 java.io.Serializable;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-
-
-/**
- * A wrapper for a message
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAObjectMessage extends HornetQRAMessage implements 
ObjectMessage
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /**
-    * Create a new wrapper
-    * @param message the message
-    * @param session the session
-    */
-   public HornetQRAObjectMessage(final ObjectMessage message, final 
HornetQRASession session)
-   {
-      super(message, session);
-
-      if (HornetQRAObjectMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + message + ", " + 
session + ")");
-      }
-   }
-
-   /**
-    * Get the object
-    * @return The object
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Serializable getObject() throws JMSException
-   {
-      if (HornetQRAObjectMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getObject()");
-      }
-
-      return ((ObjectMessage)message).getObject();
-   }
-
-   /**
-    * Set the object
-    * @param object The object
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void setObject(final Serializable object) throws JMSException
-   {
-      if (HornetQRAObjectMessage.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setObject(" + object + ")");
-      }
-
-      ((ObjectMessage)message).setObject(object);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java
deleted file mode 100644
index c0f1d9b..0000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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 java.io.Serializable;
-import java.util.Hashtable;
-
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.utils.DefaultSensitiveStringCodec;
-import org.apache.activemq.utils.PasswordMaskingUtil;
-import org.apache.activemq.utils.SensitiveDataCodec;
-
-
-/**
- * The RA default properties - these are set in the ra.xml file
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a>
- */
-public class HornetQRAProperties extends ConnectionFactoryProperties 
implements Serializable
-{
-   /**
-    * Serial version UID
-    */
-   static final long serialVersionUID = -2772367477755473248L;
-   /**
-    * Trace enabled
-    */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /**
-    * The user name
-    */
-   private String userName;
-
-   /**
-    * The password
-    */
-   private String password = null;
-
-   /**
-    * Use Local TX instead of XA
-    */
-   private Boolean localTx = false;
-
-
-   /**
-    * Class used to locate the Transaction Manager.
-    * Using JBoss5 as the default locator
-    */
-   private String transactionManagerLocatorClass = 
"org.apache.activemq.integration.jboss.tm.JBoss5TransactionManagerLocator;org.apache.activemq.integration.jboss.tm.JBoss4TransactionManagerLocator";
-
-   /**
-    * Method used to locate the TM
-    */
-   private String transactionManagerLocatorMethod = "getTm;getTM";
-
-   private static final int DEFAULT_SETUP_ATTEMPTS = -1;
-
-   private static final long DEFAULT_SETUP_INTERVAL = 2 * 1000;
-
-   private int setupAttempts = DEFAULT_SETUP_ATTEMPTS;
-
-   private long setupInterval = DEFAULT_SETUP_INTERVAL;
-
-   private Hashtable<?, ?> jndiParams;
-
-   private boolean useJNDI;
-
-   private boolean useMaskedPassword = false;
-
-   private String passwordCodec;
-
-   private boolean initialized = false;
-
-   private transient SensitiveDataCodec<String> codecInstance;
-
-   /**
-    * Class used to get a JChannel
-    */
-   private String jgroupsChannelLocatorClass;
-
-   /**
-    * Name used to locate a JChannel
-    */
-   private String jgroupsChannelRefName;
-
-   /**
-    * Constructor
-    */
-   public HornetQRAProperties()
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor()");
-      }
-   }
-
-   /**
-    * Get the user name
-    *
-    * @return The value
-    */
-   public String getUserName()
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getUserName()");
-      }
-
-      return userName;
-   }
-
-   /**
-    * Set the user name
-    *
-    * @param userName The value
-    */
-   public void setUserName(final String userName)
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setUserName(" + userName + ")");
-      }
-
-      this.userName = userName;
-   }
-
-   /**
-    * Get the password
-    *
-    * @return The value
-    */
-   public String getPassword()
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getPassword()");
-      }
-
-      return password;
-   }
-
-   /**
-    * Set the password
-    * Based on UseMaskedPassword property, the password can be
-    * plain text or encoded string. However we cannot decide
-    * which is the case at this moment, because we don't know
-    * when the UseMaskedPassword and PasswordCodec are loaded. So for the 
moment
-    * we just save the password.
-    *
-    * @param password The value
-    */
-   public void setPassword(final String password)
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setPassword(****)");
-      }
-
-      this.password = password;
-   }
-
-   /**
-    * @return the useJNDI
-    */
-   public boolean isUseJNDI()
-   {
-      return useJNDI;
-   }
-
-   /**
-    * @param value the useJNDI to set
-    */
-   public void setUseJNDI(final Boolean value)
-   {
-      useJNDI = value;
-   }
-
-   /**
-    * @return return the jndi params to use
-    */
-   public Hashtable<?, ?> getParsedJndiParams()
-   {
-      return jndiParams;
-   }
-
-
-   public void setParsedJndiParams(Hashtable<?, ?> params)
-   {
-      jndiParams = params;
-   }
-
-   /**
-    * Get the use XA flag
-    *
-    * @return The value
-    */
-   public Boolean getUseLocalTx()
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getUseLocalTx()");
-      }
-
-      return localTx;
-   }
-
-   /**
-    * Set the use XA flag
-    *
-    * @param localTx The value
-    */
-   public void setUseLocalTx(final Boolean localTx)
-   {
-      if (HornetQRAProperties.trace)
-      {
-         HornetQRALogger.LOGGER.trace("setUseLocalTx(" + localTx + ")");
-      }
-
-      this.localTx = localTx;
-   }
-
-
-   public void setTransactionManagerLocatorClass(final String 
transactionManagerLocatorClass)
-   {
-      this.transactionManagerLocatorClass = transactionManagerLocatorClass;
-   }
-
-   public String getTransactionManagerLocatorClass()
-   {
-      return transactionManagerLocatorClass;
-   }
-
-   public String getTransactionManagerLocatorMethod()
-   {
-      return transactionManagerLocatorMethod;
-   }
-
-   public void setTransactionManagerLocatorMethod(final String 
transactionManagerLocatorMethod)
-   {
-      this.transactionManagerLocatorMethod = transactionManagerLocatorMethod;
-   }
-
-   public int getSetupAttempts()
-   {
-      return setupAttempts;
-   }
-
-   public void setSetupAttempts(Integer setupAttempts)
-   {
-      this.setupAttempts = setupAttempts;
-   }
-
-   public long getSetupInterval()
-   {
-      return setupInterval;
-   }
-
-   public void setSetupInterval(Long setupInterval)
-   {
-      this.setupInterval = setupInterval;
-   }
-
-   public boolean isUseMaskedPassword()
-   {
-      return useMaskedPassword;
-   }
-
-   public void setUseMaskedPassword(boolean useMaskedPassword)
-   {
-      this.useMaskedPassword = useMaskedPassword;
-   }
-
-   public String getPasswordCodec()
-   {
-      return passwordCodec;
-   }
-
-   public void setPasswordCodec(String codecs)
-   {
-      passwordCodec = codecs;
-   }
-
-   @Override
-   public String toString()
-   {
-      return "HornetQRAProperties[localTx=" + localTx +
-         ", userName=" + userName + ", password=****]";
-   }
-
-   public synchronized void init() throws ActiveMQException
-   {
-      if (initialized)
-         return;
-
-      if (useMaskedPassword)
-      {
-         codecInstance = new DefaultSensitiveStringCodec();
-
-         if (passwordCodec != null)
-         {
-            codecInstance = PasswordMaskingUtil.getCodec(passwordCodec);
-         }
-
-         try
-         {
-            if (password != null)
-            {
-               password = codecInstance.decode(password);
-            }
-         }
-         catch (Exception e)
-         {
-            throw HornetQRABundle.BUNDLE.errorDecodingPassword(e);
-         }
-
-      }
-      initialized = true;
-   }
-
-   public SensitiveDataCodec<String> getCodecInstance()
-   {
-      return codecInstance;
-   }
-
-   public String getJgroupsChannelLocatorClass()
-   {
-      return jgroupsChannelLocatorClass;
-   }
-
-   public void setJgroupsChannelLocatorClass(String jgroupsChannelLocatorClass)
-   {
-      this.jgroupsChannelLocatorClass = jgroupsChannelLocatorClass;
-   }
-
-   public String getJgroupsChannelRefName()
-   {
-      return jgroupsChannelRefName;
-   }
-
-   public void setJgroupsChannelRefName(String jgroupsChannelRefName)
-   {
-      this.jgroupsChannelRefName = jgroupsChannelRefName;
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java
deleted file mode 100644
index de4a76d..0000000
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueReceiver;
-
-
-/**
- * A wrapper for a queue receiver
- *
- * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a>
- * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a>
- */
-public class HornetQRAQueueReceiver extends HornetQRAMessageConsumer 
implements QueueReceiver
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /**
-    * Create a new wrapper
-    * @param consumer the queue receiver
-    * @param session the session
-    */
-   public HornetQRAQueueReceiver(final QueueReceiver consumer, final 
HornetQRASession session)
-   {
-      super(consumer, session);
-
-      if (HornetQRAQueueReceiver.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + consumer + ", " + 
session + ")");
-      }
-   }
-
-   /**
-    * Get queue
-    * @return The queue
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Queue getQueue() throws JMSException
-   {
-      if (HornetQRAQueueReceiver.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getQueue()");
-      }
-
-      checkState();
-      return ((QueueReceiver)consumer).getQueue();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java
deleted file mode 100644
index e18cfcf..0000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-
-
-/**
- * HornetQQueueSender.
- *
- * @author <a href="adr...@jboss.com">Adrian Brock</a>
- * @author <a href="jesper.peder...@jboss.org">Jesper Pedersen</a>
- */
-public class HornetQRAQueueSender extends HornetQRAMessageProducer implements 
QueueSender
-{
-   /** Whether trace is enabled */
-   private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled();
-
-   /**
-    * Create a new wrapper
-    * @param producer the producer
-    * @param session the session
-    */
-   public HornetQRAQueueSender(final QueueSender producer, final 
HornetQRASession session)
-   {
-      super(producer, session);
-
-      if (HornetQRAQueueSender.trace)
-      {
-         HornetQRALogger.LOGGER.trace("constructor(" + producer + ", " + 
session + ")");
-      }
-   }
-
-   /**
-    * Get queue
-    * @return The queue
-    * @exception JMSException Thrown if an error occurs
-    */
-   public Queue getQueue() throws JMSException
-   {
-      if (HornetQRAQueueSender.trace)
-      {
-         HornetQRALogger.LOGGER.trace("getQueue()");
-      }
-
-      return ((QueueSender)producer).getQueue();
-   }
-
-   /**
-    * Send message
-    * @param destination The destination
-    * @param message The message
-    * @param deliveryMode The delivery mode
-    * @param priority The priority
-    * @param timeToLive The time to live
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Queue destination,
-                    final Message message,
-                    final int deliveryMode,
-                    final int priority,
-                    final long timeToLive) throws JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAQueueSender.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this +
-                                           " destination=" +
-                                           destination +
-                                           " message=" +
-                                           message +
-                                           " deliveryMode=" +
-                                           deliveryMode +
-                                           " priority=" +
-                                           priority +
-                                           " ttl=" +
-                                           timeToLive);
-         }
-
-         checkState();
-         producer.send(destination, message, deliveryMode, priority, 
timeToLive);
-
-         if (HornetQRAQueueSender.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-
-   /**
-    * Send message
-    * @param destination The destination
-    * @param message The message
-    * @exception JMSException Thrown if an error occurs
-    */
-   public void send(final Queue destination, final Message message) throws 
JMSException
-   {
-      session.lock();
-      try
-      {
-         if (HornetQRAQueueSender.trace)
-         {
-            HornetQRALogger.LOGGER.trace("send " + this + " destination=" + 
destination + " message=" + message);
-         }
-
-         checkState();
-         producer.send(destination, message);
-
-         if (HornetQRAQueueSender.trace)
-         {
-            HornetQRALogger.LOGGER.trace("sent " + this + " result=" + 
message);
-         }
-      }
-      finally
-      {
-         session.unlock();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java
----------------------------------------------------------------------
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java 
b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java
deleted file mode 100644
index f82ada9..0000000
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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 java.util.Set;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-
-
-/**
- * A HornetQRAService ensures that HornetQ Resource Adapter will be stopped 
*before* the HornetQ server.
- * https://jira.jboss.org/browse/HORNETQ-339
- *
- * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a>
- *
- *
- */
-public class HornetQRAService
-{
-   // Constants -----------------------------------------------------
-   // Attributes ----------------------------------------------------
-
-   private final MBeanServer mBeanServer;
-
-   private final String resourceAdapterObjectName;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public HornetQRAService(final MBeanServer mBeanServer, final String 
resourceAdapterObjectName)
-   {
-      this.mBeanServer = mBeanServer;
-      this.resourceAdapterObjectName = resourceAdapterObjectName;
-   }
-
-   // Public --------------------------------------------------------
-
-   public void stop()
-   {
-      try
-      {
-         ObjectName objectName = new ObjectName(resourceAdapterObjectName);
-         Set<ObjectInstance> mbeanSet = mBeanServer.queryMBeans(objectName, 
null);
-
-         for (ObjectInstance mbean : mbeanSet)
-         {
-            String stateString = 
(String)mBeanServer.getAttribute(mbean.getObjectName(), "StateString");
-
-            if ("Started".equalsIgnoreCase(stateString) || 
"Starting".equalsIgnoreCase(stateString))
-            {
-               mBeanServer.invoke(mbean.getObjectName(), "stop", new 
Object[0], new String[0]);
-            }
-         }
-      }
-      catch (Exception e)
-      {
-         HornetQRALogger.LOGGER.errorStoppingRA(e);
-      }
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-}

Reply via email to