You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/07 18:38:24 UTC

svn commit: r1782048 [8/12] - in /qpid: java/trunk/ java/trunk/bdbstore/ java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ java/trunk/bdbstore/src...

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLSender.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLSender.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLSender.java Tue Feb  7 18:38:14 2017
@@ -17,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.security.ssl;
+package org.apache.qpid.server.transport.network.security.ssl;
 
 import java.util.Collections;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -32,10 +32,10 @@ import javax.net.ssl.SSLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.SenderException;
-import org.apache.qpid.transport.network.security.SSLStatus;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.SenderException;
+import org.apache.qpid.server.transport.network.security.SSLStatus;
 
 public class SSLSender implements ByteBufferSender
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.security.ssl;
+package org.apache.qpid.server.transport.network.security.ssl;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -67,8 +67,8 @@ import javax.net.ssl.SSLSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.util.Strings;
 
 public class SSLUtil
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Functions.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Functions.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Functions.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Functions.java Tue Feb  7 18:38:14 2017
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.util;
+package org.apache.qpid.server.transport.util;
 
 import static java.lang.Math.min;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.util.ByteBufferUtils;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.util.ByteBufferUtils;
 
 
 /**

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Waiter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Waiter.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Waiter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/util/Waiter.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.util;
+package org.apache.qpid.server.transport.util;
 
 
 /**

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class AlreadyKnownDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Tue Feb  7 18:38:14 2017
@@ -29,7 +29,7 @@ import org.apache.qpid.server.queue.Base
 import org.apache.qpid.server.session.AMQPSession;
 import org.apache.qpid.server.store.MessageEnqueueRecord;
 import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class DistributedTransaction implements ServerTransaction
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Tue Feb  7 18:38:14 2017
@@ -37,7 +37,7 @@ import org.apache.qpid.server.store.Stor
 import org.apache.qpid.server.store.Transaction;
 import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class DtxBranch
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java Tue Feb  7 18:38:14 2017
@@ -31,7 +31,7 @@ import org.apache.qpid.server.session.AM
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class DtxRegistry
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class IncorrectDtxStateException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class JoinAndResumeDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class NotAssociatedDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class RollbackOnlyDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class SuspendAndFailDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class TimeoutDtxException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
 
 public class UnknownDtxBranchException extends DtxException
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesCodes.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesCodes.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesCodes.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesCodes.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.typedmessage;
+package org.apache.qpid.server.typedmessage;
 
 public interface TypedBytesCodes
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentReader.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentReader.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentReader.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentReader.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.typedmessage;
+package org.apache.qpid.server.typedmessage;
 
 
 import java.io.EOFException;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentWriter.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentWriter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentWriter.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.typedmessage;
+package org.apache.qpid.server.typedmessage;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -29,7 +29,7 @@ import java.nio.charset.CharacterCodingE
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 
-public class TypedBytesContentWriter implements TypedBytesCodes
+public class TypedBytesContentWriter implements org.apache.qpid.server.typedmessage.TypedBytesCodes
 {
     private final        ByteArrayOutputStream _baos = new ByteArrayOutputStream();
     private final        DataOutputStream      _data = new DataOutputStream(_baos);

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesFormatException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesFormatException.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesFormatException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesFormatException.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.typedmessage;
+package org.apache.qpid.server.typedmessage;
 
 public class TypedBytesFormatException extends Exception
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.url;
+package org.apache.qpid.server.url;
 
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 
 public class AMQBindingURL implements BindingURL
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURL.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURL.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURL.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURL.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.url;
+package org.apache.qpid.server.url;
 
 import java.util.Arrays;
 import java.util.Collections;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURLParser.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURLParser.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/BindingURLParser.java Tue Feb  7 18:38:14 2017
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.url;
+package org.apache.qpid.server.url;
 
 
 import org.slf4j.Logger;
@@ -32,6 +32,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.qpid.server.url.AMQBindingURL;
+
 public class BindingURLParser
 {
     private static final char PROPERTY_EQUALS_CHAR = '=';

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLHelper.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLHelper.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLHelper.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.url;
+package org.apache.qpid.server.url;
 
 import java.util.Map;
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.url;
+package org.apache.qpid.server.url;
 
 import java.net.URISyntaxException;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferUtils.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferUtils.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferUtils.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferUtils.java Tue Feb  7 18:38:14 2017
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 public class ByteBufferUtils
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CipherSuiteAndProtocolRestrictingSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CipherSuiteAndProtocolRestrictingSSLSocketFactory.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CipherSuiteAndProtocolRestrictingSSLSocketFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CipherSuiteAndProtocolRestrictingSSLSocketFactory.java Tue Feb  7 18:38:14 2017
@@ -31,7 +31,7 @@ import java.util.List;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 
 public class CipherSuiteAndProtocolRestrictingSSLSocketFactory extends SSLSocketFactory
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CommandLineParser.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/CommandLineParser.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CommandLineParser.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CommandLineParser.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/CommandLineParser.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/CommandLineParser.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/CommandLineParser.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionBuilder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionBuilder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionBuilder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionBuilder.java Tue Feb  7 18:38:14 2017
@@ -38,8 +38,8 @@ import javax.net.ssl.TrustManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 
 public class ConnectionBuilder
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/DataUrlUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/DataUrlUtils.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/DataUrlUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java Tue Feb  7 18:38:14 2017
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import javax.xml.bind.DatatypeConverter;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/FileUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/FileUtils.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/FileUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/GZIPUtils.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/GZIPUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/GZIPUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/GZIPUtils.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/GZIPUtils.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/GZIPUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/GZIPUtils.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java Tue Feb  7 18:38:14 2017
@@ -31,7 +31,7 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.pool.SuppressingInheritedAccessControlContextThreadFactory;
+import org.apache.qpid.server.pool.SuppressingInheritedAccessControlContextThreadFactory;
 
 public class HousekeepingExecutor extends ScheduledThreadPoolExecutor
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/NameUUIDGen.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/NameUUIDGen.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/NameUUIDGen.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/NameUUIDGen.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.nio.ByteBuffer;
 import java.util.UUID;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/RandomUUIDGen.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/RandomUUIDGen.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/RandomUUIDGen.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/RandomUUIDGen.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.util.UUID;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Serial.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Serial.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Serial.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Serial.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Serial.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Serial.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Serial.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 
 import java.util.Comparator;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Strings.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Strings.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/Strings.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/SystemUtils.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/SystemUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/SystemUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/SystemUtils.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/SystemUtils.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/SystemUtils.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/SystemUtils.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDGen.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDGen.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDGen.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDGen.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDGen.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDGen.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDGen.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 
 import java.util.UUID;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDs.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDs.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDs.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDs.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDs.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/util/UUIDs.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/UUIDs.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
 
 
 /**

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java Tue Feb  7 18:38:14 2017
@@ -31,7 +31,7 @@ import java.net.URLDecoder;
 import java.net.URLStreamHandler;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
 
 public class Handler extends URLStreamHandler
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Tue Feb  7 18:38:14 2017
@@ -73,8 +73,8 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.pool.SuppressingInheritedAccessControlContextThreadFactory;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+import org.apache.qpid.server.pool.SuppressingInheritedAccessControlContextThreadFactory;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.updater.Task;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -142,7 +142,7 @@ import org.apache.qpid.server.util.Actio
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.util.HousekeepingExecutor;
 import org.apache.qpid.server.util.MapValueConverter;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
 
 public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> extends AbstractConfiguredObject<X>
         implements QueueManagingVirtualHost<X>

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java Tue Feb  7 18:38:14 2017
@@ -60,8 +60,8 @@ import org.apache.qpid.server.txn.DtxReg
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.Xid;
-import org.apache.qpid.transport.util.Functions;
+import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.transport.util.Functions;
 
 public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java Tue Feb  7 18:38:14 2017
@@ -53,8 +53,8 @@ import org.apache.qpid.server.txn.DtxReg
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.Xid;
-import org.apache.qpid.transport.util.Functions;
+import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.transport.util.Functions;
 
 public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Tue Feb  7 18:38:14 2017
@@ -45,7 +45,7 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/QpidExceptionTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/QpidExceptionTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/QpidExceptionTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java Tue Feb  7 18:38:14 2017
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpid;
+package org.apache.qpid.server;
 
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.protocol.ErrorCodes;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SelectorParserTest.java Tue Feb  7 18:38:14 2017
@@ -21,8 +21,8 @@
 
 package org.apache.qpid.server;
 
-import org.apache.qpid.filter.SelectorParsingException;
-import org.apache.qpid.filter.selector.ParseException;
+import org.apache.qpid.server.filter.SelectorParsingException;
+import org.apache.qpid.server.filter.selector.ParseException;
 import org.apache.qpid.server.filter.JMSSelectorFilter;
 import org.apache.qpid.test.utils.QpidTestCase;
 

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SystemLauncherTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SystemLauncherTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SystemLauncherTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/SystemLauncherTest.java Tue Feb  7 18:38:14 2017
@@ -36,7 +36,7 @@ import org.apache.qpid.server.model.Json
 import org.apache.qpid.server.model.SystemConfig;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class SystemLauncherTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStreamTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStreamTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStreamTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStreamTest.java Tue Feb  7 18:38:14 2017
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.util.Collection;
 import java.util.Iterator;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferTest.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,7 +39,7 @@ import org.junit.Assert;
 import org.mockito.internal.util.Primitives;
 
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.ByteBufferUtils;
+import org.apache.qpid.server.util.ByteBufferUtils;
 
 public class QpidByteBufferTest extends QpidTestCase
 {
@@ -54,6 +54,7 @@ public class QpidByteBufferTest extends
     protected void setUp() throws Exception
     {
         super.setUp();
+        QpidByteBuffer.deinitialisePool();
         QpidByteBuffer.initialisePool(BUFFER_SIZE, POOL_SIZE);
         _parent = QpidByteBuffer.allocateDirect(BUFFER_SIZE);
     }
@@ -67,6 +68,7 @@ public class QpidByteBufferTest extends
         {
             _slicedBuffer.dispose();
         }
+        QpidByteBuffer.deinitialisePool();
     }
 
     public void testPutGetByIndex() throws Exception

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/codec/AMQDecoderTest.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.codec;
+package org.apache.qpid.server.codec;
 
 
 import java.io.IOException;
@@ -29,22 +29,22 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQBody;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQProtocolVersionException;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FrameCreatingMethodProcessor;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQBody;
+import org.apache.qpid.server.framing.AMQDataBlock;
+import org.apache.qpid.server.framing.AMQFrame;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.framing.AMQProtocolVersionException;
+import org.apache.qpid.server.framing.BasicContentHeaderProperties;
+import org.apache.qpid.server.framing.ContentBody;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.framing.FrameCreatingMethodProcessor;
+import org.apache.qpid.server.framing.HeartbeatBody;
+import org.apache.qpid.server.framing.ProtocolVersion;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.util.ByteBufferUtils;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.util.ByteBufferUtils;
 
 public class AMQDecoderTest extends QpidTestCase
 {

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/QpidPropertyTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/QpidPropertyTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/QpidPropertyTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/QpidPropertyTest.java Tue Feb  7 18:38:14 2017
@@ -15,8 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
+import org.apache.qpid.server.configuration.QpidProperty;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class QpidPropertyTest extends QpidTestCase

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java Tue Feb  7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.exchange;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Tue Feb  7 18:38:14 2017
@@ -39,7 +39,7 @@ import java.util.UUID;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java Tue Feb  7 18:38:14 2017
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Tue Feb  7 18:38:14 2017
@@ -39,7 +39,7 @@ import java.util.UUID;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
-import static org.apache.qpid.common.AMQPFilterTypes.JMS_SELECTOR;
+import static org.apache.qpid.server.common.AMQPFilterTypes.JMS_SELECTOR;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -34,7 +34,7 @@ import java.util.Map;
 
 import org.junit.Assert;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.InstanceProperties;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/AMQShortStringTest.java Tue Feb  7 18:38:14 2017
@@ -18,8 +18,9 @@
  *
  */
 
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
 
+import org.apache.qpid.server.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.io.UnsupportedEncodingException;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/BasicContentHeaderPropertiesTest.java Tue Feb  7 18:38:14 2017
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/EncodingUtilsTest.java Tue Feb  7 18:38:14 2017
@@ -18,9 +18,10 @@
  *
  */
 
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.EncodingUtils;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 
@@ -35,6 +36,7 @@ public class EncodingUtilsTest extends Q
     protected void setUp() throws Exception
     {
         super.setUp();
+        QpidByteBuffer.deinitialisePool();
         QpidByteBuffer.initialisePool(BUFFER_SIZE, POOL_SIZE);
         _buffer = QpidByteBuffer.allocateDirect(BUFFER_SIZE);
     }
@@ -45,6 +47,7 @@ public class EncodingUtilsTest extends Q
         try
         {
             _buffer.dispose();
+            QpidByteBuffer.deinitialisePool();
         }
         finally
         {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/FieldTableTest.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,11 +26,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.junit.Assert;
 
-import org.apache.qpid.AMQPInvalidClassException;
+import org.apache.qpid.server.AMQPInvalidClassException;
 
 public class FieldTableTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/framing/abstraction/MessagePublishInfoImplTest.java Tue Feb  7 18:38:14 2017
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.framing.abstraction;
+package org.apache.qpid.server.framing.abstraction;
 
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.MessagePublishInfo;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class MessagePublishInfoImplTest extends QpidTestCase

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Tue Feb  7 18:38:14 2017
@@ -48,7 +48,7 @@ import org.mockito.ArgumentMatcher;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.pool;
+package org.apache.qpid.server.pool;
 
 
 import javax.security.auth.Subject;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Tue Feb  7 18:38:14 2017
@@ -46,7 +46,7 @@ import org.mockito.stubbing.Answer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.consumer.ConsumerOption;
 import org.apache.qpid.server.consumer.TestConsumerTarget;
 import org.apache.qpid.server.exchange.DirectExchange;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java Tue Feb  7 18:38:14 2017
@@ -42,8 +42,8 @@ import org.apache.qpid.server.model.Mode
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestSSLConstants;
-import org.apache.qpid.util.DataUrlUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.DataUrlUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class FileKeyStoreTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java Tue Feb  7 18:38:14 2017
@@ -45,9 +45,9 @@ import org.apache.qpid.server.model.Trus
 import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestSSLConstants;
-import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.apache.qpid.util.DataUrlUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
+import org.apache.qpid.server.util.DataUrlUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class FileTrustStoreTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java Tue Feb  7 18:38:14 2017
@@ -35,7 +35,7 @@ import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.consumer.ConsumerOption;
 import org.apache.qpid.server.consumer.ConsumerTarget;
 import org.apache.qpid.server.message.MessageInstanceConsumer;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java Tue Feb  7 18:38:14 2017
@@ -38,8 +38,8 @@ import org.eclipse.jetty.server.handler.
 import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 
 class OAuth2MockEndpointHolder
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java Tue Feb  7 18:38:14 2017
@@ -50,7 +50,7 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.auth.manager.ScramSHA256AuthenticationManager;
 import org.apache.qpid.server.security.auth.sasl.PasswordSource;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
 
 public class ScramNegotiatorTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/SSLContextFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/SSLContextFactoryTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/SSLContextFactoryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/SSLContextFactoryTest.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.ssl;
+package org.apache.qpid.server.ssl;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestSSLConstants;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java Tue Feb  7 18:38:14 2017
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.apache.qpid.ssl;
+package org.apache.qpid.server.ssl;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -32,9 +32,9 @@ import javax.net.ssl.X509TrustManager;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestSSLConstants;
-import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.apache.qpid.transport.network.security.ssl.QpidPeersOnlyTrustManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.QpidPeersOnlyTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 
 public class TrustManagerTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Tue Feb  7 18:38:14 2017
@@ -40,7 +40,7 @@ import org.mockito.ArgumentMatcher;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;
@@ -59,7 +59,7 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
 import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java Tue Feb  7 18:38:14 2017
@@ -48,7 +48,7 @@ import org.apache.qpid.server.util.Serve
 import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class JsonFileConfigStoreTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java Tue Feb  7 18:38:14 2017
@@ -28,12 +28,12 @@ import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase implements EventListener, TransactionLogResource
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.store;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.plugin.MessageMetaDataType;
 
 public class TestMessageMetaData implements StorableMessageMetaData

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.store;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.plugin.MessageMetaDataType;
 
 public class TestMessageMetaDataFactory implements MessageMetaDataType.Factory<TestMessageMetaData>

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java Tue Feb  7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.store;
 
 import java.util.Collection;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java Tue Feb  7 18:38:14 2017
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.databind.Ob
 import org.apache.qpid.server.model.BrokerModel;
 import org.apache.qpid.server.model.SystemConfig;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class JsonFilePreferenceStoreTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/streams/CompositeInputStreamTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/streams/CompositeInputStreamTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/streams/CompositeInputStreamTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/streams/CompositeInputStreamTest.java Tue Feb  7 18:38:14 2017
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.streams;
+package org.apache.qpid.server.streams;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.mockito.Mockito.mock;

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/thread/ThreadFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/thread/ThreadFactoryTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/thread/ThreadFactoryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/thread/ThreadFactoryTest.java Tue Feb  7 18:38:14 2017
@@ -19,7 +19,7 @@
  * 
  */
 
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -34,7 +34,7 @@ public class ThreadFactoryTest extends Q
         try
         {
             threadFactoryClass = Class.forName(System.getProperty("qpid.thread_factory",
-                    "org.apache.qpid.thread.DefaultThreadFactory")).asSubclass(ThreadFactory.class);
+                    "org.apache.qpid.server.thread.DefaultThreadFactory")).asSubclass(ThreadFactory.class);
         }
         // If the thread factory class was wrong it will flagged way before it gets here.
         catch(Exception e)

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionSettingsTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionSettingsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionSettingsTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionSettingsTest.java Tue Feb  7 18:38:14 2017
@@ -18,12 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 
-import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.server.configuration.ClientProperties;
+import org.apache.qpid.server.transport.ConnectionSettings;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class ConnectionSettingsTest extends QpidTestCase

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/ConnectionTest.java Tue Feb  7 18:38:14 2017
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 
-import static org.apache.qpid.transport.Option.EXPECTED;
-import static org.apache.qpid.transport.Option.NONE;
-import static org.apache.qpid.transport.Option.SYNC;
+import static org.apache.qpid.server.transport.Option.EXPECTED;
+import static org.apache.qpid.server.transport.Option.NONE;
+import static org.apache.qpid.server.transport.Option.SYNC;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,9 +35,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.network.ConnectionBinding;
-import org.apache.qpid.transport.network.io.IoAcceptor;
-import org.apache.qpid.transport.util.Waiter;
+import org.apache.qpid.server.transport.network.ConnectionBinding;
+import org.apache.qpid.server.transport.network.io.IoAcceptor;
+import org.apache.qpid.server.transport.util.Waiter;
 
 /**
  * ConnectionTest

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/GenTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org