Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.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/codec/AMQPDescribedTypeRegistry.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/codec/AMQPDescribedTypeRegistry.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
 Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.amqp_1_0.type.codec;
+package org.apache.qpid.server.protocol.v1_0.type.codec;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -27,43 +27,43 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.amqp_1_0.codec.*;
-import org.apache.qpid.amqp_1_0.type.RestrictedType;
-import org.apache.qpid.amqp_1_0.type.messaging.StdDistMode;
-import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
-import org.apache.qpid.amqp_1_0.type.messaging.TerminusExpiryPolicy;
-import org.apache.qpid.amqp_1_0.type.messaging.codec.*;
-import org.apache.qpid.amqp_1_0.type.security.SaslCode;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslChallengeConstructor;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslChallengeWriter;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslInitConstructor;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslInitWriter;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslMechanismsConstructor;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslMechanismsWriter;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslOutcomeConstructor;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslOutcomeWriter;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslResponseConstructor;
-import org.apache.qpid.amqp_1_0.type.security.codec.SaslResponseWriter;
-import org.apache.qpid.amqp_1_0.type.transaction.TransactionErrors;
-import org.apache.qpid.amqp_1_0.type.transaction.TxnCapability;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.CoordinatorConstructor;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.CoordinatorWriter;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DeclareConstructor;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DeclareWriter;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DeclaredConstructor;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DeclaredWriter;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DischargeConstructor;
-import org.apache.qpid.amqp_1_0.type.transaction.codec.DischargeWriter;
-import 
org.apache.qpid.amqp_1_0.type.transaction.codec.TransactionalStateConstructor;
-import 
org.apache.qpid.amqp_1_0.type.transaction.codec.TransactionalStateWriter;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.LinkError;
-import org.apache.qpid.amqp_1_0.type.transport.ReceiverSettleMode;
-import org.apache.qpid.amqp_1_0.type.transport.Role;
-import org.apache.qpid.amqp_1_0.type.transport.SenderSettleMode;
-import org.apache.qpid.amqp_1_0.type.transport.SessionError;
-import org.apache.qpid.amqp_1_0.type.transport.codec.*;
+import org.apache.qpid.server.protocol.v1_0.codec.*;
+import org.apache.qpid.server.protocol.v1_0.type.RestrictedType;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.StdDistMode;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusDurability;
+import 
org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusExpiryPolicy;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.*;
+import org.apache.qpid.server.protocol.v1_0.type.security.SaslCode;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslChallengeConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslChallengeWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslInitConstructor;
+import org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslInitWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslMechanismsConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslMechanismsWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslOutcomeConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslOutcomeWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslResponseConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.security.codec.SaslResponseWriter;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.TransactionErrors;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.TxnCapability;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.CoordinatorConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.CoordinatorWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DeclareConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DeclareWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DeclaredConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DeclaredWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DischargeConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.DischargeWriter;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.TransactionalStateConstructor;
+import 
org.apache.qpid.server.protocol.v1_0.type.transaction.codec.TransactionalStateWriter;
+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.server.protocol.v1_0.type.transport.LinkError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ReceiverSettleMode;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
+import org.apache.qpid.server.protocol.v1_0.type.transport.SenderSettleMode;
+import org.apache.qpid.server.protocol.v1_0.type.transport.SessionError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.codec.*;
 
 public class AMQPDescribedTypeRegistry implements 
DescribedTypeConstructorRegistry, ValueWriter.Registry
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Accepted.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/messaging/Accepted.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/messaging/Accepted.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Accepted.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Accepted
-  implements org.apache.qpid.amqp_1_0.type.DeliveryState, Outcome
+  implements org.apache.qpid.server.protocol.v1_0.type.DeliveryState, Outcome
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.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/messaging/AmqpSequence.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/messaging/AmqpSequence.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
 Fri Apr 15 10:10:16 2016
@@ -21,16 +21,16 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.List;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class AmqpSequence
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.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/messaging/AmqpValue.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/messaging/AmqpValue.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class AmqpValue
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.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/messaging/ApplicationProperties.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/messaging/ApplicationProperties.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
 Fri Apr 15 10:10:16 2016
@@ -21,16 +21,16 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class ApplicationProperties
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.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/messaging/Data.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/messaging/Data.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Data
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnClose.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/messaging/DeleteOnClose.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/messaging/DeleteOnClose.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnClose.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class DeleteOnClose
   implements LifetimePolicy

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinks.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/messaging/DeleteOnNoLinks.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/messaging/DeleteOnNoLinks.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinks.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class DeleteOnNoLinks
   implements LifetimePolicy

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinksOrMessages.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/messaging/DeleteOnNoLinksOrMessages.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/messaging/DeleteOnNoLinksOrMessages.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinksOrMessages.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class DeleteOnNoLinksOrMessages
   implements LifetimePolicy

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoMessages.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/messaging/DeleteOnNoMessages.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/messaging/DeleteOnNoMessages.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoMessages.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class DeleteOnNoMessages
   implements LifetimePolicy

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.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/messaging/DeliveryAnnotations.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/messaging/DeliveryAnnotations.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
 Fri Apr 15 10:10:16 2016
@@ -21,16 +21,16 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class DeliveryAnnotations
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.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/messaging/ExactSubjectFilter.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/messaging/ExactSubjectFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 public class ExactSubjectFilter implements Filter

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Filter.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/messaging/Filter.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/messaging/Filter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Filter.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 public interface Filter
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.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/messaging/Footer.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/messaging/Footer.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
 Fri Apr 15 10:10:16 2016
@@ -21,16 +21,16 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Footer
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.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/messaging/Header.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/messaging/Header.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Header
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.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/messaging/JMSSelectorFilter.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/messaging/JMSSelectorFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 public class JMSSelectorFilter implements Filter

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.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/messaging/MatchingSubjectFilter.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/messaging/MatchingSubjectFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 public class MatchingSubjectFilter implements Filter

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.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/messaging/MessageAnnotations.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/messaging/MessageAnnotations.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
 Fri Apr 15 10:10:16 2016
@@ -21,16 +21,16 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class MessageAnnotations
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Modified.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/messaging/Modified.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/messaging/Modified.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Modified.java
 Fri Apr 15 10:10:16 2016
@@ -21,17 +21,17 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Modified
-  implements org.apache.qpid.amqp_1_0.type.DeliveryState, Outcome
+  implements org.apache.qpid.server.protocol.v1_0.type.DeliveryState, Outcome
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NoLocalFilter.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/messaging/NoLocalFilter.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/messaging/NoLocalFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NoLocalFilter.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 public final class NoLocalFilter implements Filter

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.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/messaging/Properties.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/messaging/Properties.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
 Fri Apr 15 10:10:16 2016
@@ -21,17 +21,17 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 
 
 import java.util.Date;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Properties
   implements Section

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Received.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/messaging/Received.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/messaging/Received.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Received.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Received
-  implements org.apache.qpid.amqp_1_0.type.DeliveryState
+  implements org.apache.qpid.server.protocol.v1_0.type.DeliveryState
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Rejected.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/messaging/Rejected.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/messaging/Rejected.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Rejected.java
 Fri Apr 15 10:10:16 2016
@@ -21,17 +21,17 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Rejected
-  implements org.apache.qpid.amqp_1_0.type.DeliveryState, Outcome
+  implements org.apache.qpid.server.protocol.v1_0.type.DeliveryState, Outcome
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Released.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/messaging/Released.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/messaging/Released.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Released.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Released
-  implements org.apache.qpid.amqp_1_0.type.DeliveryState, Outcome
+  implements org.apache.qpid.server.protocol.v1_0.type.DeliveryState, Outcome
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/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/messaging/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/messaging/Source.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
@@ -29,10 +29,10 @@ import java.util.Arrays;
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Source
-  implements org.apache.qpid.amqp_1_0.type.Source
+  implements org.apache.qpid.server.protocol.v1_0.type.Source
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.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/messaging/StdDistMode.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/messaging/StdDistMode.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class StdDistMode
   implements DistributionMode, RestrictedType<Symbol>

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/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/messaging/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/messaging/Target.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Target.java
 Fri Apr 15 10:10:16 2016
@@ -21,7 +21,7 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
@@ -29,10 +29,10 @@ import java.util.Arrays;
 import java.util.Map;
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class Target
-  implements org.apache.qpid.amqp_1_0.type.Target
+  implements org.apache.qpid.server.protocol.v1_0.type.Target
   {
 
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.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/messaging/TerminusDurability.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/messaging/TerminusDurability.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class TerminusDurability
   implements RestrictedType<UnsignedInteger>

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.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/messaging/TerminusExpiryPolicy.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/messaging/TerminusExpiryPolicy.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging;
+package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
 
-import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
 
 public class TerminusExpiryPolicy
   implements RestrictedType<Symbol>

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.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/messaging/codec/AcceptedConstructor.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/messaging/codec/AcceptedConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/AcceptedWriter.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/messaging/codec/AcceptedWriter.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/messaging/codec/AcceptedWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,15 +21,15 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.ListWriter;
-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.ListWriter;
+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.messaging.Accepted;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Accepted;
 
 public class AcceptedWriter extends AbstractDescribedTypeWriter<Accepted>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.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/messaging/codec/AmqpSequenceConstructor.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/messaging/codec/AmqpSequenceConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/AmqpSequenceWriter.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/messaging/codec/AmqpSequenceWriter.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/messaging/codec/AmqpSequenceWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpSequence;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpSequence;
 
 public class AmqpSequenceWriter extends 
AbstractDescribedTypeWriter<AmqpSequence>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.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/messaging/codec/AmqpValueConstructor.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/messaging/codec/AmqpValueConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.Symbol;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
+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.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValue;
 
 public class AmqpValueConstructor extends DescribedTypeConstructor<AmqpValue>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.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/messaging/codec/AmqpValueWriter.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/messaging/codec/AmqpValueWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValue;
 
 public class AmqpValueWriter extends AbstractDescribedTypeWriter<AmqpValue>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.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/messaging/codec/ApplicationPropertiesConstructor.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/messaging/codec/ApplicationPropertiesConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 import java.util.Map;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.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/messaging/codec/ApplicationPropertiesWriter.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/messaging/codec/ApplicationPropertiesWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.ApplicationProperties;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import 
org.apache.qpid.server.protocol.v1_0.type.messaging.ApplicationProperties;
 
 public class ApplicationPropertiesWriter extends 
AbstractDescribedTypeWriter<ApplicationProperties>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.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/messaging/codec/DataConstructor.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/messaging/codec/DataConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 public class DataConstructor extends DescribedTypeConstructor<Data>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.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/messaging/codec/DataWriter.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/messaging/codec/DataWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.Data;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Data;
 
 public class DataWriter extends AbstractDescribedTypeWriter<Data>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.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/messaging/codec/DeleteOnCloseConstructor.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/messaging/codec/DeleteOnCloseConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/DeleteOnCloseWriter.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/messaging/codec/DeleteOnCloseWriter.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/messaging/codec/DeleteOnCloseWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.DeleteOnClose;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnClose;
 
 public class DeleteOnCloseWriter extends 
AbstractDescribedTypeWriter<DeleteOnClose>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.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/messaging/codec/DeleteOnNoLinksConstructor.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/messaging/codec/DeleteOnNoLinksConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.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/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/DeleteOnNoLinksOrMessagesWriter.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/messaging/codec/DeleteOnNoLinksOrMessagesWriter.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/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.DeleteOnNoLinksOrMessages;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import 
org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoLinksOrMessages;
 
 public class DeleteOnNoLinksOrMessagesWriter extends 
AbstractDescribedTypeWriter<DeleteOnNoLinksOrMessages>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.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/messaging/codec/DeleteOnNoLinksWriter.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/messaging/codec/DeleteOnNoLinksWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.DeleteOnNoLinks;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoLinks;
 
 public class DeleteOnNoLinksWriter extends 
AbstractDescribedTypeWriter<DeleteOnNoLinks>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.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/messaging/codec/DeleteOnNoMessagesConstructor.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/messaging/codec/DeleteOnNoMessagesConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/DeleteOnNoMessagesWriter.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/messaging/codec/DeleteOnNoMessagesWriter.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/messaging/codec/DeleteOnNoMessagesWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.DeleteOnNoMessages;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoMessages;
 
 public class DeleteOnNoMessagesWriter extends 
AbstractDescribedTypeWriter<DeleteOnNoMessages>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.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/messaging/codec/DeliveryAnnotationsConstructor.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/messaging/codec/DeliveryAnnotationsConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 import java.util.Map;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.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/messaging/codec/DeliveryAnnotationsWriter.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/messaging/codec/DeliveryAnnotationsWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.DeliveryAnnotations;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeliveryAnnotations;
 
 public class DeliveryAnnotationsWriter extends 
AbstractDescribedTypeWriter<DeliveryAnnotations>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.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/messaging/codec/ExactSubjectFilterConstructor.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/messaging/codec/ExactSubjectFilterConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.Symbol;
-import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
+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.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.ExactSubjectFilter;
 
 public class ExactSubjectFilterConstructor extends 
DescribedTypeConstructor<ExactSubjectFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.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/messaging/codec/ExactSubjectFilterWriter.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/messaging/codec/ExactSubjectFilterWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,11 +21,11 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-import org.apache.qpid.amqp_1_0.codec.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter;
+import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.ExactSubjectFilter;
 
 public class ExactSubjectFilterWriter extends 
AbstractDescribedTypeWriter<ExactSubjectFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.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/messaging/codec/FooterConstructor.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/messaging/codec/FooterConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 import java.util.Map;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.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/messaging/codec/FooterWriter.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/messaging/codec/FooterWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.Footer;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Footer;
 
 public class FooterWriter extends AbstractDescribedTypeWriter<Footer>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.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/messaging/codec/HeaderConstructor.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/messaging/codec/HeaderConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 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/messaging/codec/HeaderWriter.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/messaging/codec/HeaderWriter.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/messaging/codec/HeaderWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,14 +21,14 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.Header;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Header;
 
 public class HeaderWriter extends AbstractDescribedTypeWriter<Header>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.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/messaging/codec/JMSSelectorFilterConstructor.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/messaging/codec/JMSSelectorFilterConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.Symbol;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
+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.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.JMSSelectorFilter;
 
 public class JMSSelectorFilterConstructor extends 
DescribedTypeConstructor<JMSSelectorFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.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/messaging/codec/JMSSelectorFilterWriter.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/messaging/codec/JMSSelectorFilterWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-import org.apache.qpid.amqp_1_0.codec.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter;
+import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.JMSSelectorFilter;
 
 public class JMSSelectorFilterWriter extends 
AbstractDescribedTypeWriter<JMSSelectorFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.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/messaging/codec/MatchingSubjectFilterConstructor.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/messaging/codec/MatchingSubjectFilterConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.Symbol;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
+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.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import 
org.apache.qpid.server.protocol.v1_0.type.messaging.MatchingSubjectFilter;
 
 public class MatchingSubjectFilterConstructor extends 
DescribedTypeConstructor<MatchingSubjectFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.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/messaging/codec/MatchingSubjectFilterWriter.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/messaging/codec/MatchingSubjectFilterWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-import org.apache.qpid.amqp_1_0.codec.ValueWriter;
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
+import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter;
+import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import 
org.apache.qpid.server.protocol.v1_0.type.messaging.MatchingSubjectFilter;
 
 public class MatchingSubjectFilterWriter extends 
AbstractDescribedTypeWriter<MatchingSubjectFilter>
 {

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.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/messaging/codec/MessageAnnotationsConstructor.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/messaging/codec/MessageAnnotationsConstructor.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
 Fri Apr 15 10:10:16 2016
@@ -21,12 +21,12 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.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.messaging.*;
+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.messaging.*;
 
 
 import java.util.Map;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.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/messaging/codec/MessageAnnotationsWriter.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/messaging/codec/MessageAnnotationsWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
 Fri Apr 15 10:10:16 2016
@@ -21,13 +21,13 @@
 */
 
 
-package org.apache.qpid.amqp_1_0.type.messaging.codec;
+package org.apache.qpid.server.protocol.v1_0.type.messaging.codec;
 
-import org.apache.qpid.amqp_1_0.codec.AbstractDescribedTypeWriter;
-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.ValueWriter;
 
-import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-import org.apache.qpid.amqp_1_0.type.messaging.MessageAnnotations;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.MessageAnnotations;
 
 public class MessageAnnotationsWriter extends 
AbstractDescribedTypeWriter<MessageAnnotations>
 {




---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to