You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/10/27 18:19:06 UTC
svn commit: r468441 [1/6] - in /incubator/activemq/sandbox/qpid: ./ specs/
src/main/java/org/apache/activemq/amqp/broker/
src/main/java/org/apache/activemq/amqp/command/
src/main/java/org/apache/activemq/amqp/transport/
src/main/java/org/apache/activem...
Author: chirino
Date: Fri Oct 27 09:18:49 2006
New Revision: 468441
URL: http://svn.apache.org/viewvc?view=rev&rev=468441
Log:
- updated code generators to generate marshallers to package v0_80
- Updated Qpid refs to Amqp in the activemq packages.
Added:
incubator/activemq/sandbox/qpid/specs/amqp-0.80.xml
- copied, changed from r468417, incubator/activemq/sandbox/qpid/specs/amqp-8.0.xml
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpBrokerService.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpConnection.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpSession.java
- copied, changed from r468417, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpTransportConnector.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/command/ProtocolInitiation.java
- copied, changed from r468417, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpProxy.java
- copied, changed from r468417, 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/AmqpServerTransportFilter.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/transport/AmqpTransportFactory.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/AccessRequestOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicAckBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicCancelOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicConsumeBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicConsumeOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicDeliverBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicGetBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicGetEmptyBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicGetOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicPublishBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicQosBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicQosOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicRecoverBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicRejectBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/BasicReturnBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelAlertBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelCloseBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelCloseOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelFlowBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelFlowOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelOpenBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ChannelOpenOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionCloseBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionCloseOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionOpenBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionOpenOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionRedirectBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionSecureBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionSecureOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionStartBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionStartOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionTuneBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ConnectionTuneOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/DtxSelectBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/DtxSelectOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/DtxStartBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/DtxStartOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/EncodingUtils.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ExchangeDeclareBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ExchangeDeclareOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ExchangeDeleteBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/ExchangeDeleteOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileAckBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileCancelBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileCancelOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileConsumeBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileConsumeOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileDeliverBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileOpenBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileOpenOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FilePublishBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileQosBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileQosOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileRejectBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileReturnBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/FileStageBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/MainRegistry.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/MethodBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueBindBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueBindOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueDeclareBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueDeclareOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueDeleteBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueueDeleteOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueuePurgeBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/QueuePurgeOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamCancelBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamCancelOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamConsumeBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamConsumeOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamDeliverBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamPublishBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamQosBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamQosOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/StreamReturnBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestContentBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestContentOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestIntegerBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestIntegerOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestStringBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestStringOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestTableBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TestTableOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TunnelRequestBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxCommitBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxCommitOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxRollbackBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxRollbackOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxSelectBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/TxSelectOkBodyMarshaller.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v0_80/results.out
incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/amqp
- copied, changed from r468417, incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid
incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/amqp
- copied, changed from r468417, incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid
Removed:
incubator/activemq/sandbox/qpid/specs/amqp-8.0.xml
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidBrokerService.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidConnection.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/QpidTransportConnector.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.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/EncodingUtils.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/ProtocolInitiation.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormat.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/QpidWireFormatFactory.java
incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/wireformat/v8_0/
incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/transport/qpid
incubator/activemq/sandbox/qpid/src/main/resources/META-INF/services/org/apache/activemq/wireformat/qpid
Modified:
incubator/activemq/sandbox/qpid/build.xml
incubator/activemq/sandbox/qpid/pom.xml
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/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/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/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/qpid/server/exchange/ManagedExchange.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/queue/ManagedQueue.java
incubator/activemq/sandbox/qpid/src/test/resources/activemq.xml
incubator/activemq/sandbox/qpid/stylesheets/command-java.xsl
incubator/activemq/sandbox/qpid/stylesheets/marshaller-java.xsl
Modified: incubator/activemq/sandbox/qpid/build.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/build.xml?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/build.xml (original)
+++ incubator/activemq/sandbox/qpid/build.xml Fri Oct 27 09:18:49 2006
@@ -50,8 +50,8 @@
<echo>Found AMQP specification file "${basedir}/specs/amqp-@{ver}.xml"; major=${@{ver}.amqp(major)} minor=${@{ver}.amqp(minor)}</echo>
<!-- Create directory; generate from specification file -->
- <mkdir dir="${target.src.dir}/org/apache/activemq/qpid/command"/>
- <saxon out="${target.src.dir}/org/apache/activemq/qpid/command/results.out"
+ <mkdir dir="${target.src.dir}/org/apache/activemq/amqp/command"/>
+ <saxon out="${target.src.dir}/org/apache/activemq/amqp/command/results.out"
src="${basedir}/specs/amqp-@{ver}.xml"
xsl="stylesheets/command.xsl">
<arg value="major=${@{ver}.amqp(major)}"/>
@@ -59,8 +59,8 @@
<arg value="registry_name=MainRegistry"/>
</saxon>
- <mkdir dir="${target.src.dir}/org/apache/activemq/qpid/wireformat/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}"/>
- <saxon out="${target.src.dir}/org/apache/activemq/qpid/wireformat/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/results.out"
+ <mkdir dir="${target.src.dir}/org/apache/activemq/amqp/wireformat/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}"/>
+ <saxon out="${target.src.dir}/org/apache/activemq/amqp/wireformat/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/results.out"
src="${basedir}/specs/amqp-@{ver}.xml"
xsl="stylesheets/marshaller.xsl">
<arg value="major=${@{ver}.amqp(major)}"/>
@@ -72,14 +72,14 @@
<property name="cluster.asl" value="resources/cluster.asl"/>
<property name="registry_template" value="resources/registry.template"/>
<property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
- <saxon out="${target.src.dir}/org/apache/activemq/qpid/command/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/cluster.out"
+ <saxon out="${target.src.dir}/org/apache/activemq/amqp/command/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/cluster.out"
src="${cluster.asl}"
xsl="stylesheets/framing.xsl">
<arg value="major=${@{ver}.amqp(major)}"/>
<arg value="minor=${@{ver}.amqp(minor)}"/>
<arg value="registry_name=ClusterRegistry"/>
</saxon>
- <saxon out="${target.src.dir}/org/apache/activemq/qpid/command/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/registry.out"
+ <saxon out="${target.src.dir}/org/apache/activemq/amqp/command/v${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/registry.out"
src="${registry_template}"
xsl="${registry_stylesheet}">
<arg value="major=${@{ver}.amqp(major)}"/>
@@ -91,7 +91,7 @@
</macrodef>
<target name="generate">
- <amqp ver="8.0"/>
+ <amqp ver="0.80"/>
</target>
</project>
Modified: incubator/activemq/sandbox/qpid/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/pom.xml?view=diff&rev=468441&r1=468440&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/pom.xml (original)
+++ incubator/activemq/sandbox/qpid/pom.xml Fri Oct 27 09:18:49 2006
@@ -28,9 +28,9 @@
<version>1.0-incubator-SNAPSHOT</version>
</parent>
- <artifactId>activemq-qpid</artifactId>
- <name>ActiveMQ :: Qpid</name>
- <description>The ActiveMQ Qpid implementation</description>
+ <artifactId>activemq-amqp</artifactId>
+ <name>ActiveMQ :: AMQP</name>
+ <description>The ActiveMQ AMQP implementation</description>
<dependencies>
@@ -158,8 +158,8 @@
<executions>
<execution>
<configuration>
- <namespace>http://activemq.org/config/qpid/1.0</namespace>
- <schema>target/activemq-qpid.xsd</schema>
+ <namespace>http://activemq.org/config/amqp/1.0</namespace>
+ <schema>target/activemq-amqp.xsd</schema>
</configuration>
<goals>
<goal>mapping</goal>
Copied: incubator/activemq/sandbox/qpid/specs/amqp-0.80.xml (from r468417, incubator/activemq/sandbox/qpid/specs/amqp-8.0.xml)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/specs/amqp-0.80.xml?view=diff&rev=468441&p1=incubator/activemq/sandbox/qpid/specs/amqp-8.0.xml&r1=468417&p2=incubator/activemq/sandbox/qpid/specs/amqp-0.80.xml&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/specs/amqp-8.0.xml (original)
+++ incubator/activemq/sandbox/qpid/specs/amqp-0.80.xml Fri Oct 27 09:18:49 2006
@@ -171,7 +171,7 @@
2006-07-03 (PH) - cosmetic clean-up of Basic.Recover comments.
-->
-<amqp major="8" minor="0" port="5672" comment="AMQ protocol 0.80">
+<amqp major="0" minor="80" port="5672" comment="AMQ protocol 0.80">
AMQ Protocol 0.80
<!--
Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpBrokerService.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpBrokerService.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpBrokerService.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpBrokerService.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,155 @@
+package org.apache.activemq.amqp.broker;
+
+import java.util.Iterator;
+import java.util.List;
+
+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;
+
+/**
+ * An ActiveMQ Message Broker with QPID support. It consists of a number of transport
+ * connectors, network connectors and a bunch of properties which can be used to
+ * configure the broker as its lazily created.
+ *
+ * @org.apache.xbean.XBean element="broker" rootElement="true"
+ * @version $Revision$
+ */
+public class AmqpBrokerService extends XBeanBrokerService {
+
+ private static final long serialVersionUID = -6748232926459870741L;
+
+ @SuppressWarnings("unchecked")
+ private List<AmqpTransportConnector> amqpConnectors = new CopyOnWriteArrayList();
+
+ private AuthenticationManager authenticationManager;
+
+ private MessageStore messageStore;
+
+ private ExchangeRegistry exchangeRegistry;
+
+ private QueueRegistry queueRegistry;
+
+ /**
+ * Adds a new transport connector
+ *
+ * @return the transport connector
+ * @throws Exception
+ */
+ public AmqpTransportConnector addAmqpConnector(AmqpTransportConnector connector) throws Exception {
+ amqpConnectors.add(connector);
+ return connector;
+ }
+
+
+ /**
+ * Stops and removes a transport connector from the broker.
+ *
+ * @param connector
+ * @return true if the connector has been previously added to the broker
+ * @throws Exception
+ */
+ public boolean removeAmqpConnector(AmqpTransportConnector connector) throws Exception {
+ boolean rc = amqpConnectors.remove(connector);
+ return rc;
+ }
+
+ /**
+ * Sets the transport connectors which this broker will listen on for new
+ * clients
+ *
+ * @org.apache.xbean.Property nestedType="org.apache.activemq.amqp.broker.AmqpTransportConnector"
+ */
+ public void setAmqpTransportConnectors(List transportConnectors) throws Exception {
+ for (Iterator iter = transportConnectors.iterator(); iter.hasNext();) {
+ AmqpTransportConnector connector = (AmqpTransportConnector) iter.next();
+ addAmqpConnector(connector);
+ }
+ }
+
+ @Override
+ protected void startAllConnectors() throws Exception {
+ for (AmqpTransportConnector connector : amqpConnectors) {
+ connector.setBrokerService(this);
+ connector.setTaskRunnerFactory(getTaskRunnerFactory());
+ connector.start();
+ }
+ super.startAllConnectors();
+ }
+
+ @Override
+ protected void stopAllConnectors(ServiceStopper stopper) {
+ super.stopAllConnectors(stopper);
+ for (AmqpTransportConnector connector : amqpConnectors) {
+ stopper.stop(connector);
+ }
+ }
+
+
+ public AuthenticationManager getAuthenticationManager() {
+ if( authenticationManager == null ) {
+ authenticationManager = createAuthenticationManager();
+ }
+ return authenticationManager;
+ }
+ public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+ this.authenticationManager = authenticationManager;
+ }
+ private AuthenticationManager createAuthenticationManager() {
+ return new NullAuthenticationManager();
+ }
+
+
+ public MessageStore getMessageStore() {
+ if( messageStore == null ) {
+ messageStore = createMessageStore();
+ }
+ return messageStore;
+ }
+ public void setMessageStore(MessageStore messageStore) {
+ this.messageStore = messageStore;
+ }
+ private MessageStore createMessageStore() {
+ return new MemoryMessageStore();
+ }
+
+
+ public ExchangeRegistry getExchangeRegistry() {
+ if( exchangeRegistry == null ) {
+ exchangeRegistry = createExchangeRegistry();
+ }
+ return exchangeRegistry;
+ }
+ public void setExchangeRegistry(ExchangeRegistry messageRouter) {
+ this.exchangeRegistry = messageRouter;
+ }
+ private ExchangeRegistry createExchangeRegistry() {
+ return new DefaultExchangeRegistry(new DefaultExchangeFactory(getQueueRegistry()));
+ }
+
+
+ public QueueRegistry getQueueRegistry() {
+ if( queueRegistry == null ) {
+ queueRegistry = createQueueRegistry();
+ }
+ return queueRegistry;
+ }
+ public void setQueueRegistry(QueueRegistry queueRegistry) {
+ this.queueRegistry = queueRegistry;
+ }
+ private QueueRegistry createQueueRegistry() {
+ return new DefaultQueueRegistry();
+ }
+
+
+}
Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpConnection.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpConnection.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpConnection.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpConnection.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,202 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.broker;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.activemq.Service;
+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;
+import org.apache.activemq.transport.DefaultTransportListener;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.util.ServiceSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision: 1.26 $
+ */
+@SuppressWarnings("unchecked")
+public class AmqpConnection implements Service {
+
+ private static final Log transportLog = LogFactory.getLog(AmqpConnection.class.getName() + ".Transport");
+ private static final Log serviceLog = LogFactory.getLog(AmqpConnection.class.getName() + ".Service");
+
+ // What this connection is attached to.
+ protected final AmqpTransportConnector connector;
+ private final Transport transport;
+
+ // Handles ansync dispatching..
+ protected final TaskRunner taskRunner;
+ protected final List dispatchQueue = Collections.synchronizedList(new LinkedList());
+
+ // Exception handling.
+ private boolean inServiceException=false;
+ protected IOException transportException;
+
+ protected boolean disposed=false;
+ private String remoteAddress;
+ private String localAdress;
+
+
+ /**
+ * @param connector
+ * @param transport
+ * @param broker
+ * @param taskRunnerFactory - can be null if you want direct dispatch to the transport else commands are sent async.
+ */
+ public AmqpConnection(AmqpTransportConnector connector, TaskRunnerFactory taskRunnerFactory, Transport transport) {
+
+ this.connector = connector;
+ this.transport = transport;
+ this.remoteAddress = transport.getRemoteAddress();
+ this.localAdress = connector.getUri().toString();
+
+ final AmqpSession session = new AmqpSession(this);
+
+ this.transport.setTransportListener(new DefaultTransportListener() {
+ public void onCommand(Object o) {
+ try {
+ session.process((AMQDataBlock) o);
+ } catch (Exception e) {
+ AmqpConnection.this.onException(e);
+ }
+ }
+ public void onException(IOException exception) {
+ onTransportException(exception);
+ }
+ });
+
+ if( taskRunnerFactory != null ) {
+ taskRunner = taskRunnerFactory.createTaskRunner( new Task() {
+ public boolean iterate() {
+ if( dispatchQueue.isEmpty() ) {
+ return false;
+ } else {
+ AMQDataBlock command = (AMQDataBlock) dispatchQueue.remove(0);
+ oneway(command);
+ return true;
+ }
+ }
+ }, "ActiveMQ Connection Dispatcher: "+remoteAddress );
+ } else {
+ taskRunner = null;
+ }
+
+ }
+
+ public void start() throws Exception {
+ transport.start();
+ connector.onStarted(this);
+ }
+
+ public void stop() throws Exception{
+
+ if(disposed)
+ return;
+ disposed=true;
+
+ connector.onStopped(this);
+ transport.stop();
+
+ if( taskRunner!=null )
+ taskRunner.shutdown();
+ }
+
+ public void onTransportException(IOException e) {
+ if( !disposed ) {
+ transportException = e;
+ if( transportLog.isDebugEnabled() )
+ transportLog.debug("Transport failed: "+e,e);
+ ServiceSupport.dispose(this);
+ }
+ }
+
+ public void onException(Throwable e) {
+
+ // are we a transport exception such as not being able to dispatch
+ // synchronously to a transport
+ if (e instanceof IOException) {
+ onTransportException((IOException) e);
+ }
+
+ else if( !disposed && !inServiceException ) {
+ inServiceException = true;
+ try {
+ if( serviceLog.isDebugEnabled() )
+ serviceLog.debug("Async error occurred: "+e,e);
+
+ ConnectionCloseBody cc = new ConnectionCloseBody();
+ cc.setReplyCode(200);
+ cc.setReplyText(e.getMessage());
+ onewayAsync(cc);
+
+ } finally {
+ inServiceException = false;
+ }
+ }
+ }
+
+ protected void oneway(AMQDataBlock command) {
+ try {
+ transport.oneway(command);
+ } catch (IOException e) {
+ onException(e);
+ }
+ }
+
+ public void onewayAsync(AMQDataBlock frame) {
+ if( taskRunner==null ) {
+ oneway( frame );
+ } else {
+ dispatchQueue.add( frame );
+ try {
+ taskRunner.wakeup();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ /**
+ * @return true if the Connection is connected
+ */
+ public boolean isConnected() {
+ return !disposed;
+ }
+
+ public String getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public String getLocalAddress() {
+ return localAdress;
+ }
+
+ public AmqpBrokerService getBrokerService() {
+ return connector.getBrokerService();
+ }
+
+
+}
Copied: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpSession.java (from r468417, incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpSession.java?view=diff&rev=468441&p1=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java&r1=468417&p2=incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpSession.java&r2=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/Session.java (original)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpSession.java Fri Oct 27 09:18:49 2006
@@ -40,6 +40,7 @@
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.ProtocolInitiation;
import org.apache.activemq.amqp.command.QueueBindBody;
import org.apache.activemq.amqp.command.QueueBindOkBody;
import org.apache.activemq.amqp.command.QueueDeclareBody;
@@ -53,7 +54,6 @@
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;
@@ -78,13 +78,13 @@
*
* @author chirino
*/
-public class Session implements AMQProtocolSession {
+public class AmqpSession implements AMQProtocolSession {
- private static final Log log = LogFactory.getLog(Session.class);
+ private static final Log log = LogFactory.getLog(AmqpSession.class);
private static final IdGenerator ID_GENERATOR = new IdGenerator();
- private final QpidConnection connection;
+ private final AmqpConnection connection;
private final Map<Integer, AMQChannel> _channelMap = new HashMap<Integer, AMQChannel>();
@@ -392,7 +392,7 @@
public Object processBasicRecoverBody(BasicRecoverBody body) throws Exception {
log.debug("Recover received on channel " + body.getChannel());
AMQChannel channel = getChannel(body.getChannel());
- channel.resend(Session.this);
+ channel.resend(AmqpSession.this);
return null;
}
@@ -410,7 +410,7 @@
try {
- String consumerTag = channel.subscribeToQueue(body.getConsumerTag(), queue, Session.this, !body.getNoAck());
+ String consumerTag = channel.subscribeToQueue(body.getConsumerTag(), queue, AmqpSession.this, !body.getNoAck());
if (!body.nowait) {
BasicConsumeOkBody response = new BasicConsumeOkBody();
response.setChannel(body.getChannel());
@@ -442,7 +442,7 @@
@Override
public Object processBasicCancelBody(BasicCancelBody body) throws Exception {
final AMQChannel channel = getChannel(body.getChannel());
- channel.unsubscribeConsumer(Session.this, body.getConsumerTag());
+ channel.unsubscribeConsumer(AmqpSession.this, body.getConsumerTag());
if (!body.getNowait()) {
BasicCancelOkBody response = new BasicCancelOkBody();
response.setChannel(body.getChannel());
@@ -473,7 +473,7 @@
// received
// it is routed to the exchange.
AMQChannel channel = getChannel(body.getChannel());
- channel.setPublishFrame(body, Session.this);
+ channel.setPublishFrame(body, AmqpSession.this);
}
return null;
}
@@ -651,7 +651,7 @@
// Now resend all the unacknowledged messages back to the
// original subscribers.
// (Must be done after the TxnRollback-ok response).
- channel.resend(Session.this);
+ channel.resend(AmqpSession.this);
return null;
} catch (Exception e) {
@@ -683,7 +683,7 @@
*/
private Visitor frameHandler = CONNECTION_NOT_STARTED_HANDLER;
- public Session(QpidConnection connection) {
+ public AmqpSession(AmqpConnection connection) {
this.connection = connection;
}
Added: incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpTransportConnector.java
URL: http://svn.apache.org/viewvc/incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpTransportConnector.java?view=auto&rev=468441
==============================================================================
--- incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpTransportConnector.java (added)
+++ incubator/activemq/sandbox/qpid/src/main/java/org/apache/activemq/amqp/broker/AmqpTransportConnector.java Fri Oct 27 09:18:49 2006
@@ -0,0 +1,230 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.amqp.broker;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.region.ConnectorStatistics;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportAcceptListener;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.util.ServiceSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * @org.apache.xbean.XBean
+ *
+ * @version $Revision: 1.6 $
+ */
+public class AmqpTransportConnector implements Service {
+
+ private static final Log log = LogFactory.getLog(AmqpTransportConnector.class);
+
+ private TransportServer server;
+ private URI uri;
+ private TaskRunnerFactory taskRunnerFactory = null;
+ protected CopyOnWriteArrayList connections = new CopyOnWriteArrayList();
+ private ConnectorStatistics statistics = new ConnectorStatistics();
+ private URI connectUri;
+ private String name;
+ private boolean disableAsyncDispatch=false;
+
+ private AmqpBrokerService brokerService;
+
+
+ /**
+ * @return Returns the connections.
+ */
+ public CopyOnWriteArrayList getConnections(){
+ return connections;
+ }
+
+ public AmqpTransportConnector(){
+ }
+
+ public TransportServer getServer() throws IOException, URISyntaxException {
+ if (server == null) {
+ setServer(createTransportServer());
+ }
+ return server;
+ }
+
+ public void setServer(TransportServer server) {
+ this.server = server;
+ this.server.setAcceptListener(new TransportAcceptListener() {
+ public void onAccept(Transport transport) {
+ try {
+ AmqpConnection connection = createConnection(transport);
+ connection.start();
+ }
+ catch (Exception e) {
+ String remoteHost = transport.getRemoteAddress();
+ ServiceSupport.dispose(transport);
+ onAcceptError(e, remoteHost);
+ }
+ }
+
+ public void onAcceptError(Exception error) {
+ onAcceptError(error,null);
+ }
+
+ private void onAcceptError(Exception error, String remoteHost) {
+ log.error("Could not accept connection " +
+ (remoteHost == null ? "" : "from " + remoteHost)
+ + ": " + error, error);
+ }
+ });
+ }
+
+ public URI getUri() {
+ if( uri == null ) {
+ try {
+ uri = getConnectUri();
+ } catch (Throwable e) {
+ }
+ }
+ return uri;
+ }
+
+ /**
+ * Sets the server transport URI to use if there is not a
+ * {@link TransportServer} configured via the
+ * {@link #setServer(TransportServer)} method. This value is used to lazy
+ * create a {@link TransportServer} instance
+ *
+ * @param uri
+ */
+ public void setUri(URI uri) {
+ this.uri = uri;
+ }
+
+ public TaskRunnerFactory getTaskRunnerFactory() {
+ return taskRunnerFactory;
+ }
+
+ public void setTaskRunnerFactory(TaskRunnerFactory taskRunnerFactory) {
+ this.taskRunnerFactory = taskRunnerFactory;
+ }
+
+ /**
+ * @return the statistics for this connector
+ */
+ public ConnectorStatistics getStatistics() {
+ return statistics;
+ }
+
+ public void start() throws Exception {
+ getServer().start();
+ log.info("Connector "+getName()+" Started");
+ }
+
+ public void stop() throws Exception {
+ ServiceStopper ss = new ServiceStopper();
+ if (server != null) {
+ ss.stop(server);
+ }
+ for (Iterator iter = connections.iterator(); iter.hasNext();) {
+ AmqpConnection c = (AmqpConnection) iter.next();
+ ss.stop(c);
+ }
+ ss.throwFirstException();
+ log.info("Connector "+getName()+" Stopped");
+ }
+
+ // Implementation methods
+ // -------------------------------------------------------------------------
+ protected AmqpConnection createConnection(Transport transport) throws IOException {
+ TaskRunnerFactory trf = disableAsyncDispatch ? null : taskRunnerFactory;
+ AmqpConnection answer = new AmqpConnection(this, trf, transport);
+ return answer;
+ }
+
+ protected TransportServer createTransportServer() throws IOException, URISyntaxException {
+ if (uri == null) {
+ throw new IllegalArgumentException("You must specify either a server or uri property");
+ }
+ return TransportFactory.bind(brokerService.getBrokerName(),uri);
+ }
+
+ public URI getConnectUri() throws IOException, URISyntaxException {
+ if( connectUri==null ) {
+ if( server !=null ) {
+ connectUri = server.getConnectURI();
+ }
+ }
+ return connectUri;
+ }
+
+ public void setConnectUri(URI transportUri) {
+ this.connectUri = transportUri;
+ }
+
+ public void onStarted(AmqpConnection connection) {
+ connections.add(connection);
+ }
+
+ public void onStopped(AmqpConnection connection) {
+ connections.remove(connection);
+ }
+
+ public String getName(){
+ if( name==null ){
+ uri = getUri();
+ if( uri != null ) {
+ name = uri.toString();
+ }
+ }
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String toString() {
+ String rc = getName();
+ if( rc == null )
+ rc = super.toString();
+ return rc;
+ }
+
+ public boolean isDisableAsyncDispatch() {
+ return disableAsyncDispatch;
+ }
+
+ public void setDisableAsyncDispatch(boolean disableAsyncDispatch) {
+ this.disableAsyncDispatch = disableAsyncDispatch;
+ }
+
+ public AmqpBrokerService getBrokerService() {
+ return brokerService;
+ }
+ public void setBrokerService(AmqpBrokerService brokerService) {
+ this.brokerService = brokerService;
+ }
+
+}
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class AccessRequestBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class AccessRequestOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicAckBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicCancelBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicCancelOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicConsumeBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicConsumeOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicDeliverBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicGetBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicGetEmptyBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicGetOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicPublishBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicQosBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicQosOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicRecoverBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicRejectBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class BasicReturnBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelAlertBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelCloseBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelCloseOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelFlowBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelFlowOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelOpenBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ChannelOpenOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionCloseBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionCloseOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionOpenBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionOpenOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionRedirectBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionSecureBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionSecureOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionStartBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionStartOkBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionTuneBody extends MethodBody
{
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=468441&r1=468440&r2=468441
==============================================================================
--- 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 09:18:49 2006
@@ -18,10 +18,8 @@
package org.apache.activemq.amqp.command;
-import org.apache.activemq.qpid.*;
-
/**
- * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=8, minor=0)]
+ * This class is autogenerated, do not modify. [From AMQ protocol 0.80 (major=0, minor=80)]
*/
public class ConnectionTuneOkBody extends MethodBody
{