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 2014/10/17 16:23:22 UTC
svn commit: r1632583 [1/5] - in /qpid/trunk/qpid/java: ./
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/...
Author: rgodfrey
Date: Fri Oct 17 14:23:19 2014
New Revision: 1632583
URL: http://svn.apache.org/r1632583
Log:
QPID-6125 : [Java Broker] AMQP 0-8/9/9-1 protocol handler refactoring
Added:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTagInUseException.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTagInUseException.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverter.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverter.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnexpectedMethodException.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnexpectedMethodException.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ServerChannelMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerChannelMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ServerMethodProcessor.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodProcessor.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
- copied unchanged from r1632579, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
Removed:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/output/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockMessagePublishInfo.java
qpid/trunk/qpid/java/common/gentools/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPingBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelPongBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ChannelResumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxSelectOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/DtxStartOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileAckBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileCancelOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileConsumeOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileDeliverBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileOpenOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FilePublishBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileQosOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileRejectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileReturnBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FileStageBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageAppendBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCancelBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCheckpointBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageCloseBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageConsumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageEmptyBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageGetBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOffsetBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageOpenBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageQosBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRecoverBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageRejectBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageResumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MessageTransferBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamCancelOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamConsumeOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamDeliverBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamPublishBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamQosOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/StreamReturnBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestContentOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestIntegerOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestStringOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TestTableOkBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/TunnelRequestBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
Modified:
qpid/trunk/qpid/java/ (props changed)
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MaxChannelsTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/trunk/qpid/java/common/build-generate-sources.xml
qpid/trunk/qpid/java/common/pom.xml
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
Propchange: qpid/trunk/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/branches/QPID-6125-ProtocolRefactoring/java:r1628068-1632579
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1632583&r1=1632582&r2=1632583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java Fri Oct 17 14:23:19 2014
@@ -30,7 +30,18 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import com.sleepycat.bind.tuple.ByteBinding;
+import com.sleepycat.bind.tuple.LongBinding;
+import com.sleepycat.bind.tuple.TupleBase;
+import com.sleepycat.bind.tuple.TupleBinding;
+import com.sleepycat.bind.tuple.TupleInput;
+import com.sleepycat.bind.tuple.TupleOutput;
+import com.sleepycat.je.Database;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.Environment;
+import com.sleepycat.je.Transaction;
import org.apache.log4j.Logger;
+
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.AMQFrameDecodingException;
@@ -38,25 +49,14 @@ import org.apache.qpid.framing.AMQProtoc
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
-import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StorableMessageMetaData;
+import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding;
-import com.sleepycat.bind.tuple.ByteBinding;
-import com.sleepycat.bind.tuple.LongBinding;
-import com.sleepycat.bind.tuple.TupleBase;
-import com.sleepycat.bind.tuple.TupleBinding;
-import com.sleepycat.bind.tuple.TupleInput;
-import com.sleepycat.bind.tuple.TupleOutput;
-import com.sleepycat.je.Database;
-import com.sleepycat.je.DatabaseEntry;
-import com.sleepycat.je.Environment;
-import com.sleepycat.je.Transaction;
-
public class UpgradeFrom4To5 extends AbstractStoreUpgrade
{
private static final String OLD_DELIVERY_DB = "deliveryDb_v4";
@@ -662,34 +662,7 @@ public class UpgradeFrom4To5 extends Abs
final boolean mandatory = tupleInput.readBoolean();
final boolean immediate = tupleInput.readBoolean();
- return new MessagePublishInfo()
- {
-
- public AMQShortString getExchange()
- {
- return exchange;
- }
-
- public void setExchange(AMQShortString exchange)
- {
-
- }
-
- public boolean isImmediate()
- {
- return immediate;
- }
-
- public boolean isMandatory()
- {
- return mandatory;
- }
-
- public AMQShortString getRoutingKey()
- {
- return routingKey;
- }
- };
+ return new MessagePublishInfo(exchange, immediate, mandatory, routingKey);
}
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1632583&r1=1632582&r2=1632583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Fri Oct 17 14:23:19 2014
@@ -30,9 +30,7 @@ import java.util.Arrays;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
@@ -234,44 +232,14 @@ public class BDBMessageStoreTest extends
private MessagePublishInfo createPublishInfoBody_0_8()
{
- return new MessagePublishInfo()
- {
- public AMQShortString getExchange()
- {
- return new AMQShortString("exchange12345");
- }
-
- @Override
- public void setExchange(AMQShortString exchange)
- {
- }
-
- @Override
- public boolean isImmediate()
- {
- return false;
- }
-
- @Override
- public boolean isMandatory()
- {
- return true;
- }
-
- @Override
- public AMQShortString getRoutingKey()
- {
- return new AMQShortString("routingKey12345");
- }
- };
+ return new MessagePublishInfo(new AMQShortString("exchange12345"), false, true,
+ new AMQShortString("routingKey12345"));
}
private ContentHeaderBody createContentHeaderBody_0_8(BasicContentHeaderProperties props, int length)
{
- MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(ProtocolVersion.v0_9);
- int classForBasic = methodRegistry.createBasicQosOkBody().getClazz();
- return new ContentHeaderBody(classForBasic, 1, props, length);
+ return new ContentHeaderBody(props, length);
}
private BasicContentHeaderProperties createContentHeaderProperties_0_8()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org