Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallIntConstructor.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/codec/SmallIntConstructor.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/codec/SmallIntConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallIntConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class SmallIntConstructor implements TypeConstructor
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallLongConstructor.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/codec/SmallLongConstructor.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/codec/SmallLongConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallLongConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class SmallLongConstructor implements TypeConstructor Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallUIntConstructor.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/codec/SmallUIntConstructor.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/codec/SmallUIntConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallUIntConstructor.java Fri Apr 15 10:10:16 2016 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.UnsignedInteger; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class SmallUIntConstructor implements TypeConstructor Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallULongConstructor.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/codec/SmallULongConstructor.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/codec/SmallULongConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallULongConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class SmallULongConstructor implements TypeConstructor Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringTypeConstructor.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/codec/StringTypeConstructor.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/codec/StringTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,12 +18,11 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.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/codec/StringWriter.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/codec/StringWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -143,4 +143,4 @@ public class StringWriter extends Simple { registry.register(String.class, FACTORY); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.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/codec/SymbolArrayWriter.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/codec/SymbolArrayWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java Fri Apr 15 10:10:16 2016 @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.nio.ByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.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/codec/SymbolTypeConstructor.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/codec/SymbolTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,15 +18,15 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; import java.nio.CharBuffer; import java.nio.charset.Charset; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class SymbolTypeConstructor extends VariableWidthTypeConstructor Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.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/codec/SymbolWriter.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/codec/SymbolWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.Symbol; +import org.apache.qpid.server.protocol.v1_0.type.Symbol; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.nio.charset.Charset; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampTypeConstructor.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/codec/TimestampTypeConstructor.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/codec/TimestampTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,10 +18,10 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.util.Date; @@ -49,7 +49,7 @@ public class TimestampTypeConstructor im } else { - org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error(); error.setCondition(ConnectionError.FRAMING_ERROR); error.setDescription("Cannot construct timestamp: insufficient input data"); throw new AmqpErrorException(error); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.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/codec/TimestampWriter.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/codec/TimestampWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; import java.util.Date; @@ -54,4 +54,4 @@ public class TimestampWriter extends Fix registry.register(Date.class, FACTORY); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TypeConstructor.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/codec/TypeConstructor.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/codec/TypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,11 +18,9 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import java.nio.ByteBuffer; - -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.bytebuffer.QpidByteBuffer; public interface TypeConstructor<T> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UByteTypeConstructor.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/codec/UByteTypeConstructor.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/codec/UByteTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UByteTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,11 +18,11 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.Error; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UByteTypeConstructor implements TypeConstructor Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UIntTypeConstructor.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/codec/UIntTypeConstructor.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/codec/UIntTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UIntTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,10 +18,10 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UIntTypeConstructor implements TypeConstructor @@ -47,7 +47,7 @@ public class UIntTypeConstructor impleme } else { - org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error(); error.setCondition(ConnectionError.FRAMING_ERROR); error.setDescription("Cannot construct uint: insufficient input data"); throw new AmqpErrorException(error); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ULongTypeConstructor.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/codec/ULongTypeConstructor.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/codec/ULongTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ULongTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,10 +18,10 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class ULongTypeConstructor implements TypeConstructor @@ -49,7 +49,7 @@ public class ULongTypeConstructor implem } else { - org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error(); error.setCondition(ConnectionError.FRAMING_ERROR); error.setDescription("Cannot construct ulong: insufficient input data"); throw new AmqpErrorException(error); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UShortTypeConstructor.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/codec/UShortTypeConstructor.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/codec/UShortTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UShortTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,11 +18,11 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.Error; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UShortTypeConstructor implements TypeConstructor @@ -48,7 +48,7 @@ public class UShortTypeConstructor imple } else { - org.apache.qpid.amqp_1_0.type.transport.Error error = new Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new Error(); error.setCondition(ConnectionError.FRAMING_ERROR); error.setDescription("Cannot construct ushort: insufficient input data"); throw new AmqpErrorException(error); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDTypeConstructor.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/codec/UUIDTypeConstructor.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/codec/UUIDTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,11 +18,11 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.transport.Error; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.*; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.util.UUID; @@ -51,7 +51,7 @@ public class UUIDTypeConstructor impleme } else { - org.apache.qpid.amqp_1_0.type.transport.Error error = new Error(); + org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new Error(); error.setCondition(ConnectionError.FRAMING_ERROR); error.setDescription("Cannot construct UUID: insufficient input data"); throw new AmqpErrorException(error); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.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/codec/UUIDWriter.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/codec/UUIDWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; import java.util.UUID; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.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/codec/UnsignedByteWriter.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/codec/UnsignedByteWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.UnsignedByte; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UnsignedByteWriter implements ValueWriter<UnsignedByte> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.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/codec/UnsignedIntegerWriter.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/codec/UnsignedIntegerWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.UnsignedInteger; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UnsignedIntegerWriter implements ValueWriter<UnsignedInteger> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.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/codec/UnsignedLongWriter.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/codec/UnsignedLongWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class UnsignedLongWriter implements ValueWriter<UnsignedLong> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.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/codec/UnsignedShortWriter.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/codec/UnsignedShortWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.UnsignedShort; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort; public class UnsignedShortWriter extends FixedTwoWriter<UnsignedShort> { @@ -53,4 +53,4 @@ public class UnsignedShortWriter extends { registry.register(UnsignedShort.class, FACTORY); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.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/codec/ValueHandler.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/codec/ValueHandler.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java Fri Apr 15 10:10:16 2016 @@ -18,14 +18,13 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.transport.AmqpError; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; import java.nio.charset.Charset; public class ValueHandler implements DescribedTypeConstructorRegistry.Source Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.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/codec/ValueProducingProtocolHandler.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/codec/ValueProducingProtocolHandler.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java Fri Apr 15 10:10:16 2016 @@ -18,9 +18,9 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; public interface ValueProducingProtocolHandler extends ProtocolHandler { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.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/codec/ValueWriter.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/codec/ValueWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,8 @@ * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import java.nio.ByteBuffer; import java.util.Map; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.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/codec/VariableWidthTypeConstructor.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/codec/VariableWidthTypeConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java Fri Apr 15 10:10:16 2016 @@ -18,13 +18,11 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; - public abstract class VariableWidthTypeConstructor implements TypeConstructor { protected int _size; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthWriter.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/codec/VariableWidthWriter.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/codec/VariableWidthWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthWriter.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.codec; - -import java.nio.ByteBuffer; +package org.apache.qpid.server.protocol.v1_0.codec; import org.apache.qpid.bytebuffer.QpidByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/WrapperTypeValueWriter.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/codec/WrapperTypeValueWriter.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/codec/WrapperTypeValueWriter.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/WrapperTypeValueWriter.java Fri Apr 15 10:10:16 2016 @@ -18,9 +18,9 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.WrapperType; +import org.apache.qpid.server.protocol.v1_0.type.WrapperType; public class WrapperTypeValueWriter extends DelegatingValueWriter<WrapperType> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.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/codec/ZeroListConstructor.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/codec/ZeroListConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.util.Collections; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.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/codec/ZeroUIntConstructor.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/codec/ZeroUIntConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.UnsignedInteger; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger; import org.apache.qpid.bytebuffer.QpidByteBuffer; class ZeroUIntConstructor implements TypeConstructor<UnsignedInteger> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.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/codec/ZeroULongConstructor.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/codec/ZeroULongConstructor.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java Fri Apr 15 10:10:16 2016 @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.codec; +package org.apache.qpid.server.protocol.v1_0.codec; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.UnsignedLong; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong; import org.apache.qpid.bytebuffer.QpidByteBuffer; class ZeroULongConstructor implements TypeConstructor<UnsignedLong> Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.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/framing/AMQFrame.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/framing/AMQFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java Fri Apr 15 10:10:16 2016 @@ -19,9 +19,9 @@ * */ -package org.apache.qpid.amqp_1_0.framing; +package org.apache.qpid.server.protocol.v1_0.framing; -import org.apache.qpid.amqp_1_0.type.FrameBody; +import org.apache.qpid.server.protocol.v1_0.type.FrameBody; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.nio.ByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.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/framing/FrameHandler.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/framing/FrameHandler.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java Fri Apr 15 10:10:16 2016 @@ -18,53 +18,38 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.framing; +package org.apache.qpid.server.protocol.v1_0.framing; -import java.nio.ByteBuffer; import java.util.Formatter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.amqp_1_0.codec.ProtocolHandler; -import org.apache.qpid.amqp_1_0.codec.ValueHandler; -import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.ErrorCondition; -import org.apache.qpid.amqp_1_0.type.transport.ConnectionError; -import org.apache.qpid.amqp_1_0.type.transport.Error; -import org.apache.qpid.amqp_1_0.type.transport.Transfer; +import org.apache.qpid.server.protocol.v1_0.AMQPConnection_1_0; +import org.apache.qpid.server.protocol.v1_0.ConnectionHandler; +import org.apache.qpid.server.protocol.v1_0.codec.ProtocolHandler; +import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.ErrorCondition; +import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; import org.apache.qpid.bytebuffer.QpidByteBuffer; public class FrameHandler implements ProtocolHandler { public static Logger LOGGER = LoggerFactory.getLogger(FrameHandler.class); + private final boolean _isSasl; - private ConnectionEndpoint _connection; + private ConnectionHandler _connection; private ValueHandler _typeHandler; + private boolean _errored = false; - enum State { - SIZE_0, - SIZE_1, - SIZE_2, - SIZE_3, - PRE_PARSE, - BUFFERING, - PARSING, - ERROR - } - - private State _state = State.SIZE_0; - private int _size; - - private QpidByteBuffer _buffer; - - - - public FrameHandler(final ConnectionEndpoint connection) + public FrameHandler(final AMQPConnection_1_0 connection, final boolean sasl) { _connection = connection; _typeHandler = new ValueHandler(connection.getDescribedTypeRegistry()); + _isSasl = sasl; } @@ -73,229 +58,128 @@ public class FrameHandler implements Pro try { Error frameParsingError = null; - int size = _size; - State state = _state; - QpidByteBuffer oldIn = null; + int size; - while (in.hasRemaining() && state != State.ERROR) + int remaining; + while ((remaining = in.remaining()) >=8 && frameParsingError == null) { - final int remaining = in.remaining(); - if (remaining == 0) + size = in.getInt(); + if(remaining < size) { - return this; + in.position(in.position()-4); + break; } + int dataOffset = (in.get() << 2) & 0x3FF; - - switch (state) + if (size < 8) { - case SIZE_0: - if (remaining >= 4) - { - size = in.getInt(); - state = State.PRE_PARSE; - break; - } - else - { - size = (in.get() << 24) & 0xFF000000; - if (!in.hasRemaining()) - { - state = State.SIZE_1; - break; - } - } - case SIZE_1: - size |= (in.get() << 16) & 0xFF0000; - if (!in.hasRemaining()) - { - state = State.SIZE_2; - break; - } - case SIZE_2: - size |= (in.get() << 8) & 0xFF00; - if (!in.hasRemaining()) - { - state = State.SIZE_3; - break; - } - case SIZE_3: - size |= in.get() & 0xFF; - state = State.PRE_PARSE; + frameParsingError = createFramingError( + "specified frame size %d smaller than minimum frame header size %d", + size, + 8); + break; + } - case PRE_PARSE: + if(size > _connection.getMaxFrameSize()) + { + frameParsingError = createFramingError( + "specified frame size %d larger than maximum frame header size %d", + size, + _connection.getMaxFrameSize()); + break; + } - if (size < 8) - { - frameParsingError = createFramingError( - "specified frame size %d smaller than minimum frame header size %d", - size, - 8); - state = State.ERROR; - break; - } - else if(size > _connection.getMaxFrameSize()) - { - frameParsingError = createFramingError( - "specified frame size %d larger than maximum frame header size %d", - size, - _connection.getMaxFrameSize()); - state = State.ERROR; - break; - } + if (dataOffset < 8) + { + frameParsingError = createFramingError( + "specified frame data offset %d smaller than minimum frame header size %d", + dataOffset, + 8); + break; + } - if (in.remaining() < size - 4) - { - _buffer = QpidByteBuffer.allocateDirect(size - 4); - _buffer.put(in); - state = State.BUFFERING; - break; - } - case BUFFERING: - if (_buffer != null) - { - final int bufferRemaining = _buffer.remaining(); - if (in.remaining() < bufferRemaining) - { - _buffer.put(in); - break; - } - else - { - QpidByteBuffer dup = in.duplicate(); - dup.limit(dup.position() + bufferRemaining); - - _buffer.put(dup); - dup.dispose(); - - in.position(in.position() + bufferRemaining); - oldIn = in; - - _buffer.flip(); - in = _buffer; - state = State.PARSING; - } - } + if (dataOffset > size) + { + frameParsingError = createFramingError( + "specified frame data offset %d larger than the frame size %d", + dataOffset, + size); + break; + } - case PARSING: - int dataOffset = (in.get() << 2) & 0x3FF; + byte type = in.get(); - if (dataOffset < 8) + switch(type) + { + case 0: + if(_isSasl) { - frameParsingError = createFramingError( - "specified frame data offset %d smaller than minimum frame header size %d", - dataOffset, - 8); - state = State.ERROR; - break; + frameParsingError = createFramingError("received an AMQP frame type when expecting an SASL frame"); } - else if (dataOffset > size) + break; + case 1: + if(!_isSasl) { - frameParsingError = createFramingError( - "specified frame data offset %d larger than the frame size %d", - dataOffset, - _size); - state = State.ERROR; - break; + frameParsingError = createFramingError("received a SASL frame type when expecting an AMQP frame"); } + break; + default: + frameParsingError = createFramingError("unknown frame type: %d", type); + } - // type - - int type = in.get() & 0xFF; - int channel = in.getShort() & 0xFFFF; - - if (type != 0 && type != 1) - { - frameParsingError = createFramingError("unknown frame type: %d", type); - state = State.ERROR; - break; - } - - // channel - - /*if(channel > _connection.getChannelMax()) - { - frameParsingError = createError(AmqpError.DECODE_ERROR, - "frame received on invalid channel %d above channel-max %d", - channel, _connection.getChannelMax()); + if(frameParsingError != null) + { + break; + } - state = State.ERROR; - } -*/ - // ext header - if (dataOffset != 8) - { - in.position(in.position() + dataOffset - 8); - } + int channel = ((int)in.getShort()) & 0xffff; - // oldIn null iff not working on duplicated buffer - if (oldIn == null) - { - oldIn = in; - in = in.duplicate(); - final int endPos = in.position() + size - dataOffset; - in.limit(endPos); - oldIn.position(endPos); + if (dataOffset != 8) + { + in.position(in.position() + dataOffset - 8); + } - } + QpidByteBuffer dup = in.slice(); + dup.limit(size - dataOffset); + in.position(in.position() + size - dataOffset); - int inPos = in.position(); - int inLimit = in.limit(); - // PARSE HERE - try - { - Object val = in.hasRemaining() ? _typeHandler.parse(in) : null; + try + { + Object val = dup.hasRemaining() ? _typeHandler.parse(dup) : null; - if (in.hasRemaining()) - { - if (val instanceof Transfer) - { - ((Transfer) val).setPayload(in.slice()); - } - } - - _connection.receive((short) channel, val); - - reset(); - state = State.SIZE_0; - break; - } - catch (AmqpErrorException ex) - { - state = State.ERROR; - frameParsingError = ex.getError(); - } - catch (RuntimeException e) + if (dup.hasRemaining()) + { + if (val instanceof Transfer) { - in.position(inPos); - in.limit(inLimit); - throw e; + ((Transfer) val).setPayload(dup.slice()); } - finally + else { - in.dispose(); - - in = oldIn; - oldIn = null; - _buffer = null; + frameParsingError = createFramingError( + "Frame length %d larger than contained frame body %s.", + size, + val); } + } + _connection.receive((short) channel, val); + } + catch (AmqpErrorException ex) + { + frameParsingError = ex.getError(); + } + finally + { + dup.dispose(); } - } - _state = state; - _size = size; - - if (_state == State.ERROR) + if (frameParsingError != null) { _connection.handleError(frameParsingError); + _errored = true; - if (_buffer != null) - { - _buffer.dispose(); - _buffer = null; - } } } catch (RuntimeException e) @@ -307,23 +191,6 @@ public class FrameHandler implements Pro return this; } - private static String toHex(ByteBuffer in) - { - Formatter formatter = new Formatter(); - int count = 0; - while(in.hasRemaining()) - { - formatter.format("%02x ", in.get() & 0xFF); - if(count++ == 16) - { - formatter.format("\n"); - count = 0; - } - - } - return formatter.toString(); - } - private Error createFramingError(String description, Object... args) { return createError(ConnectionError.FRAMING_ERROR, description, args); @@ -340,16 +207,8 @@ public class FrameHandler implements Pro return error; } - - private void reset() - { - _size = 0; - _state = State.SIZE_0; - } - - public boolean isDone() { - return _state == State.ERROR || _connection.closedForInput(); + return _errored|| _connection.closedForInput(); } } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.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/framing/OversizeFrameException.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/framing/OversizeFrameException.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java Fri Apr 15 10:10:16 2016 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.framing; +package org.apache.qpid.server.protocol.v1_0.framing; public class OversizeFrameException extends RuntimeException { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.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/framing/SASLFrame.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/framing/SASLFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java Fri Apr 15 10:10:16 2016 @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.framing; +package org.apache.qpid.server.protocol.v1_0.framing; -import org.apache.qpid.amqp_1_0.type.SaslFrameBody; +import org.apache.qpid.server.protocol.v1_0.type.SaslFrameBody; public final class SASLFrame extends AMQFrame<SaslFrameBody> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.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/framing/TransportFrame.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/framing/TransportFrame.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java Fri Apr 15 10:10:16 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.qpid.amqp_1_0.framing; +package org.apache.qpid.server.protocol.v1_0.framing; -import org.apache.qpid.amqp_1_0.type.FrameBody; +import org.apache.qpid.server.protocol.v1_0.type.FrameBody; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.nio.ByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.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/messaging/SectionDecoder.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/messaging/SectionDecoder.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java Fri Apr 15 10:10:16 2016 @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.messaging; +package org.apache.qpid.server.protocol.v1_0.messaging; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.Section; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.Section; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.nio.ByteBuffer; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.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/messaging/SectionDecoderImpl.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/messaging/SectionDecoderImpl.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java Fri Apr 15 10:10:16 2016 @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.messaging; +package org.apache.qpid.server.protocol.v1_0.messaging; -import org.apache.qpid.amqp_1_0.codec.ValueHandler; +import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler; -import org.apache.qpid.amqp_1_0.type.AmqpErrorException; -import org.apache.qpid.amqp_1_0.type.Section; -import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry; +import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; +import org.apache.qpid.server.protocol.v1_0.type.Section; +import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry; import org.apache.qpid.bytebuffer.QpidByteBuffer; import java.util.ArrayList; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoder.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/messaging/SectionEncoder.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/messaging/SectionEncoder.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoder.java Fri Apr 15 10:10:16 2016 @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.messaging; +package org.apache.qpid.server.protocol.v1_0.messaging; -import org.apache.qpid.amqp_1_0.type.Binary; +import org.apache.qpid.server.protocol.v1_0.type.Binary; public interface SectionEncoder Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.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/messaging/SectionEncoderImpl.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/messaging/SectionEncoderImpl.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java Fri Apr 15 10:10:16 2016 @@ -17,15 +17,14 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.messaging; +package org.apache.qpid.server.protocol.v1_0.messaging; -import org.apache.qpid.amqp_1_0.codec.ValueWriter; +import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter; -import org.apache.qpid.amqp_1_0.type.Binary; -import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry; +import org.apache.qpid.server.protocol.v1_0.type.Binary; +import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import java.nio.ByteBuffer; import java.util.ArrayList; 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/AmqpErrorException.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/AmqpErrorException.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/AmqpErrorException.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/AmqpErrorException.java Fri Apr 15 10:10:16 2016 @@ -18,9 +18,9 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; -import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import java.util.Formatter; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.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/Binary.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/Binary.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java Fri Apr 15 10:10:16 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; import java.nio.ByteBuffer; import java.util.Collection; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DeliveryState.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/DeliveryState.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/DeliveryState.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DeliveryState.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface DeliveryState { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DistributionMode.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/DistributionMode.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/DistributionMode.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DistributionMode.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface DistributionMode { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.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/ErrorCondition.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/ErrorCondition.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java Fri Apr 15 10:10:16 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface ErrorCondition { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.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/FrameBody.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/FrameBody.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java Fri Apr 15 10:10:16 2016 @@ -19,11 +19,11 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; -import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; +import org.apache.qpid.server.protocol.v1_0.ConnectionHandler; public interface FrameBody { - public void invoke(short channel, ConnectionEndpoint conn); + void invoke(short channel, ConnectionHandler conn); } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/GlobalTxId.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/GlobalTxId.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/GlobalTxId.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/GlobalTxId.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public class GlobalTxId { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/LifetimePolicy.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/LifetimePolicy.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/LifetimePolicy.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/LifetimePolicy.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface LifetimePolicy { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Outcome.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/Outcome.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/Outcome.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Outcome.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface Outcome { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/RestrictedType.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/RestrictedType.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/RestrictedType.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/RestrictedType.java Fri Apr 15 10:10:16 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface RestrictedType<V> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.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/SaslFrameBody.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/SaslFrameBody.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java Fri Apr 15 10:10:16 2016 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; -import org.apache.qpid.amqp_1_0.transport.SASLEndpoint; +import org.apache.qpid.server.protocol.v1_0.SASLEndpoint; public interface SaslFrameBody { - public void invoke(SASLEndpoint conn); + void invoke(final short channel, SASLEndpoint conn); } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Section.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/Section.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/Section.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Section.java Fri Apr 15 10:10:16 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; -import org.apache.qpid.amqp_1_0.messaging.SectionEncoder; +import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder; public interface Section { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Source.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/Source.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/Source.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Source.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface Source { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.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/Symbol.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/Symbol.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Target.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/Target.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/Target.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Target.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface Target { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnCapability.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/TxnCapability.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/TxnCapability.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnCapability.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface TxnCapability { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnId.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/TxnId.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/TxnId.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnId.java Fri Apr 15 10:10:16 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface TxnId { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.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/UnsignedByte.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/UnsignedByte.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public final class UnsignedByte extends Number implements Comparable<UnsignedByte> { @@ -131,4 +131,4 @@ public final class UnsignedByte extends return valueOf((byte)intVal); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.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/UnsignedInteger.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/UnsignedInteger.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public final class UnsignedInteger extends Number implements Comparable<UnsignedInteger> { Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.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/UnsignedLong.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/UnsignedLong.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; import java.math.BigInteger; @@ -159,4 +159,4 @@ public final class UnsignedLong extends { return UnsignedLong.valueOf(_underlying + unsignedLong._underlying); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.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/UnsignedShort.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/UnsignedShort.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public final class UnsignedShort extends Number implements Comparable<UnsignedShort> { @@ -129,4 +129,4 @@ public final class UnsignedShort extends return valueOf((short)intVal); } -} \ No newline at end of file +} Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/WrapperType.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/WrapperType.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/WrapperType.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/WrapperType.java Fri Apr 15 10:10:16 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.amqp_1_0.type; +package org.apache.qpid.server.protocol.v1_0.type; public interface WrapperType { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
