QPID-1072: renamed org.apache.qpidity -> org.apache.qpid

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

47 files changed, 238 insertions, 243 deletions

diff --git a/java/client/src/main/grammar/SelectorParser.jj b/java/client/src/main/grammar/SelectorParser.jj
index a72da526ae..b45cf1a487 100644
--- a/java/client/src/main/grammar/SelectorParser.jj
+++ b/java/client/src/main/grammar/SelectorParser.jj
@@ -61,20 +61,20 @@ PARSER_BEGIN(SelectorParser)
  *

  */

 

-package org.apache.qpidity.filter.selector;

+package org.apache.qpid.filter.selector;

 

 import java.io.StringReader;

 import java.util.ArrayList;

 

-import org.apache.qpidity.QpidException;

-import org.apache.qpidity.filter.ArithmeticExpression;

-import org.apache.qpidity.filter.BooleanExpression;

-import org.apache.qpidity.filter.ComparisonExpression;

-import org.apache.qpidity.filter.ConstantExpression;

-import org.apache.qpidity.filter.Expression;

-import org.apache.qpidity.filter.LogicExpression;

-import org.apache.qpidity.filter.PropertyExpression;

-import org.apache.qpidity.filter.UnaryExpression;

+import org.apache.qpid.QpidException;

+import org.apache.qpid.filter.ArithmeticExpression;

+import org.apache.qpid.filter.BooleanExpression;

+import org.apache.qpid.filter.ComparisonExpression;

+import org.apache.qpid.filter.ConstantExpression;

+import org.apache.qpid.filter.Expression;

+import org.apache.qpid.filter.LogicExpression;

+import org.apache.qpid.filter.PropertyExpression;

+import org.apache.qpid.filter.UnaryExpression;

 

 /**

  * JMS Selector Parser generated by JavaCC

diff --git a/java/client/src/main/java/client.log4j b/java/client/src/main/java/client.log4j
index a5531bb874..19cc946118 100644
--- a/java/client/src/main/java/client.log4j
+++ b/java/client/src/main/java/client.log4j
@@ -21,15 +21,10 @@ log4j.rootLogger=${root.logging.level}
 

 #log4j.logger.org.apache.qpid=${amqj.logging.level}, console

 #log4j.additivity.org.apache.qpid=false

-#log4j.logger.org.apache.qpidity.transport=TRACE, console

 

 log4j.logger.org.apache.qpid=ERROR, console

 log4j.additivity.org.apache.qpid=false

 

-log4j.logger.org.apache.qpidity=ERROR, console

-log4j.additivity.org.apache.qpidity=false

-

-#log4j.logger.org.apache.qpidity.transport=DEBUG, console

 #log4j.logger.org.apache.qpid.client.message.AbstractBytesTypedMessage=DEBUG, console

 

 log4j.appender.console=org.apache.log4j.ConsoleAppender

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index ce10553210..a2df2f3cf2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -12,11 +12,11 @@ import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.Session;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.ProtocolVersionException;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.ProtocolVersionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +35,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Closed
     /**
      * The QpidConeection instance that is mapped with thie JMS connection.
      */
-    org.apache.qpidity.nclient.Connection _qpidConnection;
+    org.apache.qpid.nclient.Connection _qpidConnection;
 
     //--- constructor
     public AMQConnectionDelegate_0_10(AMQConnection conn)
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 9dff8e3e7e..cf73bc5089 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -28,16 +28,16 @@ import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
 import org.apache.qpid.client.message.FiledTableSupport;
 import org.apache.qpid.util.Serial;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.ExchangeBoundResult;
-import org.apache.qpidity.transport.Future;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.ExchangeBoundResult;
+import org.apache.qpid.transport.Future;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,8 +71,8 @@ public class AMQSession_0_10 extends AMQSession
     private Object _currentExceptionLock = new Object();
     private QpidException _currentException;
 
-    // a ref on the qpidity connection
-    protected org.apache.qpidity.nclient.Connection _qpidConnection;
+    // a ref on the qpid connection
+    protected org.apache.qpid.nclient.Connection _qpidConnection;
 
     private RangeSet unacked = new RangeSet();
     private int unackedCount = 0;
@@ -96,7 +96,7 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchLowMark  The number of prefetched messages at which to resume the session.
      * @param qpidConnection          The qpid connection
      */
-    AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                     boolean transacted, int acknowledgeMode, MessageFactoryRegistry messageFactoryRegistry,
                     int defaultPrefetchHighMark, int defaultPrefetchLowMark)
     {
@@ -126,7 +126,7 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchLow  The number of prefetched messages at which to resume the session.
      * @param qpidConnection      The connection
      */
-    AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                     boolean transacted, int acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
     {
 
@@ -594,7 +594,7 @@ public class AMQSession_0_10 extends AMQSession
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.nclient.Session getQpidSession()
+    protected org.apache.qpid.nclient.Session getQpidSession()
     {
         return _qpidSession;
     }
@@ -645,7 +645,7 @@ public class AMQSession_0_10 extends AMQSession
     /**
      * Lstener for qpid protocol exceptions
      */
-    private class QpidSessionExceptionListener implements org.apache.qpidity.nclient.ClosedListener
+    private class QpidSessionExceptionListener implements org.apache.qpid.nclient.ClosedListener
     {
         public void onClosed(ErrorCode errorCode, String reason, Throwable t)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index 9230225bd5..255b38aa10 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -27,12 +27,12 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.jms.*;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.filter.JMSSelectorFilter;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.filter.JMSSelectorFilter;
 
 import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * This is a 0.10 message consumer.
  */
 public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], ByteBuffer>
-        implements org.apache.qpidity.nclient.util.MessageListener
+        implements org.apache.qpid.nclient.util.MessageListener
 {
 
     /**
@@ -108,7 +108,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
         _isStarted = connection.started();
     }
 
-    // ----- Interface org.apache.qpidity.client.util.MessageListener
+    // ----- Interface org.apache.qpid.client.util.MessageListener
 
     /**
      *
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
index 5e6a5b5f40..4e906b387d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
@@ -33,13 +33,13 @@ import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.url.AMQBindingURL;
-import org.apache.qpidity.nclient.util.ByteBufferMessage;
-import org.apache.qpidity.njms.ExceptionHelper;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageDeliveryMode;
-import org.apache.qpidity.transport.MessageDeliveryPriority;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.ReplyTo;
+import org.apache.qpid.nclient.util.ByteBufferMessage;
+import org.apache.qpid.njms.ExceptionHelper;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageDeliveryMode;
+import org.apache.qpid.transport.MessageDeliveryPriority;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.ReplyTo;
 
 /**
  * This is a 0_10 message producer.
@@ -208,7 +208,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
         // send the message
         try
         {
-            org.apache.qpidity.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
+            org.apache.qpid.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
 
             // if true, we need to sync the delivery of this message
             boolean sync = (deliveryMode == DeliveryMode.PERSISTENT &&
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
index b10eac3a1d..6763c72ecd 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
@@ -21,9 +21,9 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.dtx.XidImpl;
-import org.apache.qpidity.transport.*;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.dtx.XidImpl;
+import org.apache.qpid.transport.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -140,7 +140,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -169,7 +169,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -199,7 +199,7 @@ public class XAResourceImpl implements XAResource
             }
             catch (SessionException e)
             {
-                // we need to restore the qpidity session that has been closed
+                // we need to restore the qpid session that has been closed
                 _xaSession.createSession();
                 // we should get a single exception
                 convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -246,7 +246,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -289,7 +289,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -298,7 +298,7 @@ public class XAResourceImpl implements XAResource
         int i = 0;
         for (Object obj : res.getInDoubt())
         {
-            org.apache.qpidity.transport.Xid xid = (org.apache.qpidity.transport.Xid) obj;
+            org.apache.qpid.transport.Xid xid = (org.apache.qpid.transport.Xid) obj;
             result[i] = new XidImpl(xid.getBranchId(), (int) xid.getFormat(), xid.getGlobalId());
             i++;
         }
@@ -327,7 +327,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -411,7 +411,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -512,7 +512,7 @@ public class XAResourceImpl implements XAResource
      * @return the qpid formated xid
      * @throws XAException when xid is null or when it cannot be converted. 
      */
-    private org.apache.qpidity.transport.Xid convertXid(Xid xid) throws XAException
+    private org.apache.qpid.transport.Xid convertXid(Xid xid) throws XAException
     {
         if (xid == null)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java b/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
index 1eda71cc63..51b4b7899f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.client;
 
-import org.apache.qpidity.nclient.DtxSession;
+import org.apache.qpid.nclient.DtxSession;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
 
 import javax.jms.*;
@@ -48,7 +48,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
     /**
      * Create a JMS XASession
      */
-    public XASessionImpl(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    public XASessionImpl(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                          int defaultPrefetchHigh, int defaultPrefetchLow)
     {
         super(qpidConnection, con, channelId, false,  // this is not a transacted session
@@ -61,7 +61,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
     //-- public methods
 
     /**
-     * Create a qpidity session.
+     * Create a qpid session.
      */
     public void createSession()
     {
@@ -126,7 +126,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.nclient.DtxSession getQpidSession()
+    protected org.apache.qpid.nclient.DtxSession getQpidSession()
     {
         return _qpidDtxSession;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index ab284116af..dc3a483538 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -69,9 +69,9 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
     /**
      * This is 0_10 specific
      */
-    private org.apache.qpidity.api.Message _010message = null;
+    private org.apache.qpid.api.Message _010message = null;
 
-    public void set010Message(org.apache.qpidity.api.Message m )
+    public void set010Message(org.apache.qpid.api.Message m )
     {
         _010message = m;
     }
@@ -103,7 +103,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
      * End 010 specific
      */
 
-    public org.apache.qpidity.api.Message get010Message()
+    public org.apache.qpid.api.Message get010Message()
     {
         return _010message;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 0dbad3726c..e14c343613 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
@@ -27,9 +27,9 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.DeliveryProperties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
index c6b22592e0..6c9acdef01 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
@@ -27,7 +27,7 @@ import javax.jms.JMSException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Struct;
 
 
 public interface MessageFactory
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
index 24ab471f10..6117b18fde 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
@@ -30,9 +30,9 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
index 09f41a9ba6..5093064edf 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
@@ -25,8 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
 
 /**
  * This class contains everything needed to process a JMS message. It assembles the deliver body, the content header and
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ArithmeticExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 279716598d..56d1bdcdc5 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ArithmeticExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/BinaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
index 465b504ae3..f97f858fad 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/BinaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 /**
  * An expression which performs an operation on two expression values.
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/BooleanExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index 9a3b1c3106..cc24c81729 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/BooleanExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ComparisonExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index 46f387b293..adf360698b 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ComparisonExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.util.HashSet;
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ConstantExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 26aeec2de8..447de914a4 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ConstantExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.math.BigDecimal;
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/Expression.java b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
index bdc3c9cccc..e578775a77 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/Expression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/JMSSelectorFilter.java b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
index c73da1682a..dcfb9a9940 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/JMSSelectorFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.selector.SelectorParser;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.selector.SelectorParser;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/LogicExpression.java b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
index 7f5909df43..d7aabd5a46 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/LogicExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/MessageFilter.java b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
index aa1303a373..a775080d81 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/MessageFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/PropertyExpression.java b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index 5ea2004d75..700c6a15ac 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/PropertyExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 import org.apache.qpid.framing.CommonContentHeaderProperties;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/UnaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index f73449679c..b620b107c4 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/UnaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.math.BigDecimal;
diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 72ba16086d..0316255b2c 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -48,7 +48,7 @@ public interface BrokerDetails
     public static final long DEFAULT_CONNECT_TIMEOUT = 30000L;
     public static final boolean USE_SSL_DEFAULT = false;
 
-    // pulled these properties from the new BrokerDetails class in the qpidity package
+    // pulled these properties from the new BrokerDetails class in the qpid package
     public static final String PROTOCOL_TCP = "tcp";
     public static final String PROTOCOL_TLS = "tls";
 
diff --git a/java/client/src/main/java/org/apache/qpidity/naming/ReadOnlyContext.java b/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
index c73d6e4b35..59ec4cfba7 100644
--- a/java/client/src/main/java/org/apache/qpidity/naming/ReadOnlyContext.java
+++ b/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.naming;
+package org.apache.qpid.naming;
 
 import org.apache.qpid.jndi.NameParserImpl;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties b/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
index e451cf53fa..830de5f619 100644
--- a/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
+++ b/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-java.naming.factory.initial = org.apache.qpidity.naming.PropertiesFileInitialConextFactory
+java.naming.factory.initial = org.apache.qpid.naming.PropertiesFileInitialConextFactory
 
 # use the following property to configure the default connector
 #java.naming.provider.url - ignored.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/java/client/src/main/java/org/apache/qpid/nclient/Client.java
index eb0e370560..bed3ee02cb 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Client.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.util.List;
 import java.util.UUID;
@@ -29,27 +29,27 @@ import java.util.concurrent.locks.ReentrantLock;
 import org.apache.qpid.client.url.URLParser_0_10;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.url.QpidURL;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.nclient.impl.ClientSession;
-import org.apache.qpidity.nclient.impl.ClientSessionDelegate;
-import org.apache.qpidity.transport.Channel;
-import org.apache.qpidity.transport.ClientDelegate;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionClose;
-import org.apache.qpidity.transport.ConnectionCloseCode;
-import org.apache.qpidity.transport.ConnectionCloseOk;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.ProtocolVersionException;
-import org.apache.qpidity.transport.SessionDelegate;
-import org.apache.qpidity.transport.network.io.IoTransport;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
-import org.apache.qpidity.transport.network.nio.NioHandler;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.nclient.impl.ClientSession;
+import org.apache.qpid.nclient.impl.ClientSessionDelegate;
+import org.apache.qpid.transport.Channel;
+import org.apache.qpid.transport.ClientDelegate;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionClose;
+import org.apache.qpid.transport.ConnectionCloseCode;
+import org.apache.qpid.transport.ConnectionCloseOk;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.ProtocolVersionException;
+import org.apache.qpid.transport.SessionDelegate;
+import org.apache.qpid.transport.network.io.IoTransport;
+import org.apache.qpid.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.network.nio.NioHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class Client implements org.apache.qpidity.nclient.Connection
+public class Client implements org.apache.qpid.nclient.Connection
 {
     private Connection _conn;
     private ClosedListener _closedListner;
@@ -65,7 +65,7 @@ public class Client implements org.apache.qpidity.nclient.Connection
      *
      * @return returns a new connection to the broker.
      */
-    public static org.apache.qpidity.nclient.Connection createConnection()
+    public static org.apache.qpid.nclient.Connection createConnection()
     {
         return new Client();
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java b/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
index c0c6978a14..4cf0cab1ec 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
 
 
 /**
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Connection.java b/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
index 49167750d1..2d5b50b33a 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Connection.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 
 /**
  * This represents a physical connection to a broker.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/DtxSession.java b/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
index 1d9c63df4f..8a859f2d84 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/DtxSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.transport.Future;
-import org.apache.qpidity.transport.GetTimeoutResult;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.RecoverResult;
-import org.apache.qpidity.transport.XaResult;
-import org.apache.qpidity.transport.Xid;
+import org.apache.qpid.transport.Future;
+import org.apache.qpid.transport.GetTimeoutResult;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.RecoverResult;
+import org.apache.qpid.transport.XaResult;
+import org.apache.qpid.transport.Xid;
 
 /**
  * The resources for this session are controlled under the scope of a distributed transaction.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
index feb4c1c94d..4e1b9058e6 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
@@ -1,4 +1,4 @@
- package org.apache.qpidity.nclient;
+ package org.apache.qpid.nclient;
 
 import java.util.Enumeration;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/MessagePartListener.java b/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
index 7c7881502a..2fdc74fc09 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/MessagePartListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.Header;
+import org.apache.qpid.transport.Header;
 
 /**
  * Assembles message parts.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java b/java/client/src/main/java/org/apache/qpid/nclient/Session.java
index 218a7ed571..e4daaa094e 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Session.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.api.Message;
 
 /**
  * <p>A session is associated with a connection.
@@ -116,8 +116,8 @@ public interface Session
      * <br><b><i>This method should only be used by large messages</b></i><br>
      * There are two convenience Message classes to do this.
      * <ul>
-     * <li> <code>{@link org.apache.qpidity.nclient.util.FileMessage}</code>
-     * <li> <code>{@link org.apache.qpidity.nclient.util.StreamingMessage}</code>
+     * <li> <code>{@link org.apache.qpid.nclient.util.FileMessage}</code>
+     * <li> <code>{@link org.apache.qpid.nclient.util.StreamingMessage}</code>
      * </ul>
      * You can also implement a <code>Message</code> interface to wrap any
      * data stream.
@@ -160,8 +160,8 @@ public interface Session
      * Make a set of headers to be sent together with a message
      *
      * @param headers headers to be added
-     * @see org.apache.qpidity.transport.DeliveryProperties
-     * @see org.apache.qpidity.transport.MessageProperties
+     * @see org.apache.qpid.transport.DeliveryProperties
+     * @see org.apache.qpid.transport.MessageProperties
      * @return The added headers.
      */
     public Header header(Struct... headers);
@@ -229,7 +229,7 @@ public interface Session
      *                    acquired when the transfer starts.
      *                    </ul>
      * @param listener    The listener for this destination. To transfer large messages
-     *                    use a {@link org.apache.qpidity.nclient.MessagePartListener}.
+     *                    use a {@link org.apache.qpid.nclient.MessagePartListener}.
      * @param options     Set of options. Valid options are {{@link Option#EXCLUSIVE}
      *                    and {@link Option#NONE}.
      * @param filter      A set of filters for the subscription. The syntax and semantics of these filters varies
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
index f7978d0d98..ffde5336f9 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -7,22 +7,22 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.MessagePartListener;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.MessagePartListener;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
 
-import static org.apache.qpidity.transport.Option.*;
+import static org.apache.qpid.transport.Option.*;
 
 /**
  * Implements a Qpid Sesion.
  */
-public class ClientSession extends org.apache.qpidity.transport.Session implements  org.apache.qpidity.nclient.DtxSession
+public class ClientSession extends org.apache.qpid.transport.Session implements  org.apache.qpid.nclient.DtxSession
 {
     static
     {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSessionDelegate.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
index da6f5e7d45..b57fd0a7ed 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSessionDelegate.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
@@ -1,20 +1,20 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
 
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.nclient.MessagePartListener;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.MessageReject;
-import org.apache.qpidity.transport.MessageTransfer;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.transport.SessionDetached;
-import org.apache.qpidity.transport.SessionDelegate;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageReject;
+import org.apache.qpid.transport.MessageTransfer;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.transport.SessionDetached;
+import org.apache.qpid.transport.SessionDelegate;
 
 
 public class ClientSessionDelegate extends SessionDelegate
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
index 83d491baad..f689e9abde 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 /**
  * This class holds all the 0.10 client constants which value can be set
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
index 05b99a3cf1..96e1d2c772 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
@@ -1,17 +1,17 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageProperties;
 
 import java.util.UUID;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
index 64ffe17fe0..36c0a4b3be 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
@@ -1,18 +1,18 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.io.FileInputStream;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.FileMessage;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.FileMessage;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
 
 import java.util.UUID;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java b/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
index e452091622..513c1a95de 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
@@ -1,24 +1,24 @@
-package org.apache.qpidity.nclient.interop;
+package org.apache.qpid.nclient.interop;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.RangeSet;
 
 public class BasicInteropTest implements ClosedListener
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/ByteBufferMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
index 833f905b58..8973127105 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/ByteBufferMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 /**
  * <p>A Simple implementation of the message interface
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/FileMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
index 289d03574d..179c91c2e9 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/FileMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.EOFException;
 import java.io.FileInputStream;
@@ -7,10 +7,10 @@ import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 /**
  * FileMessage provides pull style semantics for
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessageListener.java b/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
index 43c20eb6b5..c5edd62143 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessageListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.api.Message;
 
 /**
  *A message listener
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessagePartListenerAdapter.java b/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
index 757d44fbbb..3f1746f48a 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessagePartListenerAdapter.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
@@ -1,12 +1,12 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.nclient.MessagePartListener;
 
 /**
  * This is a simple message assembler.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/ReadOnlyMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
index 8ff5c62a25..6583a95c7e 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/ReadOnlyMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
@@ -1,10 +1,10 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.api.Message;
 
 public abstract class ReadOnlyMessage implements Message
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/StreamingMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
index 6c7f9e9db7..a4574438ac 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/StreamingMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 public class StreamingMessage extends ReadOnlyMessage implements Message
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/njms/ExceptionHelper.java b/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
index e00f9008d3..ce790a3b24 100644
--- a/java/client/src/main/java/org/apache/qpidity/njms/ExceptionHelper.java
+++ b/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.njms;
+package org.apache.qpid.njms;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 
 import javax.jms.JMSException;
 import javax.transaction.xa.XAException;