You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/12/12 14:33:07 UTC

svn commit: r1420665 [1/7] - in /qpid/proton/trunk/proton-j: contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/ contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/ proton/src/main/java/org/apache/qpid/proton/amq...

Author: rgodfrey
Date: Wed Dec 12 13:32:32 2012
New Revision: 1420665

URL: http://svn.apache.org/viewvc?rev=1420665&view=rev
Log:
PROTON-184, PROTON-127: [Proton-J] Refactor the Java implementation to separate the encoding of types from their Java representation. Remove the "type" package and move classes to "amqp"

Added:
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Binary.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Binary.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal128.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal128.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal32.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal32.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal64.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal64.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/DescribedType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/DescribedType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Symbol.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Symbol.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedByte.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedInteger.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedLong.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedShort.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Accepted.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Accepted.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpSequence.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpSequence.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpValue.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpValue.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/ApplicationProperties.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/ApplicationProperties.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Data.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Data.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnClose.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnClose.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinks.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinks.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinksOrMessages.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinksOrMessages.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoMessages.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoMessages.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeliveryAnnotations.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Footer.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Footer.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Header.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Header.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/LifetimePolicy.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/LifetimePolicy.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/MessageAnnotations.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/MessageAnnotations.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Modified.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Modified.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Outcome.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Outcome.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Properties.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Properties.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Received.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Received.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Rejected.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Rejected.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Released.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Released.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Section.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Section.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Source.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Target.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusDurability.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusExpiryPolicy.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/
      - copied from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/
      - copied from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/AmqpError.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Attach.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Begin.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Close.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ConnectionError.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/DeliveryState.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Detach.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Disposition.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/End.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/End.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Error.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Flow.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/FrameBody.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/LinkError.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Open.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Open.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ReceiverSettleMode.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ReceiverSettleMode.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Role.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Role.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SenderSettleMode.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SenderSettleMode.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SessionError.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SessionError.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Source.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Target.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Transfer.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Transfer.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/AMQPDefinedTypes.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/AMQPDefinedTypes.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/AbstractDescribedType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/AcceptedType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/AmqpSequenceType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpSequence.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/AmqpValueType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpValue.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/ApplicationPropertiesType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/ApplicationProperties.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DataType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Data.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DeleteOnCloseType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnClose.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DeleteOnNoLinksOrMessagesType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinksOrMessages.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DeleteOnNoLinksType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinks.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DeleteOnNoMessagesType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoMessages.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/DeliveryAnnotationsType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeliveryAnnotations.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/FooterType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Footer.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/HeaderType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Header.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/MessageAnnotationsType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/MessageAnnotations.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/ModifiedType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Modified.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/PropertiesType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Properties.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/ReceivedType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Received.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/RejectedType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Rejected.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/ReleasedType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Released.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/SourceType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Source.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/messaging/TargetType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Target.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/SaslChallengeType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/SaslChallenge.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/SaslInitType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/SaslInit.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/SaslMechanismsType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/SaslMechanisms.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/SaslOutcomeType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/SaslOutcome.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/security/SaslResponseType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/security/SaslResponse.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/CoordinatorType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/Coordinator.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/DeclareType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/Declare.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/DeclaredType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/Declared.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/DischargeType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/Discharge.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transaction/TransactionalStateType.java
      - copied, changed from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transaction/TransactionalState.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/AttachType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/BeginType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/CloseType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/DetachType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/DispositionType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/EndType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/ErrorConditionType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/FlowType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/OpenType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/TransferType.java
Removed:
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/
Modified:
    qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpReceiver.java
    qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java
    qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSession.java
    qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java
    qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
    qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/EncodedMessage.java
    qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
    qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformer.java
    qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/BinaryType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Data.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Decimal128Type.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Decimal32Type.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Decimal64Type.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Decoder.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/DecoderImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/DescribedTypeConstructor.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/DynamicDescribedType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/Encoder.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/EncoderImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/EncodingCodes.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/PrimitiveTypeEncoding.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/SymbolType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/TypeEncoding.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/UnsignedByteType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/UnsignedIntegerType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/UnsignedLongType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/UnsignedShortType.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/Driver.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Delivery.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslFrameParser.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportReceiver.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSender.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/framing/TransportFrame.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/AMQPMessageFormat.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/Message.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
    qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
    qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py

Modified: qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpReceiver.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpReceiver.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpReceiver.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpReceiver.java Wed Dec 12 13:32:32 2012
@@ -21,7 +21,7 @@ import org.apache.qpid.proton.hawtdispat
 import org.apache.qpid.proton.engine.Delivery;
 import org.apache.qpid.proton.engine.impl.DeliveryImpl;
 import org.apache.qpid.proton.engine.impl.ReceiverImpl;
-import org.apache.qpid.proton.type.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtbuf.ByteArrayOutputStream;
 

Modified: qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java Wed Dec 12 13:32:32 2012
@@ -23,11 +23,11 @@ import org.apache.qpid.proton.engine.Del
 import org.apache.qpid.proton.engine.impl.DeliveryImpl;
 import org.apache.qpid.proton.engine.impl.SenderImpl;
 import org.apache.qpid.proton.message.Message;
-import org.apache.qpid.proton.type.messaging.Accepted;
-import org.apache.qpid.proton.type.messaging.Modified;
-import org.apache.qpid.proton.type.messaging.Rejected;
-import org.apache.qpid.proton.type.messaging.Released;
-import org.apache.qpid.proton.type.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.Modified;
+import org.apache.qpid.proton.amqp.messaging.Rejected;
+import org.apache.qpid.proton.amqp.messaging.Released;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
 import org.fusesource.hawtbuf.Buffer;
 
 import java.io.UnsupportedEncodingException;

Modified: qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSession.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSession.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSession.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSession.java Wed Dec 12 13:32:32 2012
@@ -17,15 +17,17 @@
 
 package org.apache.qpid.proton.hawtdispatch.api;
 
+import org.apache.qpid.proton.amqp.messaging.Section;
+import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
 import org.apache.qpid.proton.engine.Endpoint;
 import org.apache.qpid.proton.engine.Link;
 import org.apache.qpid.proton.engine.impl.ReceiverImpl;
 import org.apache.qpid.proton.engine.impl.SenderImpl;
 import org.apache.qpid.proton.engine.impl.SessionImpl;
 import org.apache.qpid.proton.message.Message;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.messaging.*;
-import org.apache.qpid.proton.type.transport.SenderSettleMode;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.messaging.*;
+import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
 
 import java.util.UUID;
 
@@ -106,15 +108,15 @@ public class AmqpSession extends AmqpEnd
         switch (qos) {
             case AT_MOST_ONCE:
                 link.setSenderSettleMode(SenderSettleMode.SETTLED);
-                link.setReceiverSettleMode(SenderSettleMode.UNSETTLED);
+                link.setReceiverSettleMode(ReceiverSettleMode.FIRST);
                 break;
             case AT_LEAST_ONCE:
                 link.setSenderSettleMode(SenderSettleMode.UNSETTLED);
-                link.setReceiverSettleMode(SenderSettleMode.SETTLED);
+                link.setReceiverSettleMode(ReceiverSettleMode.FIRST);
                 break;
             case EXACTLY_ONCE:
                 link.setSenderSettleMode(SenderSettleMode.UNSETTLED);
-                link.setReceiverSettleMode(SenderSettleMode.MIXED);
+                link.setReceiverSettleMode(ReceiverSettleMode.SECOND);
                 break;
         }
     }

Modified: qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java Wed Dec 12 13:32:32 2012
@@ -24,7 +24,7 @@ import org.apache.qpid.proton.codec.Comp
 import org.apache.qpid.proton.codec.WritableBuffer;
 import org.apache.qpid.proton.engine.impl.DeliveryImpl;
 import org.apache.qpid.proton.message.Message;
-import org.apache.qpid.proton.type.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdispatch.Task;
 

Modified: qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java Wed Dec 12 13:32:32 2012
@@ -18,7 +18,7 @@ package org.apache.qpid.proton.jms;
 
 import org.apache.qpid.proton.codec.CompositeWritableBuffer;
 import org.apache.qpid.proton.codec.WritableBuffer;
-import org.apache.qpid.proton.type.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;

Modified: qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/EncodedMessage.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/EncodedMessage.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/EncodedMessage.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/EncodedMessage.java Wed Dec 12 13:32:32 2012
@@ -16,18 +16,21 @@
  */
 package org.apache.qpid.proton.jms;
 
+import java.nio.ByteBuffer;
 import org.apache.qpid.proton.message.Message;
-import org.apache.qpid.proton.type.Binary;
+import org.apache.qpid.proton.amqp.Binary;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-public class EncodedMessage extends Binary {
+public class EncodedMessage
+{
 
+    private final Binary data;
     final long messageFormat;
 
     public EncodedMessage(long messageFormat, byte[] data, int offset, int length) {
-        super(data, offset, length);
+        this.data = new Binary(data, offset, length);
         this.messageFormat = messageFormat;
     }
 
@@ -49,4 +52,25 @@ public class EncodedMessage extends Bina
 
         return amqp;
     }
+
+    public int getLength()
+    {
+        return data.getLength();
+    }
+
+    public int getArrayOffset()
+    {
+        return data.getArrayOffset();
+    }
+
+    public byte[] getArray()
+    {
+        return data.getArray();
+    }
+
+    @Override
+    public String toString()
+    {
+        return data.toString();
+    }
 }

Modified: qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java Wed Dec 12 13:32:32 2012
@@ -16,13 +16,13 @@
  */
 package org.apache.qpid.proton.jms;
 
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.messaging.ApplicationProperties;
-import org.apache.qpid.proton.type.messaging.DeliveryAnnotations;
-import org.apache.qpid.proton.type.messaging.Footer;
-import org.apache.qpid.proton.type.messaging.Header;
-import org.apache.qpid.proton.type.messaging.MessageAnnotations;
-import org.apache.qpid.proton.type.messaging.Properties;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.messaging.ApplicationProperties;
+import org.apache.qpid.proton.amqp.messaging.DeliveryAnnotations;
+import org.apache.qpid.proton.amqp.messaging.Footer;
+import org.apache.qpid.proton.amqp.messaging.Header;
+import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.amqp.messaging.Properties;
 
 import javax.jms.*;
 import javax.jms.JMSException;

Modified: qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformer.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformer.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingInboundTransformer.java Wed Dec 12 13:32:32 2012
@@ -16,8 +16,9 @@
  */
 package org.apache.qpid.proton.jms;
 
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.messaging.*;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.messaging.Section;
+import org.apache.qpid.proton.amqp.messaging.*;
 
 import javax.jms.*;
 import java.io.Serializable;

Modified: qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java Wed Dec 12 13:32:32 2012
@@ -16,13 +16,14 @@
  */
 package org.apache.qpid.proton.jms;
 
+import org.apache.qpid.proton.amqp.messaging.Section;
 import org.apache.qpid.proton.codec.CompositeWritableBuffer;
 import org.apache.qpid.proton.codec.WritableBuffer;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.UnsignedByte;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.messaging.*;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.messaging.*;
 
 import javax.jms.*;
 import java.io.UnsupportedEncodingException;

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Binary.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Binary.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Binary.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Binary.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Binary.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Binary.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Binary.java Wed Dec 12 13:32:32 2012
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
 
 import static java.lang.Math.min;
 
-public class Binary
+public final class Binary
 {
 
     private final byte[] _data;

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal128.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal128.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal128.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal128.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal128.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal128.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal128.java Wed Dec 12 13:32:32 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.math.BigDecimal;
 
-public class Decimal128 extends Number
+public final class Decimal128 extends Number
 {
     private final BigDecimal _underlying;
     private final long _msb;

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal32.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal32.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal32.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal32.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal32.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal32.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal32.java Wed Dec 12 13:32:32 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.math.BigDecimal;
 
-public class Decimal32 extends Number
+public final class Decimal32 extends Number
 {
     private final BigDecimal _underlying;
     private final int _bits;

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal64.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal64.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal64.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal64.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal64.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Decimal64.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Decimal64.java Wed Dec 12 13:32:32 2012
@@ -19,11 +19,11 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.math.BigDecimal;
 
-public class Decimal64 extends Number
+public final class Decimal64 extends Number
 {
     private final BigDecimal _underlying;
     private final long _bits;

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/DescribedType.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/DescribedType.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/DescribedType.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/DescribedType.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/DescribedType.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/DescribedType.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/DescribedType.java Wed Dec 12 13:32:32 2012
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 public interface DescribedType
 {

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Symbol.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Symbol.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Symbol.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Symbol.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Symbol.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/Symbol.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/Symbol.java Wed Dec 12 13:32:32 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.util.concurrent.ConcurrentHashMap;
 

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedByte.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedByte.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedByte.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedByte.java Wed Dec 12 13:32:32 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 public final class UnsignedByte extends Number implements Comparable<UnsignedByte>
 {

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedInteger.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedInteger.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedInteger.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedInteger.java Wed Dec 12 13:32:32 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 public final class UnsignedInteger extends Number implements Comparable<UnsignedInteger>
 {

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedLong.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedLong.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedLong.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedLong.java Wed Dec 12 13:32:32 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 import java.math.BigInteger;
 

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedShort.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedShort.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/UnsignedShort.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/UnsignedShort.java Wed Dec 12 13:32:32 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.proton.type;
+package org.apache.qpid.proton.amqp;
 
 public final class UnsignedShort extends Number implements Comparable<UnsignedShort>
 {

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Accepted.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Accepted.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Accepted.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Accepted.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Accepted.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Accepted.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Accepted.java Wed Dec 12 13:32:32 2012
@@ -21,99 +21,16 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
 
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
 
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
 
-
-public class Accepted
-      implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState, Outcome
+public final class Accepted
+      implements DeliveryState, Outcome
 {
     private static final Accepted INSTANCE = new Accepted();
 
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000024L), Symbol.valueOf("amqp:accepted:list"),
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000024L);
-    private final AcceptedWrapper _wrapper = new AcceptedWrapper();
-
-
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _wrapper;
-    }
-
-    public Object get(final int index)
-    {
-
-        throw new IllegalStateException("Unknown index " + index);
-
-    }
-
-    public int size()
-    {
-        return 0;
-
-    }
-
-
-    public final class AcceptedWrapper extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return Accepted.this.get(index);
-        }
-
-        @Override
-        public int size()
-        {
-            return Accepted.this.size();
-        }
-    }
-
-    private static class AcceptedConstructor implements DescribedTypeConstructor<Accepted>
-    {
-
-        public Accepted newInstance(Object described)
-        {
-            List l = (List) described;
-
-            Accepted o = new Accepted();
-
-
-            return INSTANCE;
-        }
-
-        public Class<Accepted> getTypeClass()
-        {
-            return Accepted.class;
-        }
-    }
-
-
-    public static void register(Decoder decoder)
-    {
-        AcceptedConstructor constructor = new AcceptedConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
-    }
-
     @Override
     public String toString()
     {

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpSequence.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpSequence.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpSequence.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpSequence.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpSequence.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpSequence.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpSequence.java Wed Dec 12 13:32:32 2012
@@ -21,24 +21,13 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+package org.apache.qpid.proton.amqp.messaging;
 
+import java.util.List;
 
-public class AmqpSequence
-      implements DescribedType , Section
+public final class AmqpSequence
+      implements Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000076L), Symbol.valueOf("amqp:amqp-sequence:list"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000076L);
     private final List _value;
 
     public AmqpSequence(List value)
@@ -51,37 +40,13 @@ public class AmqpSequence
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class AmqpSequenceConstructor implements DescribedTypeConstructor<AmqpSequence>
-    {
-        public AmqpSequence newInstance(Object described)
-        {
-            return new AmqpSequence( (List) described );
-        }
-
-        public Class<AmqpSequence> getTypeClass()
-        {
-            return AmqpSequence.class;
-        }
-    }
-      
 
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        AmqpSequenceConstructor constructor = new AmqpSequenceConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "AmqpSequence{" +
+               _value +
+               '}';
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpValue.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpValue.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpValue.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpValue.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpValue.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/AmqpValue.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/AmqpValue.java Wed Dec 12 13:32:32 2012
@@ -21,23 +21,11 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
 
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class AmqpValue
-      implements DescribedType , Section
+public final class AmqpValue
+      implements  Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000077L), Symbol.valueOf("amqp:amqp-value:*"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000077L);
     private final Object _value;
 
     public AmqpValue(Object value)
@@ -50,37 +38,10 @@ public class AmqpValue
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class AmqpValueConstructor implements DescribedTypeConstructor<AmqpValue>
-    {
-        public AmqpValue newInstance(Object described)
-        {
-            return new AmqpValue( (Object) described );
-        }
-
-        public Class<AmqpValue> getTypeClass()
-        {
-            return AmqpValue.class;
-        }
-    }
-      
-
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        AmqpValueConstructor constructor = new AmqpValueConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "AmqpValue{" + _value + '}';
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/ApplicationProperties.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/ApplicationProperties.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/ApplicationProperties.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/ApplicationProperties.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/ApplicationProperties.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/ApplicationProperties.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/ApplicationProperties.java Wed Dec 12 13:32:32 2012
@@ -21,24 +21,13 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.Map;
-
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+package org.apache.qpid.proton.amqp.messaging;
 
+import java.util.Map;
 
-public class ApplicationProperties
-      implements DescribedType , Section
+public final class ApplicationProperties
+      implements Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000074L), Symbol.valueOf("amqp:application-properties:map"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000074L);
     private final Map _value;
 
     public ApplicationProperties(Map value)
@@ -51,37 +40,10 @@ public class ApplicationProperties
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class ApplicationPropertiesConstructor implements DescribedTypeConstructor<ApplicationProperties>
-    {
-        public ApplicationProperties newInstance(Object described)
-        {
-            return new ApplicationProperties( (Map) described );
-        }
-
-        public Class<ApplicationProperties> getTypeClass()
-        {
-            return ApplicationProperties.class;
-        }
-    }
-      
-
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        ApplicationPropertiesConstructor constructor = new ApplicationPropertiesConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "ApplicationProperties{" + _value + '}';
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Data.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Data.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Data.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Data.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Data.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Data.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Data.java Wed Dec 12 13:32:32 2012
@@ -21,23 +21,13 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
 
+import org.apache.qpid.proton.amqp.Binary;
 
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Data
-      implements DescribedType , Section
+public final class Data
+      implements Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000075L), Symbol.valueOf("amqp:data:binary"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000075L);
     private final Binary _value;
 
     public Data(Binary value)
@@ -50,37 +40,10 @@ public class Data
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class DataConstructor implements DescribedTypeConstructor<Data>
-    {
-        public Data newInstance(Object described)
-        {
-            return new Data( (Binary) described );
-        }
-
-        public Class<Data> getTypeClass()
-        {
-            return Data.class;
-        }
-    }
-      
-
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        DataConstructor constructor = new DataConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "Data{" + _value + '}';
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnClose.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnClose.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnClose.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnClose.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnClose.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnClose.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnClose.java Wed Dec 12 13:32:32 2012
@@ -21,94 +21,26 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
 
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class DeleteOnClose
-      implements DescribedType , LifetimePolicy
+public final class DeleteOnClose
+      implements LifetimePolicy
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x000000000000002bL), Symbol.valueOf("amqp:delete-on-close:list"), 
-    };
+    private static final DeleteOnClose INSTANCE = new DeleteOnClose();
 
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x000000000000002bL);
-    private final DeleteOnCloseWrapper _wrapper = new DeleteOnCloseWrapper();
-    
-    
-    public Object getDescriptor()
+    private DeleteOnClose()
     {
-        return DESCRIPTOR;
     }
 
-    public Object getDescribed()
+    @Override
+    public String toString()
     {
-        return _wrapper;
+        return "DeleteOnClose{}";
     }
-    
-    public Object get(final int index)
-    {
-
-        throw new IllegalStateException("Unknown index " + index);
-
-    }
-
-    public int size()
-    {
-        return 0;        
-
-    }
-
-
-    public final class DeleteOnCloseWrapper extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return DeleteOnClose.this.get(index);
-        }
-
-        @Override
-        public int size()
-        {
-            return DeleteOnClose.this.size();
-        }
-    }
-
-    private static class DeleteOnCloseConstructor implements DescribedTypeConstructor<DeleteOnClose>
-    {
-        public DeleteOnClose newInstance(Object described)
-        {
-            List l = (List) described;
-
-            DeleteOnClose o = new DeleteOnClose();
-
-
-            return o;
-        }
-
-        public Class<DeleteOnClose> getTypeClass()
-        {
-            return DeleteOnClose.class;
-        }
-    }
-
 
-    public static void register(Decoder decoder)
+    public static DeleteOnClose getInstance()
     {
-        DeleteOnCloseConstructor constructor = new DeleteOnCloseConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return INSTANCE;
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinks.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinks.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinks.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinks.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinks.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinks.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinks.java Wed Dec 12 13:32:32 2012
@@ -21,94 +21,26 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
 
 
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class DeleteOnNoLinks
-      implements DescribedType , LifetimePolicy
+public final class DeleteOnNoLinks implements LifetimePolicy
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x000000000000002cL), Symbol.valueOf("amqp:delete-on-no-links:list"), 
-    };
 
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x000000000000002cL);
-    private final DeleteOnNoLinksWrapper _wrapper = new DeleteOnNoLinksWrapper();
-    
-    
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
+    private static final DeleteOnNoLinks INSTANCE = new DeleteOnNoLinks();
 
-    public Object getDescribed()
-    {
-        return _wrapper;
-    }
-    
-    public Object get(final int index)
+    private DeleteOnNoLinks()
     {
-
-        throw new IllegalStateException("Unknown index " + index);
-
     }
 
-    public int size()
+    public String toString()
     {
-        return 0;        
-
+        return "DeleteOnNoLinks{}";
     }
 
-
-    public final class DeleteOnNoLinksWrapper extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return DeleteOnNoLinks.this.get(index);
-        }
-
-        @Override
-        public int size()
-        {
-            return DeleteOnNoLinks.this.size();
-        }
-    }
-
-    private static class DeleteOnNoLinksConstructor implements DescribedTypeConstructor<DeleteOnNoLinks>
-    {
-        public DeleteOnNoLinks newInstance(Object described)
-        {
-            List l = (List) described;
-
-            DeleteOnNoLinks o = new DeleteOnNoLinks();
-
-
-            return o;
-        }
-
-        public Class<DeleteOnNoLinks> getTypeClass()
-        {
-            return DeleteOnNoLinks.class;
-        }
-    }
-
-
-    public static void register(Decoder decoder)
+    public static DeleteOnNoLinks getInstance()
     {
-        DeleteOnNoLinksConstructor constructor = new DeleteOnNoLinksConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return INSTANCE;
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinksOrMessages.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinksOrMessages.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinksOrMessages.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinksOrMessages.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinksOrMessages.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoLinksOrMessages.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoLinksOrMessages.java Wed Dec 12 13:32:32 2012
@@ -21,94 +21,25 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
 
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class DeleteOnNoLinksOrMessages
-      implements DescribedType , LifetimePolicy
+public final class DeleteOnNoLinksOrMessages
+      implements LifetimePolicy
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x000000000000002eL), Symbol.valueOf("amqp:delete-on-no-links-or-messages:list"), 
-    };
+    private static final DeleteOnNoLinksOrMessages INSTANCE = new DeleteOnNoLinksOrMessages();
 
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x000000000000002eL);
-    private final DeleteOnNoLinksOrMessagesWrapper _wrapper = new DeleteOnNoLinksOrMessagesWrapper();
-    
-    
-    public Object getDescriptor()
+    private DeleteOnNoLinksOrMessages()
     {
-        return DESCRIPTOR;
     }
 
-    public Object getDescribed()
+    public String toString()
     {
-        return _wrapper;
+        return "DeleteOnNoLinksOrMessages{}";
     }
-    
-    public Object get(final int index)
-    {
-
-        throw new IllegalStateException("Unknown index " + index);
-
-    }
-
-    public int size()
-    {
-        return 0;        
-
-    }
-
-
-    public final class DeleteOnNoLinksOrMessagesWrapper extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return DeleteOnNoLinksOrMessages.this.get(index);
-        }
-
-        @Override
-        public int size()
-        {
-            return DeleteOnNoLinksOrMessages.this.size();
-        }
-    }
-
-    private static class DeleteOnNoLinksOrMessagesConstructor implements DescribedTypeConstructor<DeleteOnNoLinksOrMessages>
-    {
-        public DeleteOnNoLinksOrMessages newInstance(Object described)
-        {
-            List l = (List) described;
-
-            DeleteOnNoLinksOrMessages o = new DeleteOnNoLinksOrMessages();
-
-
-            return o;
-        }
-
-        public Class<DeleteOnNoLinksOrMessages> getTypeClass()
-        {
-            return DeleteOnNoLinksOrMessages.class;
-        }
-    }
-
 
-    public static void register(Decoder decoder)
+    public static DeleteOnNoLinksOrMessages getInstance()
     {
-        DeleteOnNoLinksOrMessagesConstructor constructor = new DeleteOnNoLinksOrMessagesConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return INSTANCE;
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoMessages.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoMessages.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoMessages.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoMessages.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoMessages.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeleteOnNoMessages.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeleteOnNoMessages.java Wed Dec 12 13:32:32 2012
@@ -21,94 +21,25 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
 
 
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class DeleteOnNoMessages
-      implements DescribedType , LifetimePolicy
+public final class DeleteOnNoMessages implements LifetimePolicy
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x000000000000002dL), Symbol.valueOf("amqp:delete-on-no-messages:list"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x000000000000002dL);
-    private final DeleteOnNoMessagesWrapper _wrapper = new DeleteOnNoMessagesWrapper();
+    private static final DeleteOnNoMessages INSTANCE = new DeleteOnNoMessages();
     
-    
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
+    private DeleteOnNoMessages()
     {
-        return _wrapper;
     }
     
-    public Object get(final int index)
-    {
-
-        throw new IllegalStateException("Unknown index " + index);
-
-    }
-
-    public int size()
-    {
-        return 0;        
-
-    }
-
-
-    public final class DeleteOnNoMessagesWrapper extends AbstractList
-    {
-
-        @Override
-        public Object get(final int index)
-        {
-            return DeleteOnNoMessages.this.get(index);
-        }
-
-        @Override
-        public int size()
-        {
-            return DeleteOnNoMessages.this.size();
-        }
-    }
-
-    private static class DeleteOnNoMessagesConstructor implements DescribedTypeConstructor<DeleteOnNoMessages>
+    public String toString()
     {
-        public DeleteOnNoMessages newInstance(Object described)
-        {
-            List l = (List) described;
-
-            DeleteOnNoMessages o = new DeleteOnNoMessages();
-
-
-            return o;
-        }
-
-        public Class<DeleteOnNoMessages> getTypeClass()
-        {
-            return DeleteOnNoMessages.class;
-        }
+        return "DeleteOnNoMessages{}";
     }
 
-
-    public static void register(Decoder decoder)
+    public static DeleteOnNoMessages getInstance()
     {
-        DeleteOnNoMessagesConstructor constructor = new DeleteOnNoMessagesConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return INSTANCE;
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeliveryAnnotations.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeliveryAnnotations.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/DeliveryAnnotations.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java Wed Dec 12 13:32:32 2012
@@ -21,24 +21,13 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.Map;
-
-
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+package org.apache.qpid.proton.amqp.messaging;
 
+import java.util.Map;
 
-public class DeliveryAnnotations
-      implements DescribedType , Section
+public final class DeliveryAnnotations
+      implements Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000071L), Symbol.valueOf("amqp:delivery-annotations:map"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000071L);
     private final Map _value;
 
     public DeliveryAnnotations(Map value)
@@ -51,37 +40,10 @@ public class DeliveryAnnotations
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class DeliveryAnnotationsConstructor implements DescribedTypeConstructor<DeliveryAnnotations>
-    {
-        public DeliveryAnnotations newInstance(Object described)
-        {
-            return new DeliveryAnnotations( (Map) described );
-        }
-
-        public Class<DeliveryAnnotations> getTypeClass()
-        {
-            return DeliveryAnnotations.class;
-        }
-    }
-      
-
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        DeliveryAnnotationsConstructor constructor = new DeliveryAnnotationsConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "DeliveryAnnotations{" + _value + '}';
     }
 }
   
\ No newline at end of file

Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Footer.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Footer.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Footer.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Footer.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Footer.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Footer.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Footer.java Wed Dec 12 13:32:32 2012
@@ -21,24 +21,14 @@
 */
 
 
-package org.apache.qpid.proton.type.messaging;
-import java.util.Map;
-
+package org.apache.qpid.proton.amqp.messaging;
 
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+import java.util.Map;
 
 
-public class Footer
-      implements DescribedType , Section
+public final class Footer
+      implements  Section
 {
-    private static final Object[] DESCRIPTORS =
-    {
-        UnsignedLong.valueOf(0x0000000000000078L), Symbol.valueOf("amqp:footer:map"), 
-    };
-
-    private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000078L);
     private final Map _value;
 
     public Footer(Map value)
@@ -51,37 +41,10 @@ public class Footer
         return _value;
     }
 
-    public Object getDescriptor()
-    {
-        return DESCRIPTOR;
-    }
-
-    public Object getDescribed()
-    {
-        return _value;
-    }
-
-    private static class FooterConstructor implements DescribedTypeConstructor<Footer>
-    {
-        public Footer newInstance(Object described)
-        {
-            return new Footer( (Map) described );
-        }
-
-        public Class<Footer> getTypeClass()
-        {
-            return Footer.class;
-        }
-    }
-      
-
-    public static void register(Decoder decoder)
+    @Override
+    public String toString()
     {
-        FooterConstructor constructor = new FooterConstructor();
-        for(Object descriptor : DESCRIPTORS)
-        {
-            decoder.register(descriptor, constructor);
-        }
+        return "Footer{" + _value + '}';
     }
 }
   
\ No newline at end of file



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