added nclient

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

17 files changed, 44 insertions, 45 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/client/Client.java b/java/client/src/main/java/org/apache/qpidity/client/Client.java
index 3bc684a6ca..ff05e40f20 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/Client.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Client.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
@@ -8,8 +8,8 @@ import java.util.concurrent.locks.ReentrantLock;
 import org.apache.qpidity.BrokerDetails;
 import org.apache.qpidity.ErrorCode;
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.impl.ClientSession;
-import org.apache.qpidity.client.impl.ClientSessionDelegate;
+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.Connection;
 import org.apache.qpidity.transport.ConnectionClose;
@@ -21,7 +21,7 @@ import org.apache.qpidity.transport.network.mina.MinaHandler;
 import org.apache.qpidity.url.QpidURL;
 
 
-public class Client implements org.apache.qpidity.client.Connection
+public class Client implements org.apache.qpidity.nclient.Connection
 {
     private AtomicInteger _channelNo = new AtomicInteger();
     private Connection _conn;
@@ -32,7 +32,7 @@ public class Client implements org.apache.qpidity.client.Connection
      *
      * @return returns a new connection to the broker.
      */
-    public static org.apache.qpidity.client.Connection createConnection()
+    public static org.apache.qpidity.nclient.Connection createConnection()
     {
         return new Client();
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/client/Connection.java b/java/client/src/main/java/org/apache/qpidity/client/Connection.java
index c7624eec6a..c11c8a04e0 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/Connection.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Connection.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.url.QpidURL;
diff --git a/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java b/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java
index 457bb9fe7d..6fe019c3a1 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
 import org.apache.qpidity.transport.DtxCoordinationCommitResult;
 import org.apache.qpidity.transport.DtxCoordinationGetTimeoutResult;
diff --git a/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java b/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java
index e2faede165..60a5325c6f 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/JMSTestCase.java b/java/client/src/main/java/org/apache/qpidity/client/JMSTestCase.java
index ac4f4dbd06..42dad7329e 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/JMSTestCase.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/JMSTestCase.java
@@ -1,7 +1,7 @@
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
-import org.apache.qpidity.jms.ConnectionFactoryImpl;
-import org.apache.qpidity.jms.TopicImpl;
+import org.apache.qpidity.njms.ConnectionFactoryImpl;
+import org.apache.qpidity.njms.TopicImpl;
 
 public class JMSTestCase
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java b/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java
index f0c2c8ca9c..ecdd2d7952 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.client;
+package org.apache.qpidity.nclient;
 
 import java.nio.ByteBuffer;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/Session.java b/java/client/src/main/java/org/apache/qpidity/client/Session.java
index 444fb64d1b..88d85e823b 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/Session.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Session.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package org.apache.qpidity.client;

+package org.apache.qpidity.nclient;

 

 import java.io.IOException;

 import java.nio.ByteBuffer;

@@ -118,8 +118,8 @@ public interface Session
      * <br><b><i>This method should only be used by large messages</b></i><br>

      * There are two convinience Message classes provided to facilitate this.

      * <ul>

-     * <li> <code>{@link org.apache.qpidity.client.util.FileMessage}</code>

-     * <li> <code>{@link org.apache.qpidity.client.util.StreamingMessage}</code>

+     * <li> <code>{@link org.apache.qpidity.nclient.util.FileMessage}</code>

+     * <li> <code>{@link org.apache.qpidity.nclient.util.StreamingMessage}</code>

      * </ul>

      * You could also implement a the <code>Message</code> interface to and wrap any

      * data stream you want.

@@ -253,7 +253,7 @@ public interface Session
      *                    acquired when the transfer starts

      *                    </ul>

      * @param listener    The listener for this destination. When big message are transfered then

-     *                    it is recommended to use a {@link org.apache.qpidity.client.MessagePartListener}.

+     *                    it is recommended to use a {@link org.apache.qpidity.nclient.MessagePartListener}.

      * @param options     Set of Options (valid options are {@link Option#NO_LOCAL}, {@link Option#EXCLUSIVE}

      *                    and {@link Option#NO_OPTION})

      * @param filter      A set of filters for the subscription. The syntax and semantics of these filters depends

diff --git a/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSession.java
index 6d2640b8bb..f6aa444881 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSession.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.impl;
+package org.apache.qpidity.nclient.impl;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -10,13 +10,13 @@ import org.apache.qpidity.QpidException;
 import org.apache.qpidity.transport.Range;
 import org.apache.qpidity.transport.RangeSet;
 import org.apache.qpidity.api.Message;
-import org.apache.qpidity.client.ExceptionListener;
-import org.apache.qpidity.client.MessagePartListener;
+import org.apache.qpidity.nclient.ExceptionListener;
+import org.apache.qpidity.nclient.MessagePartListener;
 
 /**
  * Implements a Qpid Sesion. 
  */
-public class ClientSession extends org.apache.qpidity.transport.Session implements  org.apache.qpidity.client.DtxSession
+public class ClientSession extends org.apache.qpidity.transport.Session implements  org.apache.qpidity.nclient.DtxSession
 {
     private Map<String,MessagePartListener> _messageListeners = new HashMap<String,MessagePartListener>();
     private ExceptionListener _exceptionListner;
diff --git a/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSessionDelegate.java b/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSessionDelegate.java
index 1e003b23e6..a19d1016f5 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSessionDelegate.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/impl/ClientSessionDelegate.java
@@ -1,10 +1,10 @@
-package org.apache.qpidity.client.impl;
+package org.apache.qpidity.nclient.impl;
 
 import java.nio.ByteBuffer;
 
 import org.apache.qpidity.ErrorCode;
 
-import org.apache.qpidity.client.MessagePartListener;
+import org.apache.qpidity.nclient.MessagePartListener;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.transport.Data;
@@ -16,7 +16,6 @@ import org.apache.qpidity.transport.Range;
 import org.apache.qpidity.transport.Session;
 import org.apache.qpidity.transport.SessionClosed;
 import org.apache.qpidity.transport.SessionDelegate;
-import org.apache.qpidity.transport.Struct;
 
 
 public class ClientSessionDelegate extends SessionDelegate
diff --git a/java/client/src/main/java/org/apache/qpidity/client/impl/DemoClient.java b/java/client/src/main/java/org/apache/qpidity/client/impl/DemoClient.java
index c15ac8f6e5..9c6ce45e25 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/impl/DemoClient.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/impl/DemoClient.java
@@ -1,13 +1,13 @@
-package org.apache.qpidity.client.impl;
+package org.apache.qpidity.nclient.impl;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.api.Message;
-import org.apache.qpidity.client.Client;
-import org.apache.qpidity.client.Connection;
-import org.apache.qpidity.client.ExceptionListener;
-import org.apache.qpidity.client.Session;
-import org.apache.qpidity.client.util.MessageListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.Client;
+import org.apache.qpidity.nclient.Connection;
+import org.apache.qpidity.nclient.ExceptionListener;
+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.MessageProperties;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/impl/LargeMsgDemoClient.java b/java/client/src/main/java/org/apache/qpidity/client/impl/LargeMsgDemoClient.java
index 4e90a82fff..022edf0dd9 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/impl/LargeMsgDemoClient.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/impl/LargeMsgDemoClient.java
@@ -1,16 +1,16 @@
-package org.apache.qpidity.client.impl;
+package org.apache.qpidity.nclient.impl;
 
 import java.io.FileInputStream;
 
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.api.Message;
-import org.apache.qpidity.client.Client;
-import org.apache.qpidity.client.Connection;
-import org.apache.qpidity.client.ExceptionListener;
-import org.apache.qpidity.client.Session;
-import org.apache.qpidity.client.util.FileMessage;
-import org.apache.qpidity.client.util.MessageListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.Client;
+import org.apache.qpidity.nclient.Connection;
+import org.apache.qpidity.nclient.ExceptionListener;
+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;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/ByteBufferMessage.java b/java/client/src/main/java/org/apache/qpidity/client/util/ByteBufferMessage.java
index bf0889a913..dec5677679 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/ByteBufferMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/ByteBufferMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/FileMessage.java b/java/client/src/main/java/org/apache/qpidity/client/util/FileMessage.java
index 34fc057724..6d925a0ad3 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/FileMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/FileMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import java.io.EOFException;
 import java.io.FileInputStream;
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/MessageListener.java b/java/client/src/main/java/org/apache/qpidity/client/util/MessageListener.java
index bf157c91d7..43c20eb6b5 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/MessageListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/MessageListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import org.apache.qpidity.api.Message;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/MessagePartListenerAdapter.java b/java/client/src/main/java/org/apache/qpidity/client/util/MessagePartListenerAdapter.java
index c40a85863d..885841bc2a 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/MessagePartListenerAdapter.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/MessagePartListenerAdapter.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -6,7 +6,7 @@ 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.client.MessagePartListener;
+import org.apache.qpidity.nclient.MessagePartListener;
 
 /**
  * This is a simple message assembler.
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/ReadOnlyMessage.java b/java/client/src/main/java/org/apache/qpidity/client/util/ReadOnlyMessage.java
index dfb65214d2..8ff5c62a25 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/ReadOnlyMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/ReadOnlyMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/client/util/StreamingMessage.java b/java/client/src/main/java/org/apache/qpidity/client/util/StreamingMessage.java
index 37e726d6c6..2422de3877 100644
--- a/java/client/src/main/java/org/apache/qpidity/client/util/StreamingMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/util/StreamingMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.client.util;
+package org.apache.qpidity.nclient.util;
 
 import java.io.EOFException;
 import java.io.IOException;