svn commit: r1782048 [7/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...

[kw...@apache.org]

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java Tue Feb  7 18:38:14 2017
@@ -18,27 +18,27 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 
 
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.transport.network.Frame;
-import org.apache.qpid.transport.util.Waiter;
-import static org.apache.qpid.transport.Option.COMPLETED;
-import static org.apache.qpid.transport.Option.SYNC;
-import static org.apache.qpid.transport.Option.TIMELY_REPLY;
-import static org.apache.qpid.transport.Session.State.CLOSED;
-import static org.apache.qpid.transport.Session.State.CLOSING;
-import static org.apache.qpid.transport.Session.State.DETACHED;
-import static org.apache.qpid.transport.Session.State.NEW;
-import static org.apache.qpid.transport.Session.State.OPEN;
-import static org.apache.qpid.transport.Session.State.RESUMING;
-import static org.apache.qpid.util.Serial.ge;
-import static org.apache.qpid.util.Serial.gt;
-import static org.apache.qpid.util.Serial.le;
-import static org.apache.qpid.util.Serial.lt;
-import static org.apache.qpid.util.Serial.max;
-import static org.apache.qpid.util.Strings.toUTF8;
+import org.apache.qpid.server.configuration.ClientProperties;
+import org.apache.qpid.server.transport.network.Frame;
+import org.apache.qpid.server.transport.util.Waiter;
+import static org.apache.qpid.server.transport.Option.COMPLETED;
+import static org.apache.qpid.server.transport.Option.SYNC;
+import static org.apache.qpid.server.transport.Option.TIMELY_REPLY;
+import static org.apache.qpid.server.transport.Session.State.CLOSED;
+import static org.apache.qpid.server.transport.Session.State.CLOSING;
+import static org.apache.qpid.server.transport.Session.State.DETACHED;
+import static org.apache.qpid.server.transport.Session.State.NEW;
+import static org.apache.qpid.server.transport.Session.State.OPEN;
+import static org.apache.qpid.server.transport.Session.State.RESUMING;
+import static org.apache.qpid.server.util.Serial.ge;
+import static org.apache.qpid.server.util.Serial.gt;
+import static org.apache.qpid.server.util.Serial.le;
+import static org.apache.qpid.server.util.Serial.lt;
+import static org.apache.qpid.server.util.Serial.max;
+import static org.apache.qpid.server.util.Strings.toUTF8;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttach.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttach.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttach.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionAttach extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttached.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttached.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionAttached.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionAttached extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.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;
 
 /**
  * SessionClosedException

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
 
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionCommandPoint extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionCompleted.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionCompleted extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionConfirmed extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.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.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetach.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetach.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetach.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionDetach extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetached.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetached.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionDetached.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionDetached extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.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;
 
 /**
  * SessionException

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionExpected.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionExpected.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionExpected.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionExpected extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionFlush.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionFlush.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionFlush.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionFlush extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionGap.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionGap.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionGap.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionGap extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionHeader.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionHeader.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionHeader.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
 
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionInvoker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionKnownCompleted extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionListener.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionListener.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.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;
 
 
 /**

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionRequestTimeout extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/SessionTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class SessionTimeout extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StreamReturnCode.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StreamReturnCode.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StreamReturnCode.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StreamReturnCode.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

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

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StructFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StructFactory.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/StructFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java Tue Feb  7 18:38:14 2017
@@ -27,7 +27,7 @@ import org.apache.qpid.server.model.Brok
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.transport.network.TransportEncryption;
+import org.apache.qpid.server.transport.network.TransportEncryption;
 
 class TCPandSSLTransport implements AcceptingTransport
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Track.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Track.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Track.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransactionTimeoutTicker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransactionTimeoutTicker.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransactionTimeoutTicker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransactionTimeoutTicker.java Tue Feb  7 18:38:14 2017
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.Atomi
 import com.google.common.base.Supplier;
 
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
 
 public class TransactionTimeoutTicker implements Ticker, SchedulingDelayNotificationListener
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TransportException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TransportException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TransportException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportException.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;
 
 
 /**

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxCommit.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxCommit.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxCommit.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class TxCommit extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxRollback.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxRollback.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxRollback.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class TxRollback extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxSelect.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxSelect.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/TxSelect.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
 
 
 public final class TxSelect extends Method {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Type.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Type.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Type.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/XaResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/XaResult.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/XaResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
 
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Xid.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Xid.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Xid.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java Tue Feb  7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
 
 
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractDecoder.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractDecoder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractDecoder.java Tue Feb  7 18:38:14 2017
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.codec;
+package org.apache.qpid.server.transport.codec;
 
-import org.apache.qpid.transport.Binary;
-import org.apache.qpid.transport.Range;
-import org.apache.qpid.transport.RangeSet;
-import org.apache.qpid.transport.RangeSetFactory;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.Type;
+import org.apache.qpid.server.transport.Binary;
+import org.apache.qpid.server.transport.Range;
+import org.apache.qpid.server.transport.RangeSet;
+import org.apache.qpid.server.transport.RangeSetFactory;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.Type;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractEncoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractEncoder.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractEncoder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/codec/AbstractEncoder.java Tue Feb  7 18:38:14 2017
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.codec;
+package org.apache.qpid.server.transport.codec;
 
-import static org.apache.qpid.transport.util.Functions.lsb;
+import static org.apache.qpid.server.transport.util.Functions.lsb;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -30,11 +30,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpid.transport.Range;
-import org.apache.qpid.transport.RangeSet;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.Type;
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Range;
+import org.apache.qpid.server.transport.RangeSet;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.Type;
+import org.apache.qpid.server.transport.Xid;
 
 
 /**

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

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

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

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

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

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Assembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Assembler.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Assembler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Assembler.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.transport.network;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -27,18 +27,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.NetworkEventReceiver;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolEvent;
-import org.apache.qpid.transport.ProtocolEventReceiver;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.codec.BBDecoder;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.NetworkEventReceiver;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ProtocolEventReceiver;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.codec.BBDecoder;
 
 /**
  * Assembler

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Disassembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Disassembler.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Disassembler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/Disassembler.java Tue Feb  7 18:38:14 2017
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.transport.network;
 
 import static java.lang.Math.min;
-import static org.apache.qpid.transport.network.Frame.FIRST_FRAME;
-import static org.apache.qpid.transport.network.Frame.FIRST_SEG;
-import static org.apache.qpid.transport.network.Frame.HEADER_SIZE;
-import static org.apache.qpid.transport.network.Frame.LAST_FRAME;
-import static org.apache.qpid.transport.network.Frame.LAST_SEG;
+import static org.apache.qpid.server.transport.network.Frame.FIRST_FRAME;
+import static org.apache.qpid.server.transport.network.Frame.FIRST_SEG;
+import static org.apache.qpid.server.transport.network.Frame.HEADER_SIZE;
+import static org.apache.qpid.server.transport.network.Frame.LAST_FRAME;
+import static org.apache.qpid.server.transport.network.Frame.LAST_SEG;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -35,19 +35,19 @@ import java.util.Collections;
 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.FrameSizeObserver;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.ProtocolDelegate;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolEvent;
-import org.apache.qpid.transport.ProtocolEventSender;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.SegmentType;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.codec.BBEncoder;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.FrameSizeObserver;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.ProtocolDelegate;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ProtocolEventSender;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.SegmentType;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.codec.BBEncoder;
 
 /**
  * Disassembler

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

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/InputHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/InputHandler.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/InputHandler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/InputHandler.java Tue Feb  7 18:38:14 2017
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.transport.network;
 
-import static org.apache.qpid.transport.network.InputHandler.State.ERROR;
-import static org.apache.qpid.transport.network.InputHandler.State.FRAME_BODY;
-import static org.apache.qpid.transport.network.InputHandler.State.FRAME_HDR;
-import static org.apache.qpid.transport.network.InputHandler.State.PROTO_HDR;
-import static org.apache.qpid.transport.util.Functions.str;
+import static org.apache.qpid.server.transport.network.InputHandler.State.ERROR;
+import static org.apache.qpid.server.transport.network.InputHandler.State.FRAME_BODY;
+import static org.apache.qpid.server.transport.network.InputHandler.State.FRAME_HDR;
+import static org.apache.qpid.server.transport.network.InputHandler.State.PROTO_HDR;
+import static org.apache.qpid.server.transport.util.Functions.str;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -32,13 +32,13 @@ import java.nio.ByteOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.Constant;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.FrameSizeObserver;
-import org.apache.qpid.transport.NetworkEventReceiver;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.server.transport.Constant;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.FrameSizeObserver;
+import org.apache.qpid.server.transport.NetworkEventReceiver;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.SegmentType;
 
 
 /**

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/NetworkConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/NetworkConnection.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/NetworkConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/NetworkConnection.java Tue Feb  7 18:38:14 2017
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.transport.network;
 
 import java.net.SocketAddress;
 import java.security.Principal;
 import java.security.cert.Certificate;
 
-import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.ByteBufferSender;
 
 public interface NetworkConnection
 {

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

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

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

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

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

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTicker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTicker.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTicker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTicker.java Tue Feb  7 18:38:14 2017
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
 
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.Ticker;
-import org.apache.qpid.transport.network.TransportActivity;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.TransportActivity;
 
 public class IdleTimeoutTicker implements Ticker
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkConnection.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkConnection.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
 
 import java.net.Socket;
 import java.net.SocketAddress;
@@ -31,10 +31,10 @@ import javax.net.ssl.SSLSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.Ticker;
 
 public class IoNetworkConnection implements NetworkConnection
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkTransport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkTransport.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkTransport.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoNetworkTransport.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -29,12 +29,12 @@ import java.util.concurrent.ConcurrentHa
 
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.transport.ConnectionSettings;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.TransportActivity;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.transport.ConnectionSettings;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.TransportActivity;
 
 public class IoNetworkTransport
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoReceiver.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoReceiver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoReceiver.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,11 +33,11 @@ import javax.net.ssl.SSLSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.thread.Threading;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.Ticker;
-import org.apache.qpid.util.SystemUtils;
+import org.apache.qpid.server.thread.Threading;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.transport.network.Ticker;
+import org.apache.qpid.server.util.SystemUtils;
 
 /**
  * IoReceiver

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoSender.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoSender.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/io/IoSender.java Tue Feb  7 18:38:14 2017
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
 
-import static org.apache.qpid.transport.util.Functions.mod;
+import static org.apache.qpid.server.transport.util.Functions.mod;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -30,13 +30,13 @@ import javax.net.ssl.SSLSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.thread.Threading;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.SenderClosedException;
-import org.apache.qpid.transport.SenderException;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.util.SystemUtils;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.thread.Threading;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.SenderClosedException;
+import org.apache.qpid.server.transport.SenderException;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.util.SystemUtils;
 
 
 public final class IoSender implements Runnable, ByteBufferSender

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

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

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/SecurityLayerFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/SecurityLayerFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/SecurityLayerFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/SecurityLayerFactory.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network.security;
+package org.apache.qpid.server.transport.network.security;
 
 import java.util.List;
 import java.util.Properties;
@@ -29,18 +29,18 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
 
-import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.ssl.SSLContextFactory;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.ConnectionSettings;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.security.sasl.SASLReceiver;
-import org.apache.qpid.transport.network.security.sasl.SASLSender;
-import org.apache.qpid.transport.network.security.ssl.SSLReceiver;
-import org.apache.qpid.transport.network.security.ssl.SSLSender;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.ssl.SSLContextFactory;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.ConnectionSettings;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.transport.network.security.sasl.SASLReceiver;
+import org.apache.qpid.server.transport.network.security.sasl.SASLSender;
+import org.apache.qpid.server.transport.network.security.ssl.SSLReceiver;
+import org.apache.qpid.server.transport.network.security.ssl.SSLSender;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.util.Strings;
 
 public class SecurityLayerFactory
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLEncryptor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLEncryptor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLEncryptor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLEncryptor.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.transport.network.security.sasl;
+package org.apache.qpid.server.transport.network.security.sasl;
 
 
 import java.util.List;
@@ -26,9 +26,9 @@ import java.util.List;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
 
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.ConnectionException;
-import org.apache.qpid.transport.ConnectionListener;
+import org.apache.qpid.server.transport.Connection;
+import org.apache.qpid.server.transport.ConnectionException;
+import org.apache.qpid.server.transport.ConnectionListener;
 
 public abstract class SASLEncryptor implements ConnectionListener
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLReceiver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLReceiver.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLReceiver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLReceiver.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.transport.network.security.sasl;
+package org.apache.qpid.server.transport.network.security.sasl;
 
 
 import java.nio.ByteBuffer;
@@ -28,8 +28,8 @@ import javax.security.sasl.SaslException
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.SenderException;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.SenderException;
 
 public class SASLReceiver extends SASLEncryptor implements ExceptionHandlingByteBufferReceiver
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLSender.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLSender.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/sasl/SASLSender.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.transport.network.security.sasl;
+package org.apache.qpid.server.transport.network.security.sasl;
 
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,9 +28,9 @@ import javax.security.sasl.SaslException
 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.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.SenderException;
 
 public class SASLSender extends SASLEncryptor implements ByteBufferSender
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidClientX509KeyManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidClientX509KeyManager.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/QpidClientX509KeyManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidClientX509KeyManager.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 javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLEngine;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidMultipleTrustManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidMultipleTrustManager.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/QpidMultipleTrustManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidMultipleTrustManager.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.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidPeersOnlyTrustManager.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/QpidPeersOnlyTrustManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidPeersOnlyTrustManager.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.security.KeyStore;
 import java.security.KeyStoreException;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLReceiver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLReceiver.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/SSLReceiver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLReceiver.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.nio.ByteBuffer;
 
@@ -31,9 +31,9 @@ import javax.net.ssl.SSLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.TransportException;
-import org.apache.qpid.transport.network.security.SSLStatus;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.TransportException;
+import org.apache.qpid.server.transport.network.security.SSLStatus;
 
 public class SSLReceiver implements ExceptionHandlingByteBufferReceiver
 {



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