svn commit: r1784197 [3/4] - in /qpid/java/trunk: bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/model/port/ broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/ broker-core/...

[kw...@apache.org]

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQuery.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQuery.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQuery.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java Thu Feb 23 19:26:40 2017
@@ -1,6 +1,4 @@
-package org.apache.qpid.server.transport;
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,15 +18,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-import org.apache.qpid.server.transport.network.Frame;
-
 
 public final class QueueQuery extends Method {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQueryResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQueryResult.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/QueueQueryResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java Thu Feb 23 19:26:40 2017
@@ -1,6 +1,4 @@
-package org.apache.qpid.server.transport;
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,14 +18,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class QueueQueryResult extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Range.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Range.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Range.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java Thu Feb 23 19:26:40 2017
@@ -1,5 +1,4 @@
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import static org.apache.qpid.server.util.Serial.gt;
 import static org.apache.qpid.server.util.Serial.le;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSet.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSet.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSet.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java Thu Feb 23 19:26:40 2017
@@ -1,5 +1,4 @@
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import java.util.Iterator;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetFactory.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetFactory.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetFactory.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetFactory.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetFactory.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 public class RangeSetFactory
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetImpl.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetImpl.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RangeSetImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import static org.apache.qpid.server.util.Serial.lt;
 
@@ -43,7 +43,7 @@ public class RangeSetImpl implements Ran
     }
 
 
-    public RangeSetImpl(org.apache.qpid.server.transport.RangeSetImpl copy)
+    public RangeSetImpl(RangeSetImpl copy)
     {
         ranges = new ArrayList<Range>(copy.ranges);
     }
@@ -214,7 +214,7 @@ public class RangeSetImpl implements Ran
 
     public RangeSet copy()
     {
-        return new org.apache.qpid.server.transport.RangeSetImpl(this);
+        return new RangeSetImpl(this);
     }
 
     public String toString()

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RecoverResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RecoverResult.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/RecoverResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class RecoverResult extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ReplyTo.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ReplyTo.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ReplyTo.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class ReplyTo extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SegmentType.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SegmentType.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SegmentType.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SegmentType.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SegmentType.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SegmentType.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SegmentType.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +19,8 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 public enum SegmentType {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttach.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionAttached.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionAttached.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionClosedException.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionClosedException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionClosedException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionClosedException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionClosedException.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 /**
  * SessionClosedException

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandFragment.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class SessionCommandFragment extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCommandPoint.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionCompleted.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionCompleted.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionConfirmed.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionConfirmed.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionDetach.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetach.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionDetachCode.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetachCode.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetachCode.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetachCode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetachCode.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +19,8 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 public enum SessionDetachCode {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDetached.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionException.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionException.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionException.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
+
+import org.apache.qpid.server.transport.TransportException;
 
 /**
  * SessionException

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionExpected.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionFlush.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionFlush.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionGap.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionGap.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionHeader.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionHeader.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class SessionHeader extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionKnownCompleted.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionRequestTimeout.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionRequestTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/SessionTimeout.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/Struct.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Struct.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Struct.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Struct.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java Thu Feb 23 19:26:40 2017
@@ -18,11 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10.transport;
 
-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;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/StructFactory.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/StructFactory.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/StructFactory.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/StructFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/StructFactory.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +19,8 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 class StructFactory {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Track.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Track.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Track.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Track.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Track.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +19,8 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 public enum Track {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxCommit.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/TxRollback.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxRollback.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/TxSelect.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TxSelect.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-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/protocol/v0_10/transport/Type.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Type.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Type.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Type.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Type.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +19,8 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/XaResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class XaResult extends Struct {
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Xid.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10.transport;
+
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.qpid.server.transport.codec.Decoder;
-import org.apache.qpid.server.transport.codec.Encoder;
-
-
 
 public final class Xid extends Struct {
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java Thu Feb 23 19:26:40 2017
@@ -46,7 +46,6 @@ import org.apache.qpid.server.model.port
 import org.apache.qpid.server.plugin.ProtocolEngineCreator;
 import org.apache.qpid.server.security.ManagedPeerCertificateTrustStore;
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.transport.ByteBufferSender;
 import org.apache.qpid.server.transport.network.Ticker;
 
 public class MultiVersionProtocolEngine implements ProtocolEngine

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java Thu Feb 23 19:26:40 2017
@@ -32,8 +32,6 @@ import java.util.concurrent.atomic.Atomi
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.server.transport.TransportException;
-
 public class NetworkConnectionScheduler
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(NetworkConnectionScheduler.class);

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java Thu Feb 23 19:26:40 2017
@@ -43,7 +43,6 @@ import org.apache.qpid.server.bytebuffer
 import org.apache.qpid.server.model.port.AmqpPort;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.transport.ByteBufferSender;
 import org.apache.qpid.server.transport.network.TransportEncryption;
 import org.apache.qpid.server.util.SystemUtils;
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportProvider.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportProvider.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TransportProvider.java Thu Feb 23 19:26:40 2017
@@ -27,6 +27,7 @@ import javax.net.ssl.SSLContext;
 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.server.transport.AcceptingTransport;
 
 public interface TransportProvider
 {

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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 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.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 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.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 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.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.txn;
 
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.transport.Xid;
 
 public class UnknownDtxBranchException extends DtxException
 {

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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -60,7 +60,7 @@ 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.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.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=1784197&r1=1784196&r2=1784197&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 Thu Feb 23 19:26:40 2017
@@ -53,7 +53,7 @@ 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.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.transport.Xid;
 import org.apache.qpid.server.transport.util.Functions;
 
 public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java (from r1784178, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport.codec;
+
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java (from r1784178, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/GenTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 

Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java (from r1784178, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+
+package org.apache.qpid.server.protocol.v0_10.transport;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -340,7 +341,7 @@ public class RangeSetTest extends QpidTe
     private void checkRange(final RangeSet rangeSet, int ... bounds)
     {
         final int length = (bounds == null ? 0 : bounds.length) ;
-        assertEquals("Range count", length/2, rangeSet.size()) ;
+        assertEquals("Range count", length / 2, rangeSet.size()) ;
         final Iterator<Range> iter = rangeSet.iterator() ;
         int count = 0 ;
         while(count < length)

Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Thu Feb 23 19:26:40 2017
@@ -57,7 +57,7 @@ import org.apache.qpid.server.txn.DtxBra
 import org.apache.qpid.server.txn.DtxRegistry;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.server.transport.Xid;
+import org.apache.qpid.server.protocol.v0_10.transport.Xid;
 
 public class SynchronousMessageStoreRecovererTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/src/xsl/qmf.xsl
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/xsl/qmf.xsl?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/xsl/qmf.xsl (original)
+++ qpid/java/trunk/broker-core/src/xsl/qmf.xsl Thu Feb 23 19:26:40 2017
@@ -28,8 +28,8 @@ package org.apache.qpid.qmf.schema;
 import org.apache.qpid.qmf.*;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.transport.codec.BBEncoder;
-import org.apache.qpid.server.transport.codec.BBDecoder;
+import org.apache.qpid.server.protocol.v0_10.transport.BBEncoder;
+import org.apache.qpid.server.protocol.v0_10.transport.BBDecoder;
 
 import java.util.Arrays;
 import java.util.UUID;

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java Thu Feb 23 19:26:40 2017
@@ -51,8 +51,7 @@ import org.apache.qpid.server.util.Actio
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
 import org.apache.qpid.server.transport.ByteBufferSender;
-import org.apache.qpid.server.transport.ConnectionCloseCode;
-import org.apache.qpid.server.transport.Constant;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionCloseCode;
 
 
 public class AMQPConnection_0_10Impl extends AbstractAMQPConnection<AMQPConnection_0_10Impl, ServerConnection>

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java Thu Feb 23 19:26:40 2017
@@ -23,21 +23,21 @@ package org.apache.qpid.server.protocol.
 
 import java.util.Map;
 
-import org.apache.qpid.server.transport.ConnectionClose;
-import org.apache.qpid.server.transport.ConnectionCloseCode;
-import org.apache.qpid.server.transport.ConnectionCloseOk;
-import org.apache.qpid.server.transport.ConnectionHeartbeat;
-import org.apache.qpid.server.transport.ConnectionOpen;
-import org.apache.qpid.server.transport.ConnectionOpenOk;
-import org.apache.qpid.server.transport.ConnectionRedirect;
-import org.apache.qpid.server.transport.ConnectionSecure;
-import org.apache.qpid.server.transport.ConnectionSecureOk;
-import org.apache.qpid.server.transport.ConnectionStart;
-import org.apache.qpid.server.transport.ConnectionStartOk;
-import org.apache.qpid.server.transport.ConnectionTune;
-import org.apache.qpid.server.transport.ConnectionTuneOk;
-import org.apache.qpid.server.transport.Method;
-import org.apache.qpid.server.transport.Option;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionClose;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionCloseCode;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionCloseOk;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionHeartbeat;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionOpen;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionOpenOk;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionRedirect;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionSecure;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionSecureOk;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionStart;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionStartOk;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionTune;
+import org.apache.qpid.server.protocol.v0_10.transport.ConnectionTuneOk;
+import org.apache.qpid.server.protocol.v0_10.transport.Method;
+import org.apache.qpid.server.protocol.v0_10.transport.Option;
 
 public abstract class ConnectionInvoker {
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Constant.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Constant.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Constant.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Constant.java Thu Feb 23 19:26:40 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,10 +19,12 @@ package org.apache.qpid.server.transport
  *
  */
 
+package org.apache.qpid.server.protocol.v0_10;
+
 
 
 
 public interface Constant
 {
-    public static final int MIN_MAX_FRAME_SIZE = 4096;
+    int MIN_MAX_FRAME_SIZE = 4096;
 }

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Thu Feb 23 19:26:40 2017
@@ -48,16 +48,16 @@ import org.apache.qpid.server.txn.Server
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.util.StateChangeListener;
-import org.apache.qpid.server.transport.DeliveryProperties;
-import org.apache.qpid.server.transport.Header;
-import org.apache.qpid.server.transport.MessageAcceptMode;
-import org.apache.qpid.server.transport.MessageAcquireMode;
-import org.apache.qpid.server.transport.MessageCreditUnit;
-import org.apache.qpid.server.transport.MessageFlowMode;
-import org.apache.qpid.server.transport.MessageProperties;
-import org.apache.qpid.server.transport.MessageTransfer;
-import org.apache.qpid.server.transport.Method;
-import org.apache.qpid.server.transport.Option;
+import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Header;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageAcceptMode;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageAcquireMode;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageCreditUnit;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageFlowMode;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageTransfer;
+import org.apache.qpid.server.protocol.v0_10.transport.Method;
+import org.apache.qpid.server.protocol.v0_10.transport.Option;
 import org.apache.qpid.server.util.ByteBufferUtils;
 import org.apache.qpid.server.util.GZIPUtils;
 

Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FrameSizeObserver.java (from r1784178, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/FrameSizeObserver.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FrameSizeObserver.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FrameSizeObserver.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/FrameSizeObserver.java&r1=1784178&r2=1784197&rev=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/FrameSizeObserver.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FrameSizeObserver.java Thu Feb 23 19:26:40 2017
@@ -18,7 +18,8 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+
+package org.apache.qpid.server.protocol.v0_10;
 
 public interface FrameSizeObserver
 {

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java Thu Feb 23 19:26:40 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.
 
 import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.MessageInstanceConsumer;
-import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.protocol.v0_10.transport.Method;
 
 public class MessageAcceptCompletionListener implements Method.CompletionListener
 {

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java Thu Feb 23 19:26:40 2017
@@ -30,10 +30,10 @@ import org.apache.qpid.server.model.Name
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.plugin.PluggableService;
 import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.transport.DeliveryProperties;
-import org.apache.qpid.server.transport.Header;
-import org.apache.qpid.server.transport.MessageDeliveryPriority;
-import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Header;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
 
 @PluggableService
 public class MessageConverter_Internal_to_v0_10 implements MessageConverter<InternalMessage, MessageTransferMessage>

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java Thu Feb 23 19:26:40 2017
@@ -37,11 +37,11 @@ import org.apache.qpid.server.plugin.Mes
 import org.apache.qpid.server.plugin.PluggableService;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.transport.DeliveryProperties;
-import org.apache.qpid.server.transport.Header;
-import org.apache.qpid.server.transport.MessageDeliveryPriority;
-import org.apache.qpid.server.transport.MessageProperties;
-import org.apache.qpid.server.transport.codec.BBEncoder;
+import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Header;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.BBEncoder;
 
 @PluggableService
 public class MessageConverter_v0_10 implements MessageConverter<ServerMessage, MessageTransferMessage>

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java Thu Feb 23 19:26:40 2017
@@ -36,9 +36,9 @@ import org.apache.qpid.server.model.Name
 import org.apache.qpid.server.plugin.MessageConverter;
 import org.apache.qpid.server.plugin.PluggableService;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.transport.MessageProperties;
-import org.apache.qpid.server.transport.ReplyTo;
-import org.apache.qpid.server.transport.codec.BBDecoder;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
+import org.apache.qpid.server.protocol.v0_10.transport.BBDecoder;
 import org.apache.qpid.server.typedmessage.TypedBytesContentReader;
 import org.apache.qpid.server.typedmessage.TypedBytesFormatException;
 import org.apache.qpid.server.util.GZIPUtils;

Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java?rev=1784197&r1=1784196&r2=1784197&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java Thu Feb 23 19:26:40 2017
@@ -30,10 +30,10 @@ import org.apache.qpid.server.store.Mess
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-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.Struct;
+import org.apache.qpid.server.protocol.v0_10.transport.DeliveryProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Header;
+import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
+import org.apache.qpid.server.protocol.v0_10.transport.Struct;
 
 public class MessageFormat_0_10 implements MessageFormat<MessageTransferMessage>
 {



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