activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r468414 [1/7] - in /incubator/activemq/sandbox/qpid/src/main/java/org/apache: activemq/amqp/ activemq/amqp/broker/ activemq/amqp/command/ activemq/amqp/transport/ activemq/amqp/wireformat/ activemq/amqp/wireformat/v8_0/ activemq/qpid/broker...
Date Fri, 27 Oct 2006 15:27:30 GMT
Author: chirino
Date: Fri Oct 27 08:27:20 2006
New Revision: 468414

URL: http://svn.apache.org/viewvc?view=rev&rev=468414
Log:
- Changing the org.apache.activemq.qpid package to org.apache.activemq.amqp package.
- In an effort to be able to code share easier with the qpid team, un-did lots of the refactoring that moved
- the qpid message handling into an activemq package.  Most of the code that was not highly modified is now back under a org.apache.qpid package.  This should allows us to pick up patchs/updates from the qpid team easier.  Currenly that code is baselined from the 468240 revision.


Added:
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidBrokerService.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java   (contents, props changed)
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidConnection.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java   (contents, props changed)
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidTransportConnector.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/Session.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/
      - copied from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AMQDataBlock.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicContentHeaderProperties.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/CompositeAMQDataBlock.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/queue/CompositeAMQDataBlock.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/
      - copied from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/EncodingUtils.java   (contents, props changed)
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/ProtocolInitiation.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java
      - copied, changed from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/
      - copied from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/AMQException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/exchange/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/protocol/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/protocol/AMQConstant.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/AMQChannel.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ManagedChannel.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ack/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ack/TxAck.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/Exchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/Index.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/Managable.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/ManagedObject.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/protocol/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/Subscription.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/security/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/security/auth/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/security/auth/AuthenticationManager.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/security/auth/NullAuthenticationManager.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/store/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/store/MessageStore.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/txn/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/txn/TxnOp.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/util/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
Removed:
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderProperties.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Frame.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/AMQChannel.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/AMQConstant.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/ConsumerTagNotUniqueException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/ISession.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidBrokerService.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidConnection.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidTransportConnector.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/RequiredDeliveryException.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/Session.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/TxnBuffer.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/TxnOp.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/exchange/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/queue/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/security/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/store/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/transport/
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/EncodingUtils.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/ProtocolInitiation.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormat.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/QpidWireFormatFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/wireformat/v8_0/
Modified:
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicAckBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicDeliverBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetEmptyBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicPublishBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRecoverBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRejectBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicReturnBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelAlertBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionRedirectBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxStartOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeclareOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ExchangeDeleteOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FieldTable.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileAckBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileCancelOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileConsumeOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileDeliverBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileOpenOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FilePublishBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileQosOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileRejectBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileReturnBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/FileStageBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/HeartbeatBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/MethodBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueBindOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeclareOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueueDeleteOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/QueuePurgeOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamCancelOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamConsumeOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamDeliverBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamPublishBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamQosOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/StreamReturnBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestContentOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestIntegerOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestStringOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TestTableOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TunnelRequestBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxCommitOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxRollbackOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/TxSelectOkBody.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/Visitor.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/Proxy.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidServerTransportFilter.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/QpidTransportFactory.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/AccessRequestOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicAckBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicCancelOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicConsumeOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicDeliverBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetEmptyBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicGetOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicPublishBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicQosOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRecoverBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicRejectBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/BasicReturnBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelAlertBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelCloseBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelCloseOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelFlowBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelFlowOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelOpenBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ChannelOpenOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionCloseBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionCloseOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionOpenBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionOpenOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionRedirectBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionSecureBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionSecureOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionStartBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionStartOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionTuneBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ConnectionTuneOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/DtxSelectBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/DtxSelectOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/DtxStartBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/DtxStartOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ExchangeDeclareBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ExchangeDeclareOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ExchangeDeleteBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/ExchangeDeleteOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileAckBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileCancelBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileCancelOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileConsumeBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileConsumeOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileDeliverBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileOpenBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileOpenOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FilePublishBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileQosBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileQosOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileRejectBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileReturnBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/FileStageBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/MainRegistry.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/MethodBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueBindBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueBindOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueDeclareBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueDeclareOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueDeleteBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueueDeleteOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueuePurgeBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/QueuePurgeOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamCancelBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamCancelOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamConsumeBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamConsumeOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamDeliverBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamPublishBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamQosBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamQosOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/StreamReturnBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestContentBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestContentOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestIntegerBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestIntegerOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestStringBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestStringOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestTableBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TestTableOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TunnelRequestBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxCommitBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxCommitOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxRollbackBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxRollbackOkBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxSelectBodyMarshaller.java
    incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/TxSelectOkBodyMarshaller.java

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidBrokerService.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidBrokerService.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidBrokerService.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java Fri Oct 27 08:27:20 2006
@@ -1,19 +1,19 @@
-package org.apache.activemq.qpid.broker;
+package org.apache.activemq.amqp.broker;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.activemq.qpid.broker.exchange.DefaultExchangeFactory;
-import org.apache.activemq.qpid.broker.exchange.DefaultExchangeRegistry;
-import org.apache.activemq.qpid.broker.exchange.ExchangeRegistry;
-import org.apache.activemq.qpid.broker.queue.DefaultQueueRegistry;
-import org.apache.activemq.qpid.broker.queue.QueueRegistry;
-import org.apache.activemq.qpid.broker.security.AuthenticationManager;
-import org.apache.activemq.qpid.broker.security.NullAuthenticationManager;
-import org.apache.activemq.qpid.broker.store.MemoryMessageStore;
-import org.apache.activemq.qpid.broker.store.MessageStore;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.xbean.XBeanBrokerService;
+import org.apache.qpid.server.exchange.DefaultExchangeFactory;
+import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.queue.DefaultQueueRegistry;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.security.auth.AuthenticationManager;
+import org.apache.qpid.server.security.auth.NullAuthenticationManager;
+import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.store.MessageStore;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 
@@ -134,7 +134,7 @@
 		this.exchangeRegistry = messageRouter;
 	}
 	private ExchangeRegistry createExchangeRegistry() {
-		return new DefaultExchangeRegistry(new DefaultExchangeFactory());
+		return new DefaultExchangeRegistry(new DefaultExchangeFactory(getQueueRegistry()));
 	}
 
 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidConnection.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidConnection.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidConnection.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.broker;
+package org.apache.activemq.amqp.broker;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.apache.activemq.Service;
-import org.apache.activemq.qpid.command.ConnectionCloseBody;
-import org.apache.activemq.qpid.command.Frame;
+import org.apache.activemq.amqp.command.AMQDataBlock;
+import org.apache.activemq.amqp.command.ConnectionCloseBody;
 import org.apache.activemq.thread.Task;
 import org.apache.activemq.thread.TaskRunner;
 import org.apache.activemq.thread.TaskRunnerFactory;
@@ -78,7 +78,7 @@
         this.transport.setTransportListener(new DefaultTransportListener() {
             public void onCommand(Object o) {
 				try {
-					session.process((Frame) o);
+					session.process((AMQDataBlock) o);
 				} catch (Exception e) {
 					QpidConnection.this.onException(e);
 				}
@@ -94,7 +94,7 @@
 				        if( dispatchQueue.isEmpty() ) {
 				            return false;
 				        } else {
-				            Frame command = (Frame) dispatchQueue.remove(0);
+				            AMQDataBlock command = (AMQDataBlock) dispatchQueue.remove(0);
 				            oneway(command);
 				            return true;
 				        }
@@ -158,7 +158,7 @@
         } 
     }
         
-    protected void oneway(Frame command) {
+    protected void oneway(AMQDataBlock command) {
         try {
             transport.oneway(command);
         } catch (IOException e) {
@@ -166,7 +166,7 @@
         }
     }
 
-    public void onewayAsync(Frame frame) {
+    public void onewayAsync(AMQDataBlock frame) {
         if( taskRunner==null ) {
             oneway( frame );
         } else {

Propchange: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidTransportConnector.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidTransportConnector.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/QpidTransportConnector.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java Fri Oct 27 08:27:20 2006
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.qpid.broker;
+package org.apache.activemq.amqp.broker;
 
 import java.io.IOException;
 import java.net.URI;

Propchange: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/Session.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/Session.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/Session.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java Fri Oct 27 08:27:20 2006
@@ -1,4 +1,4 @@
-package org.apache.activemq.qpid.broker;
+package org.apache.activemq.amqp.broker;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,65 +6,70 @@
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.activemq.qpid.broker.exchange.Exchange;
-import org.apache.activemq.qpid.broker.exchange.ExchangeInUseException;
-import org.apache.activemq.qpid.broker.exchange.ExchangeRegistry;
-import org.apache.activemq.qpid.broker.queue.AMQQueue;
-import org.apache.activemq.qpid.broker.queue.QueueRegistry;
-import org.apache.activemq.qpid.broker.security.AuthenticationManager;
-import org.apache.activemq.qpid.broker.security.AuthenticationResult;
-import org.apache.activemq.qpid.broker.store.MessageStore;
-import org.apache.activemq.qpid.command.BasicAckBody;
-import org.apache.activemq.qpid.command.BasicCancelBody;
-import org.apache.activemq.qpid.command.BasicCancelOkBody;
-import org.apache.activemq.qpid.command.BasicConsumeBody;
-import org.apache.activemq.qpid.command.BasicConsumeOkBody;
-import org.apache.activemq.qpid.command.BasicPublishBody;
-import org.apache.activemq.qpid.command.BasicQosBody;
-import org.apache.activemq.qpid.command.BasicQosOkBody;
-import org.apache.activemq.qpid.command.BasicRecoverBody;
-import org.apache.activemq.qpid.command.ChannelCloseBody;
-import org.apache.activemq.qpid.command.ChannelCloseOkBody;
-import org.apache.activemq.qpid.command.ChannelFlowBody;
-import org.apache.activemq.qpid.command.ChannelFlowOkBody;
-import org.apache.activemq.qpid.command.ChannelOpenBody;
-import org.apache.activemq.qpid.command.ChannelOpenOkBody;
-import org.apache.activemq.qpid.command.ConnectionCloseBody;
-import org.apache.activemq.qpid.command.ConnectionCloseOkBody;
-import org.apache.activemq.qpid.command.ConnectionOpenBody;
-import org.apache.activemq.qpid.command.ConnectionOpenOkBody;
-import org.apache.activemq.qpid.command.ConnectionSecureBody;
-import org.apache.activemq.qpid.command.ConnectionSecureOkBody;
-import org.apache.activemq.qpid.command.ConnectionStartBody;
-import org.apache.activemq.qpid.command.ConnectionStartOkBody;
-import org.apache.activemq.qpid.command.ConnectionTuneBody;
-import org.apache.activemq.qpid.command.ConnectionTuneOkBody;
-import org.apache.activemq.qpid.command.ContentBody;
-import org.apache.activemq.qpid.command.ContentHeaderBody;
-import org.apache.activemq.qpid.command.ExchangeDeclareBody;
-import org.apache.activemq.qpid.command.ExchangeDeclareOkBody;
-import org.apache.activemq.qpid.command.ExchangeDeleteBody;
-import org.apache.activemq.qpid.command.ExchangeDeleteOkBody;
-import org.apache.activemq.qpid.command.Frame;
-import org.apache.activemq.qpid.command.HeartbeatBody;
-import org.apache.activemq.qpid.command.MethodBody;
-import org.apache.activemq.qpid.command.QueueBindBody;
-import org.apache.activemq.qpid.command.QueueBindOkBody;
-import org.apache.activemq.qpid.command.QueueDeclareBody;
-import org.apache.activemq.qpid.command.QueueDeclareOkBody;
-import org.apache.activemq.qpid.command.QueueDeleteBody;
-import org.apache.activemq.qpid.command.QueueDeleteOkBody;
-import org.apache.activemq.qpid.command.TxCommitBody;
-import org.apache.activemq.qpid.command.TxCommitOkBody;
-import org.apache.activemq.qpid.command.TxRollbackBody;
-import org.apache.activemq.qpid.command.TxRollbackOkBody;
-import org.apache.activemq.qpid.command.TxSelectBody;
-import org.apache.activemq.qpid.command.TxSelectOkBody;
-import org.apache.activemq.qpid.command.Visitor;
-import org.apache.activemq.qpid.wireformat.ProtocolInitiation;
+import org.apache.activemq.amqp.command.AMQDataBlock;
+import org.apache.activemq.amqp.command.BasicAckBody;
+import org.apache.activemq.amqp.command.BasicCancelBody;
+import org.apache.activemq.amqp.command.BasicCancelOkBody;
+import org.apache.activemq.amqp.command.BasicConsumeBody;
+import org.apache.activemq.amqp.command.BasicConsumeOkBody;
+import org.apache.activemq.amqp.command.BasicPublishBody;
+import org.apache.activemq.amqp.command.BasicQosBody;
+import org.apache.activemq.amqp.command.BasicQosOkBody;
+import org.apache.activemq.amqp.command.BasicRecoverBody;
+import org.apache.activemq.amqp.command.ChannelCloseBody;
+import org.apache.activemq.amqp.command.ChannelCloseOkBody;
+import org.apache.activemq.amqp.command.ChannelFlowBody;
+import org.apache.activemq.amqp.command.ChannelFlowOkBody;
+import org.apache.activemq.amqp.command.ChannelOpenBody;
+import org.apache.activemq.amqp.command.ChannelOpenOkBody;
+import org.apache.activemq.amqp.command.ConnectionCloseBody;
+import org.apache.activemq.amqp.command.ConnectionCloseOkBody;
+import org.apache.activemq.amqp.command.ConnectionOpenBody;
+import org.apache.activemq.amqp.command.ConnectionOpenOkBody;
+import org.apache.activemq.amqp.command.ConnectionSecureBody;
+import org.apache.activemq.amqp.command.ConnectionSecureOkBody;
+import org.apache.activemq.amqp.command.ConnectionStartBody;
+import org.apache.activemq.amqp.command.ConnectionStartOkBody;
+import org.apache.activemq.amqp.command.ConnectionTuneBody;
+import org.apache.activemq.amqp.command.ConnectionTuneOkBody;
+import org.apache.activemq.amqp.command.ContentBody;
+import org.apache.activemq.amqp.command.ContentHeaderBody;
+import org.apache.activemq.amqp.command.ExchangeDeclareBody;
+import org.apache.activemq.amqp.command.ExchangeDeclareOkBody;
+import org.apache.activemq.amqp.command.ExchangeDeleteBody;
+import org.apache.activemq.amqp.command.ExchangeDeleteOkBody;
+import org.apache.activemq.amqp.command.HeartbeatBody;
+import org.apache.activemq.amqp.command.MethodBody;
+import org.apache.activemq.amqp.command.QueueBindBody;
+import org.apache.activemq.amqp.command.QueueBindOkBody;
+import org.apache.activemq.amqp.command.QueueDeclareBody;
+import org.apache.activemq.amqp.command.QueueDeclareOkBody;
+import org.apache.activemq.amqp.command.QueueDeleteBody;
+import org.apache.activemq.amqp.command.QueueDeleteOkBody;
+import org.apache.activemq.amqp.command.TxCommitBody;
+import org.apache.activemq.amqp.command.TxCommitOkBody;
+import org.apache.activemq.amqp.command.TxRollbackBody;
+import org.apache.activemq.amqp.command.TxRollbackOkBody;
+import org.apache.activemq.amqp.command.TxSelectBody;
+import org.apache.activemq.amqp.command.TxSelectOkBody;
+import org.apache.activemq.amqp.command.Visitor;
+import org.apache.activemq.amqp.wireformat.ProtocolInitiation;
 import org.apache.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.ConsumerTagNotUniqueException;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeInUseException;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.security.auth.AuthenticationManager;
+import org.apache.qpid.server.security.auth.AuthenticationResult;
+import org.apache.qpid.server.store.MessageStore;
 
 /**
  * This is where most of the AMQP protocol handling magic happens. The session
@@ -73,7 +78,7 @@
  * 
  * @author chirino
  */
-public class Session implements ISession {
+public class Session implements AMQProtocolSession {
 
 	private static final Log log = LogFactory.getLog(Session.class);
 
@@ -93,7 +98,7 @@
 
 	private String virtualHost;
 
-	public boolean autoRegister;
+	public boolean autoRegister=true;
 
 	protected boolean failQueueDeleteIfNotFound = true;
 
@@ -410,7 +415,7 @@
 					BasicConsumeOkBody response = new BasicConsumeOkBody();
 					response.setChannel(body.getChannel());
 					response.setConsumerTag(consumerTag);
-					onewayAsync(response);
+					writeFrame(response);
 				}
 
 				// now allow queue to start async processing of any backlog of
@@ -641,7 +646,7 @@
 
 				TxRollbackOkBody response = new TxRollbackOkBody();
 				response.setChannel(body.getChannel());
-				onewayAsync(body);
+				writeFrame(body);
 
 				// Now resend all the unacknowledged messages back to the
 				// original subscribers.
@@ -682,15 +687,15 @@
 		this.connection = connection;
 	}
 
-	public void onewayAsync(Frame frame) {
+	public void writeFrame(AMQDataBlock frame) {
 		connection.onewayAsync(frame);
 	}
 
-	public void process(Frame frame) {
+	public void process(AMQDataBlock frame) {
 		try {
-			Frame response =  (Frame) frame.process(frameHandler);
+			AMQDataBlock response =  (AMQDataBlock) frame.process(frameHandler);
             if (response != null) {
-                onewayAsync(response);
+                writeFrame(response);
             }
 		} catch (Exception e) {
 			frameHandler = CONNECTION_CLOSING_HANDLER;
@@ -705,7 +710,7 @@
 				close.setClassId(0);
 				close.setMethodId(0);
 			}
-            onewayAsync(close);
+            writeFrame(close);
 		}
 	}
 
@@ -713,10 +718,10 @@
 		return connection.getRemoteAddress();
 	}
 
-	public AMQChannel getChannel(int channelId) throws Exception {
+	public AMQChannel getChannel(int channelId) throws AMQException {
 		AMQChannel channel = _channelMap.get(channelId);
 		if (channel == null) {
-			throw new Exception("Unknown channel " + channelId);
+			throw new AMQException("Unknown channel " + channelId);
 		}
 		return channel;
 	}

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AMQDataBlock.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AMQDataBlock.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AMQDataBlock.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/Frame.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AMQDataBlock.java Fri Oct 27 08:27:20 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 
-public abstract class Frame
+public abstract class AMQDataBlock
 {
     public int channel;
     public abstract byte getFrameType();

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/AccessRequestOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicAckBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicAckBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicAckBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicAckBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicCancelOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicConsumeOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicContentHeaderProperties.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicContentHeaderProperties.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicContentHeaderProperties.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/command/ContentHeaderProperties.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicContentHeaderProperties.java Fri Oct 27 08:27:20 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 
-public class ContentHeaderProperties 
+public class BasicContentHeaderProperties 
 {	
     public String contentType;
     public String encoding;
@@ -35,7 +35,7 @@
     public String appId;
     public String clusterId;
 
-    public ContentHeaderProperties()
+    public BasicContentHeaderProperties()
     {
     }
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicDeliverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicDeliverBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicDeliverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicDeliverBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetEmptyBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetEmptyBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetEmptyBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetEmptyBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicGetOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicPublishBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicPublishBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicPublishBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicPublishBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicQosOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRecoverBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRecoverBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRecoverBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRecoverBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRejectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRejectBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRejectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicRejectBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicReturnBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicReturnBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicReturnBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/BasicReturnBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelAlertBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelAlertBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelAlertBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelAlertBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelCloseOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelFlowOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ChannelOpenOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/CompositeAMQDataBlock.java (from r468132, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/queue/CompositeAMQDataBlock.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/CompositeAMQDataBlock.java?view=diff&rev=468414&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/queue/CompositeAMQDataBlock.java&r1=468132&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/CompositeAMQDataBlock.java&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/qpid/broker/queue/CompositeAMQDataBlock.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/CompositeAMQDataBlock.java Fri Oct 27 08:27:20 2006
@@ -15,22 +15,24 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.broker.queue;
+package org.apache.activemq.amqp.command;
 
-import org.apache.activemq.qpid.command.Frame;
-import org.apache.activemq.qpid.command.Visitor;
-
-
-public class CompositeAMQDataBlock extends Frame 
+/**
+ * This is a special frame that is used to group a sequence of frames 
+ * together so that they are marshalled together. 
+ * 
+ * @author chirino
+ */
+public class CompositeAMQDataBlock extends AMQDataBlock 
 {
-    private Frame[] _blocks;
+    private AMQDataBlock[] _blocks;
 
-    public CompositeAMQDataBlock(Frame[] blocks)
+    public CompositeAMQDataBlock(AMQDataBlock[] blocks)
     {
         _blocks = blocks;
     }
 
-    public Frame[] getBlocks()
+    public AMQDataBlock[] getBlocks()
     {
         return _blocks;
     }

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionCloseOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionOpenOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionRedirectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionRedirectBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionRedirectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionRedirectBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionSecureOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionStartOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ConnectionTuneOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentBody.java Fri Oct 27 08:27:20 2006
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.util.ByteSequence;
 
-public class ContentBody extends Frame
+public class ContentBody extends AMQDataBlock
 {
     public static final byte TYPE = 3;
     public ByteSequence payload;
@@ -46,6 +46,8 @@
 			return 0;
 		return payload.getLength();
 	}
-    
+
+	public void reduceBufferToFit() {
+	}
 
 }

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ContentHeaderBody.java Fri Oct 27 08:27:20 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 
-public class ContentHeaderBody extends Frame
+public class ContentHeaderBody extends AMQDataBlock
 {
     public static final byte TYPE = 2;
     public int classId;
@@ -26,7 +26,7 @@
     /** unsigned long but java can't handle that anyway when allocating byte array */
     public long bodySize;
     /** must never be null */
-    public ContentHeaderProperties properties;
+    public BasicContentHeaderProperties properties;
         
     public byte getFrameType()
     {
@@ -37,13 +37,13 @@
     {
     }
 
-    public ContentHeaderBody(ContentHeaderProperties props, int classId)
+    public ContentHeaderBody(BasicContentHeaderProperties props, int classId)
     {
         properties = props;
         this.classId = classId;
     }
 
-    public ContentHeaderBody(int classId, int weight, ContentHeaderProperties props, long bodySize)
+    public ContentHeaderBody(int classId, int weight, BasicContentHeaderProperties props, long bodySize)
     {
         this(props, classId);
         this.weight = weight;
@@ -70,11 +70,11 @@
 		this.classId = classId;
 	}
 
-	public ContentHeaderProperties getProperties() {
+	public BasicContentHeaderProperties getProperties() {
 		return properties;
 	}
 
-	public void setProperties(ContentHeaderProperties properties) {
+	public void setProperties(BasicContentHeaderProperties properties) {
 		this.properties = properties;
 	}
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 

Modified: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java?view=diff&rev=468414&r1=468132&r2=468414
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/DtxSelectOkBody.java Fri Oct 27 08:27:20 2006
@@ -16,7 +16,7 @@
  *
  */
     
-package org.apache.activemq.qpid.command;
+package org.apache.activemq.amqp.command;
 
 import org.apache.activemq.qpid.*;
 



Mime
View raw message