added njms

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@577226 13f79535-47bb-0310-9956-ffa450edef68

42 files changed, 114 insertions, 122 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
index 46142c80ca..23ddf1f2e0 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.*;
 import javax.naming.*;
@@ -9,7 +9,6 @@ import org.apache.qpidity.BrokerDetails;
 import org.apache.qpidity.url.QpidURLImpl;
 import org.apache.qpidity.url.QpidURL;
 import org.apache.qpidity.url.BindingURLImpl;
-import org.apache.qpidity.url.URLSyntaxException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
index 1a7d5f7402..e1ad6eb991 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import java.util.Vector;
 
@@ -35,13 +35,13 @@ import javax.jms.TopicSession;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.url.QpidURL;
-import org.apache.qpidity.client.Client;
+import org.apache.qpidity.nclient.Client;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 /**
- * Implements javax.jms.Connection, javax.jms.QueueConnection and javax.jms.TopicConnection
+ * Implements javax.njms.Connection, javax.njms.QueueConnection and javax.njms.TopicConnection
  */
 public class ConnectionImpl implements Connection
 {
@@ -75,7 +75,7 @@ public class ConnectionImpl implements Connection
      * set to true if this Connection has been closed.
      * <p/>
      * A closed Connection cannot accept invocations to any of its methods with the exception
-     * of close(). All other methods should throw javax.jms.IllegalStateExceptions if the
+     * of close(). All other methods should throw javax.njms.IllegalStateExceptions if the
      * Connection has been closed.
      * <p/>
      * A Connection is open after creation, but not started. Once it has been closed, a Connection
@@ -87,11 +87,11 @@ public class ConnectionImpl implements Connection
     /**
      * The QpidConeection instance that is mapped with thie JMS connection
      */
-    org.apache.qpidity.client.Connection _qpidConnection;
+    org.apache.qpidity.nclient.Connection _qpidConnection;
 
     /**
      * This is the exception listener for this qpid connection.
-     * The jms exception listener is registered with this listener.
+     * The njms exception listener is registered with this listener.
      */
     QpidExceptionListenerImpl _qpidExceptionListener;
 
@@ -125,7 +125,7 @@ public class ConnectionImpl implements Connection
         _qpidConnection.connect(qpidURL);
     }
 
-    //---- Interface javax.jms.Connection ---//
+    //---- Interface javax.njms.Connection ---//
     /**
      * Creates a Session
      *
@@ -496,7 +496,7 @@ public class ConnectionImpl implements Connection
      *
      * @return This JMS connection underlying Qpid Connection.
      */
-    protected org.apache.qpidity.client.Connection getQpidConnection()
+    protected org.apache.qpidity.nclient.Connection getQpidConnection()
     {
         return _qpidConnection;
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java
index a4b15e9758..9f2e9104e6 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpid.common.QpidProperties;
 
@@ -24,7 +24,7 @@ import javax.jms.JMSException;
 import java.util.Enumeration;
 
 /**
- * Implements javax.jms.ConnectionMetaData
+ * Implements javax.njms.ConnectionMetaData
  * A ConnectionMetaDataImpl provides information describing the JMS <code>Connection</code>.
  */
 public class ConnectionMetaDataImpl implements ConnectionMetaData
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java b/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java
index 8e6d5ef038..c2a3af1c9b 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import java.util.Enumeration;
 import java.util.ArrayList;
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java
index 31440eaaad..247a41255e 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.url.BindingURL;
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java b/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java
index 98767106ab..d3b2e88f23 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java b/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java
index 743cdc4e8c..698bccdeb5 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java
@@ -15,11 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
 
 import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
@@ -75,7 +74,7 @@ public abstract class MessageActor
         _messageActorID = messageActorID;
     }
 
-    //--- public methods (part of the jms public API)
+    //--- public methods (part of the njms public API)
     /**
      * Closes the MessageActor and deregister it from its session.
      *
@@ -119,7 +118,7 @@ public abstract class MessageActor
 
     /**
      * Check if this MessageActor is not closed.
-     * <p> If the MessageActor is closed, throw a javax.jms.IllegalStateException.
+     * <p> If the MessageActor is closed, throw a javax.njms.IllegalStateException.
      * <p> The method is not synchronized, since MessageProducers can only be used by a single thread.
      *
      * @throws IllegalStateException if the MessageActor is closed
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
index 8b6e694d25..7f55dcbd67 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -27,13 +27,13 @@ import javax.jms.MessageListener;
 import javax.jms.Queue;
 
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.MessagePartListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
 import org.apache.qpidity.exchange.ExchangeDefaults;
 import org.apache.qpidity.filter.JMSSelectorFilter;
 import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.jms.message.MessageFactory;
-import org.apache.qpidity.jms.message.QpidMessage;
+import org.apache.qpidity.njms.message.MessageFactory;
+import org.apache.qpidity.njms.message.QpidMessage;
 import org.apache.qpidity.transport.Option;
 import org.apache.qpidity.transport.RangeSet;
 
@@ -41,7 +41,7 @@ import org.apache.qpidity.transport.RangeSet;
  * Implementation of JMS message consumer
  */
 public class MessageConsumerImpl extends MessageActor
-        implements MessageConsumer, org.apache.qpidity.client.util.MessageListener
+        implements MessageConsumer, org.apache.qpidity.nclient.util.MessageListener
 {
     // we can receive up to 100 messages for an asynchronous listener
     public static final int MAX_MESSAGE_TRANSFERRED = 100;
@@ -127,9 +127,9 @@ public class MessageConsumerImpl extends MessageActor
             getSession().getQpidSession()
                     .messageSubscribe(destination.getQpidQueueName(), // queue
                                       getMessageActorID(), // destination
-                                      org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+                                      org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
                                       // When the message selctor is set we do not acquire the messages
-                                      _messageSelector != null ? org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
+                                      _messageSelector != null ? org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
                                       messageAssembler, null, _noLocal ? Option.NO_LOCAL : Option.NO_OPTION);
             if (_messageSelector != null)
             {
@@ -162,9 +162,9 @@ public class MessageConsumerImpl extends MessageActor
             // subscribe to this topic 
             getSession().getQpidSession()
                     .messageSubscribe(queueName, getMessageActorID(),
-                                      org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+                                      org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
                                       // We always acquire the messages
-                                      org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
+                                      org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
                                       messageAssembler, null, _noLocal ? Option.NO_LOCAL : Option.NO_OPTION,
                                       // Request exclusive subscription access, meaning only this subscription
                                       // can access the queue.
@@ -173,7 +173,7 @@ public class MessageConsumerImpl extends MessageActor
         }
         // set the flow mode
         getSession().getQpidSession()
-                .messageFlowMode(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_MODE_CREDIT);
+                .messageFlowMode(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_MODE_CREDIT);
 
         // this will prevent the broker from sending more than one message
         // When a messageListener is set the flow will be adjusted.
@@ -381,7 +381,7 @@ public class MessageConsumerImpl extends MessageActor
     private void requestCredit(int value)
     {
         getSession().getQpidSession()
-                .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, value);
+                .messageFlow(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_UNIT_MESSAGE, value);
     }
 
     /**
@@ -631,7 +631,7 @@ public class MessageConsumerImpl extends MessageActor
             ranges.add(message.getMessageTransferId());
 
             getSession().getQpidSession()
-                    .messageAcquire(ranges, org.apache.qpidity.client.Session.MESSAGE_ACQUIRE_ANY_AVAILABLE_MESSAGE);
+                    .messageAcquire(ranges, org.apache.qpidity.nclient.Session.MESSAGE_ACQUIRE_ANY_AVAILABLE_MESSAGE);
             getSession().getQpidSession().sync();
             RangeSet acquired = getSession().getQpidSession().getAccquiredMessages();
             if (acquired.size() > 0)
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java
index 6d1d750e82..a61f4f1431 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
-import org.apache.qpidity.jms.message.MessageHelper;
-import org.apache.qpidity.jms.message.MessageImpl;
+import org.apache.qpidity.njms.message.MessageHelper;
+import org.apache.qpidity.njms.message.MessageImpl;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.*;
@@ -61,7 +61,7 @@ public class MessageProducerImpl extends MessageActor implements MessageProducer
         super(session, destination,"");
     }
 
-    //--- Interface javax.jms.MessageProducer
+    //--- Interface javax.njms.MessageProducer
     /**
      * Sets whether message IDs are disabled.
      *
@@ -153,7 +153,7 @@ public class MessageProducerImpl extends MessageActor implements MessageProducer
 
     /**
      * Sets the producer's message priority.
-     * <p> The jms spec says:
+     * <p> The njms spec says:
      * <p> The JMS API defines ten levels of priority value, with 0 as the
      * lowest priority and 9 as the highest. Clients should consider priorities
      * 0-4 as gradations of normal priority and priorities 5-9 as gradations
@@ -373,8 +373,8 @@ public class MessageProducerImpl extends MessageActor implements MessageProducer
         {
             getSession().getQpidSession().messageTransfer(qpidMessage.getExchangeName(),
                                                           qpidMessage.getQpidityMessage(),
-                                                          org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
-                                                          org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE);
+                                                          org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+                                                          org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE);
         }
         catch (IOException e)
         {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java b/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
index ecff09a9aa..59e772db85 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpidity.api.Message;
-import org.apache.qpidity.client.util.MessageListener;
+import org.apache.qpidity.nclient.util.MessageListener;
 
 /**
  * This listener idspatches messaes to its browser.
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java
index 80eda8f7ce..0b6068f05d 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
@@ -42,7 +42,7 @@ public class QpidExceptionListenerImpl //implements ExceptionListener
     {
         // convert this exception in a JMS exception
         JMSException jmsException = ExceptionHelper.convertQpidExceptionToJMSException(exception);
-        // propagate to the jms exception listener
+        // propagate to the njms exception listener
         if (_jmsExceptionListener != null)
         {
             _jmsExceptionListener.onException(jmsException);
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
index d6b27be9a4..4478048528 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
@@ -25,8 +25,8 @@ import javax.jms.Message;
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 
-import org.apache.qpidity.client.MessagePartListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
 import org.apache.qpidity.filter.JMSSelectorFilter;
 import org.apache.qpidity.filter.MessageFilter;
 
@@ -94,13 +94,13 @@ public class QueueBrowserImpl extends MessageActor implements QueueBrowser
         // this is a queue we expect that this queue exists
         getSession().getQpidSession()
                 .messageSubscribe(queue.getQueueName(), getMessageActorID(),
-                                  org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+                                  org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
                                   // We do not acquire those messages
-                                  org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
+                                  org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
 
     }
 
-    //--- javax.jms.QueueBrowser API
+    //--- javax.njms.QueueBrowser API
     /**
      * Get an enumeration for browsing the current queue messages in the order they would be received.
      *
@@ -169,7 +169,7 @@ public class QueueBrowserImpl extends MessageActor implements QueueBrowser
         // request messages
         int received = 0;
         getSession().getQpidSession()
-        .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE,
+        .messageFlow(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_UNIT_MESSAGE,
                      _maxbatchlength);
         _batchLength = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java
index 8d008bda7e..cab683b0a4 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java
@@ -15,17 +15,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
-import org.apache.qpidity.jms.ConnectionImpl;
+import org.apache.qpidity.njms.ConnectionImpl;
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.Client;
 
 import javax.jms.QueueConnection;
 
 /**
  *
- *  Implements javax.jms.QueueConnection
+ *  Implements javax.njms.QueueConnection
  */
 public class QueueConnectionImpl extends ConnectionImpl implements QueueConnection
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java
index ec837bc4e6..43e8e9e43f 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.transport.Option;
@@ -93,7 +93,7 @@ public class QueueImpl extends DestinationImpl implements Queue
         _isExclusive = false;
     }
 
-    //---- Interface javax.jms.Queue
+    //---- Interface javax.njms.Queue
     /**
      * Gets the name of this queue.
      *
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java
index 24365a1e07..67db7e5001 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.QueueReceiver;
 import javax.jms.JMSException;
 import javax.jms.Queue;
 
 /**
- * Implements javax.jms.QueueReceiver
+ * Implements javax.njms.QueueReceiver
  */
 public class QueueReceiverImpl extends MessageConsumerImpl implements QueueReceiver
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java
index 5ba2df1220..d03bb3a6b7 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.QueueSender;
 import javax.jms.JMSException;
@@ -23,7 +23,7 @@ import javax.jms.Queue;
 import javax.jms.Message;
 
 /**
- * Implements javax.jms.QueueSender
+ * Implements javax.njms.QueueSender
  */
 public class QueueSenderImpl extends MessageProducerImpl implements QueueSender
 {
@@ -40,7 +40,7 @@ public class QueueSenderImpl extends MessageProducerImpl implements QueueSender
         super(session, queue);
     }
 
-    //--- Interface javax.jms.QueueSender
+    //--- Interface javax.njms.QueueSender
     /**
      * Get the queue associated with this QueueSender.
      *
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
index 4fe2a340eb..9ae0725f00 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.*;
 import javax.jms.IllegalStateException;
@@ -23,7 +23,7 @@ import javax.jms.IllegalStateException;
 import org.apache.qpidity.QpidException;
 
 /**
- * Implementation of javax.jms.QueueSession
+ * Implementation of javax.njms.QueueSession
  */
 public class QueueSessionImpl extends SessionImpl implements QueueSession
 {
@@ -96,7 +96,7 @@ public class QueueSessionImpl extends SessionImpl implements QueueSession
         throw new IllegalStateException("Cannot invoke unsubscribe from QueueSession");
     }
 
-    //--- Interface javax.jms.QueueSession
+    //--- Interface javax.njms.QueueSession
     /**
      * Create a QueueReceiver to receive messages from the specified queue.
      *
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
index 40bf7f15a8..a7c1d00b72 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.jms.message.*;
+import org.apache.qpidity.njms.message.*;
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.transport.RangeSet;
 
@@ -106,7 +106,7 @@ public class SessionImpl implements Session
     /**
      * The underlying QpidSession
      */
-    private org.apache.qpidity.client.Session _qpidSession;
+    private org.apache.qpidity.nclient.Session _qpidSession;
 
     /**
      * The latest qpid Exception that has been reaised.
@@ -166,7 +166,7 @@ public class SessionImpl implements Session
         initMessageDispatcherThread();
     }
 
-    //--- javax.jms.Session API
+    //--- javax.njms.Session API
     /**
      * Creates a <CODE>BytesMessage</CODE> object used to send a message
      * containing a stream of uninterpreted bytes.
@@ -374,7 +374,7 @@ public class SessionImpl implements Session
      * <P>Closing a transacted session must roll back the transaction in progress.
      * <P>This method is the only <code>Session</code> method that can be called concurrently.
      * <P>Invoking any other <code>Session</code> method on a closed session
-     * must throw a <code>javax.jms.IllegalStateException</code>.
+     * must throw a <code>javax.njms.IllegalStateException</code>.
      * <p> Closing a closed session must <I>not</I> throw an exception.
      *
      * @throws JMSException If closing the session fails due to some internal error.
@@ -1100,7 +1100,7 @@ public class SessionImpl implements Session
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.client.Session getQpidSession()
+    protected org.apache.qpidity.nclient.Session getQpidSession()
     {
         return _qpidSession;
     }
@@ -1160,7 +1160,7 @@ public class SessionImpl implements Session
     /**
      * Lstener for qpid protocol exceptions
      */
-    private class QpidSessionExceptionListener implements org.apache.qpidity.client.ExceptionListener
+    private class QpidSessionExceptionListener implements org.apache.qpidity.nclient.ExceptionListener
     {
         public void onException(QpidException exception)
         {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java
index b5e59eeaa6..34d2cbd1b1 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.JMSException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java
index a152f66da7..88dae74cc1 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java
index 8fa139919d..63fdc68c65 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java
index f8f19a9e33..4174c6a5d5 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
 import javax.jms.TopicConnection;
 
 /**
- * Implements javax.jms.TopicConnection
+ * Implements javax.njms.TopicConnection
  */
 public class TopicConnectionImpl extends ConnectionImpl implements TopicConnection
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java
index d23b08e37a..fc6ea08897 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.exchange.ExchangeDefaults;
@@ -26,7 +26,7 @@ import javax.jms.Topic;
 import java.util.UUID;
 
 /**
- * Implementation of the javax.jms.Topic interface.
+ * Implementation of the javax.njms.Topic interface.
  */
 public class TopicImpl extends DestinationImpl implements Topic
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java
index 4bf39e35c4..7f65261486 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.*;
 
@@ -37,7 +37,7 @@ public class TopicPublisherImpl extends MessageProducerImpl implements TopicPubl
         super(session, (DestinationImpl) topic);
     }
 
-    //--- Interface javax.jms.TopicPublisher
+    //--- Interface javax.njms.TopicPublisher
     /**
      * Get the topic associated with this TopicPublisher.
      *
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
index 21aa2411a8..74c5a2c0f7 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.*;
 import javax.jms.IllegalStateException;
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java
index ae9f59a77f..73d03db055 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.jms.TopicSubscriber;
 import javax.jms.Topic;
@@ -44,7 +44,7 @@ public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSub
         super(session, (DestinationImpl) topic, messageSelector, noLocal, subscriptionName,consumerTag);
     }
 
-    //---  javax.jms.TopicSubscriber interface
+    //---  javax.njms.TopicSubscriber interface
     /**
      * Get the Topic associated with this subscriber.
      *
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java
index 1a7fae5680..3d181db1f6 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
@@ -24,7 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.XASession;
 
 /**
- * This class implements the javax.jms.XAConnection interface
+ * This class implements the javax.njms.XAConnection interface
  */
 public class XAConnectionImpl extends ConnectionImpl implements XAConnection
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java
index 55d46c874b..b500208036 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java
index 86aad99064..3df8a0928e 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
@@ -24,7 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.XAQueueSession;
 
 /**
- * Imeplements javax.jms.XAQueueSessionImpl
+ * Imeplements javax.njms.XAQueueSessionImpl
  */
 public class XAQueueSessionImpl extends XASessionImpl implements XAQueueSession
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java
index dab7585deb..37921ece4d 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This is an implementation of javax.jms.XAResource.
+ * This is an implementation of javax.njms.XAResource.
  */
 public class XAResourceImpl implements XAResource
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
index abd8bd9c79..65f57b528c 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.DtxSession;
+import org.apache.qpidity.nclient.DtxSession;
 
 import javax.jms.XASession;
 import javax.jms.Session;
@@ -27,7 +27,7 @@ import javax.jms.TransactionInProgressException;
 import javax.transaction.xa.XAResource;
 
 /**
- * This is an implementation of the javax.jms.XASEssion interface.
+ * This is an implementation of the javax.njms.XASEssion interface.
  */
 public class XASessionImpl extends SessionImpl implements XASession
 {
@@ -62,7 +62,7 @@ public class XASessionImpl extends SessionImpl implements XASession
         _xaResource = new XAResourceImpl(this);
     }
 
-    //--- javax.jms.XASEssion API
+    //--- javax.njms.XASEssion API
 
     /**
      * Gets the session associated with this XASession.
@@ -119,7 +119,7 @@ public class XASessionImpl extends SessionImpl implements XASession
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.client.DtxSession getQpidSession()
+    protected org.apache.qpidity.nclient.DtxSession getQpidSession()
     {
         return _qpidDtxSession;
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java
index 3dddc38e23..d7e56e5af9 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
@@ -24,7 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.XATopicSession;
 
 /**
- * implements javax.jms.XATopicConnection
+ * implements javax.njms.XATopicConnection
  */
 public class XATopicConnectionImpl extends XAConnectionImpl implements XATopicConnection
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java
index 3fc948901c..bf76669470 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
 
 import org.apache.qpidity.QpidException;
 
 import javax.jms.*;
 
 /**
- * Implements javax.jms.XATopicSession and javax.jms.TopicSession
+ * Implements javax.njms.XATopicSession and javax.njms.TopicSession
  */
 public class XATopicSessionImpl extends XASessionImpl implements XATopicSession
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
index ef2590bcee..8a5f910d03 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ import java.io.*;
 import java.nio.ByteBuffer;
 
 /**
- * Implements javax.jms.BytesMessage
+ * Implements javax.njms.BytesMessage
  */
 public class BytesMessageImpl extends MessageImpl implements BytesMessage
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
index 9ec74f1dc6..26012e63b3 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.apache.qpidity.QpidException;
 
@@ -30,7 +30,7 @@ import java.io.*;
 import java.nio.ByteBuffer;
 
 /**
- * Implements javax.jms.MapMessage
+ * Implements javax.njms.MapMessage
  */
 public class MapMessageImpl extends MessageImpl implements MapMessage
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java
index 2f67beb995..fa7ebe7d1b 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java
index ab23daaadd..0cbe188f6e 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import javax.jms.*;
 import java.math.BigDecimal;
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
index 4b843f45f9..a2d974f9ad 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
@@ -15,23 +15,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
-import org.apache.qpidity.jms.ExceptionHelper;
-import org.apache.qpidity.jms.MessageConsumerImpl;
+import org.apache.qpidity.njms.ExceptionHelper;
+import org.apache.qpidity.njms.MessageConsumerImpl;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.*;
 import java.util.Enumeration;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CoderResult;
 
 /**
- * Implementation of javax.jms.Message
+ * Implementation of javax.njms.Message
  */
 public class MessageImpl extends QpidMessage implements Message
 {
@@ -90,7 +85,7 @@ public class MessageImpl extends QpidMessage implements Message
         super(message);
     }
 
-    //---- javax.jms.Message interface
+    //---- javax.njms.Message interface
     /**
      * Get the message ID.
      * <p> The JMS sprec says:
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
index 8f31fd228a..70afddc9a3 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@ import java.io.*;
 import java.nio.ByteBuffer;
 
 /**
- * Implemetns javax.jms.ObjectMessage
+ * Implemetns javax.njms.ObjectMessage
  */
 public class ObjectMessageImpl extends MessageImpl implements ObjectMessage
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
index a7e4d02651..2426231c15 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import java.nio.ByteBuffer;
 import java.util.Enumeration;
@@ -29,7 +29,7 @@ import java.io.IOException;
 
 import org.apache.qpidity.ErrorCode;
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.util.ByteBufferMessage;
+import org.apache.qpidity.nclient.util.ByteBufferMessage;
 import org.apache.qpidity.transport.ReplyTo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java
index 10060b6df8..670dddd969 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
index 199012c680..577b586fe2 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
 
 import org.apache.qpidity.QpidException;
 
@@ -27,7 +27,7 @@ import java.nio.charset.*;
 import java.io.UnsupportedEncodingException;
 
 /**
- * Implements the interface javax.jms.TextMessage
+ * Implements the interface javax.njms.TextMessage
  */
 public class TextMessageImpl extends MessageImpl implements TextMessage
 {