Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java Fri Apr 15 10:10:16 2016 @@ -21,10 +21,7 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; - - -import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; +package org.apache.qpid.server.protocol.v1_0.type.transport; import java.util.Arrays; @@ -34,7 +31,8 @@ import java.util.Map; import java.nio.ByteBuffer; -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.ConnectionHandler; +import org.apache.qpid.server.protocol.v1_0.type.*; public class Open implements FrameBody @@ -263,7 +261,7 @@ public class Open return builder.toString(); } - public void invoke(short channel, ConnectionEndpoint conn) + public void invoke(short channel, ConnectionHandler conn) { conn.receiveOpen(channel, this); }
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java Fri Apr 15 10:10:16 2016 @@ -21,11 +21,11 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; +package org.apache.qpid.server.protocol.v1_0.type.transport; -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.*; public class ReceiverSettleMode implements RestrictedType<UnsignedByte> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java Fri Apr 15 10:10:16 2016 @@ -21,11 +21,11 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; +package org.apache.qpid.server.protocol.v1_0.type.transport; -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.*; public class Role implements RestrictedType<Boolean> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java Fri Apr 15 10:10:16 2016 @@ -21,11 +21,11 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; +package org.apache.qpid.server.protocol.v1_0.type.transport; -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.*; public class SenderSettleMode implements RestrictedType<UnsignedByte> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java Fri Apr 15 10:10:16 2016 @@ -21,11 +21,11 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; +package org.apache.qpid.server.protocol.v1_0.type.transport; -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.*; public class SessionError implements ErrorCondition, RestrictedType<Symbol> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java Fri Apr 15 10:10:16 2016 @@ -21,16 +21,11 @@ */ -package org.apache.qpid.amqp_1_0.type.transport; +package org.apache.qpid.server.protocol.v1_0.type.transport; -import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; - - -import java.nio.ByteBuffer; - - -import org.apache.qpid.amqp_1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.ConnectionHandler; +import org.apache.qpid.server.protocol.v1_0.type.*; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class Transfer @@ -281,7 +276,7 @@ public class Transfer return builder.toString(); } - public void invoke(short channel, ConnectionEndpoint conn) + public void invoke(short channel, ConnectionHandler conn) { conn.receiveTransfer(channel, this); } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Attach; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Attach; public class AttachWriter extends AbstractDescribedTypeWriter<Attach> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Begin; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Begin; public class BeginWriter extends AbstractDescribedTypeWriter<Begin> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; @@ -67,7 +67,7 @@ public class CloseConstructor extends De try { - obj.setError( (org.apache.qpid.amqp_1_0.type.transport.Error) val ); + obj.setError( (org.apache.qpid.server.protocol.v1_0.type.transport.Error) val ); } catch(ClassCastException e) { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Close; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Close; public class CloseWriter extends AbstractDescribedTypeWriter<Close> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; @@ -121,7 +121,7 @@ public class DetachConstructor extends D try { - obj.setError( (org.apache.qpid.amqp_1_0.type.transport.Error) val ); + obj.setError( (org.apache.qpid.server.protocol.v1_0.type.transport.Error) val ); } catch(ClassCastException e) { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Detach; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Detach; public class DetachWriter extends AbstractDescribedTypeWriter<Detach> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Disposition; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Disposition; public class DispositionWriter extends AbstractDescribedTypeWriter<Disposition> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; @@ -67,7 +67,7 @@ public class EndConstructor extends Desc try { - obj.setError( (org.apache.qpid.amqp_1_0.type.transport.Error) val ); + obj.setError( (org.apache.qpid.server.protocol.v1_0.type.transport.Error) val ); } catch(ClassCastException e) { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.End; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.End; public class EndWriter extends AbstractDescribedTypeWriter<End> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,19 +21,19 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transaction.TransactionErrors; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transaction.TransactionErrors; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; import java.util.Map; -public class ErrorConstructor extends DescribedTypeConstructor<org.apache.qpid.amqp_1_0.type.transport.Error> +public class ErrorConstructor extends DescribedTypeConstructor<org.apache.qpid.server.protocol.v1_0.type.transport.Error> { private static final Object[] DESCRIPTORS = { @@ -50,12 +50,12 @@ public class ErrorConstructor extends De } } - public org.apache.qpid.amqp_1_0.type.transport.Error construct(Object underlying) + public org.apache.qpid.server.protocol.v1_0.type.transport.Error construct(Object underlying) { if(underlying instanceof List) { List list = (List) underlying; - org.apache.qpid.amqp_1_0.type.transport.Error obj = new org.apache.qpid.amqp_1_0.type.transport.Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error obj = new org.apache.qpid.server.protocol.v1_0.type.transport.Error(); int position = 0; final int size = list.size(); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; public class ErrorWriter extends AbstractDescribedTypeWriter<Error> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Flow; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Flow; public class FlowWriter extends AbstractDescribedTypeWriter<Flow> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Open; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Open; public class OpenWriter extends AbstractDescribedTypeWriter<Open> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java Fri Apr 15 10:10:16 2016 @@ -21,12 +21,12 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructor; -import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor; +import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.*; import java.util.List; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java Fri Apr 15 10:10:16 2016 @@ -21,14 +21,14 @@ */ -package org.apache.qpid.amqp_1_0.type.transport.codec; +package org.apache.qpid.server.protocol.v1_0.type.transport.codec; -import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter; -import org.apache.qpid.amqp_1_0.codec.AbstractListWriter; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter; +import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.Transfer; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; public class TransferWriter extends AbstractDescribedTypeWriter<Transfer> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java Fri Apr 15 10:10:16 2016 @@ -50,13 +50,13 @@ import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.apache.qpid.amqp_1_0.codec.FrameWriter; -import org.apache.qpid.amqp_1_0.framing.AMQFrame; -import org.apache.qpid.amqp_1_0.framing.SASLFrame; -import org.apache.qpid.amqp_1_0.type.Symbol; -import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry; -import org.apache.qpid.amqp_1_0.type.security.SaslInit; -import org.apache.qpid.amqp_1_0.type.transport.Open; +import org.apache.qpid.server.protocol.v1_0.codec.FrameWriter; +import org.apache.qpid.server.protocol.v1_0.framing.AMQFrame; +import org.apache.qpid.server.protocol.v1_0.framing.SASLFrame; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry; +import org.apache.qpid.server.protocol.v1_0.type.security.SaslInit; +import org.apache.qpid.server.protocol.v1_0.type.transport.Open; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; import org.apache.qpid.server.model.port.AmqpPort; Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java Fri Apr 15 10:10:16 2016 @@ -26,15 +26,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.qpid.amqp_1_0.messaging.SectionEncoder; -import org.apache.qpid.amqp_1_0.type.Binary; -import org.apache.qpid.amqp_1_0.type.Section; -import org.apache.qpid.amqp_1_0.type.Symbol; -import org.apache.qpid.amqp_1_0.type.UnsignedByte; -import org.apache.qpid.amqp_1_0.type.UnsignedInteger; -import org.apache.qpid.amqp_1_0.type.messaging.ApplicationProperties; -import org.apache.qpid.amqp_1_0.type.messaging.Header; -import org.apache.qpid.amqp_1_0.type.messaging.Properties; +import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder; +import org.apache.qpid.server.protocol.v1_0.type.Binary; +import org.apache.qpid.server.protocol.v1_0.type.Section; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; +import org.apache.qpid.server.protocol.v1_0.type.messaging.ApplicationProperties; +import org.apache.qpid.server.protocol.v1_0.type.messaging.Header; +import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v1_0.MessageConverter_to_1_0; Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1739270&r1=1739269&r2=1739270&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java Fri Apr 15 10:10:16 2016 @@ -26,15 +26,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.qpid.amqp_1_0.messaging.SectionEncoder; -import org.apache.qpid.amqp_1_0.type.Binary; -import org.apache.qpid.amqp_1_0.type.Section; -import org.apache.qpid.amqp_1_0.type.Symbol; -import org.apache.qpid.amqp_1_0.type.UnsignedByte; -import org.apache.qpid.amqp_1_0.type.UnsignedInteger; -import org.apache.qpid.amqp_1_0.type.messaging.ApplicationProperties; -import org.apache.qpid.amqp_1_0.type.messaging.Header; -import org.apache.qpid.amqp_1_0.type.messaging.Properties; +import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder; +import org.apache.qpid.server.protocol.v1_0.type.Binary; +import org.apache.qpid.server.protocol.v1_0.type.Section; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; +import org.apache.qpid.server.protocol.v1_0.type.messaging.ApplicationProperties; +import org.apache.qpid.server.protocol.v1_0.type.messaging.Header; +import org.apache.qpid.server.protocol.v1_0.type.messaging.Properties; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
