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 2007/03/22 14:15:14 UTC
svn commit: r521253 [1/10] - in /incubator/qpid/branches/java.multi_version:
./ gentools/src/org/apache/qpid/gentools/ gentools/templ.cpp/
gentools/templ.cpp/class/ gentools/templ.cpp/field/
gentools/templ.cpp/method/ gentools/templ.cpp/model/ gentools...
Author: rgodfrey
Date: Thu Mar 22 06:14:42 2007
New Revision: 521253
URL: http://svn.apache.org/viewvc?view=rev&rev=521253
Log:
made a copy
Added:
incubator/qpid/branches/java.multi_version/
- copied from r511387, incubator/qpid/trunk/qpid/
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/class/
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/field/
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/method/
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_Constants.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
- copied unchanged from r511387, incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.java/class/
incubator/qpid/branches/java.multi_version/gentools/templ.java/field/
incubator/qpid/branches/java.multi_version/gentools/templ.java/method/
incubator/qpid/branches/java.multi_version/gentools/templ.java/model/
incubator/qpid/branches/java.multi_version/gentools/templ.java/model/ProtocolVersionListClass.vm
incubator/qpid/branches/java.multi_version/gentools/templ.java/model/version/
incubator/qpid/branches/java.multi_version/gentools/templ.java/model/version/AmqpConstantsClass.vm
incubator/qpid/branches/java.multi_version/gentools/templ.java/model/version/MethodRegistryClass.vm
incubator/qpid/branches/java.multi_version/gentools/templ.net/class/
incubator/qpid/branches/java.multi_version/gentools/templ.net/field/
incubator/qpid/branches/java.multi_version/gentools/templ.net/method/
incubator/qpid/branches/java.multi_version/gentools/templ.net/model/
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/Main.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/output/
- copied from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/output/
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_0_9/
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_0_9/ChannelCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_0_9/ConnectionCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_0_9/ConnectionSecureMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_0_9/ConnectionTuneMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/BasicCancelOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/BasicDeliverMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/BasicReturnMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ChannelCloseMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ChannelCloseOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ChannelFlowOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionCloseMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionOpenOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionRedirectMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionSecureMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionStartMethodHandler.java (contents, props changed)
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ConnectionTuneMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/ExchangeBoundOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/amqp_8_0/QueueDeleteOkMethodHandler.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandlerImpl.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolOutputHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolOutputHandlerFactory.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/amqp_8_0/
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/amqp_8_0/ProtocolOutputHandler_8_0.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQConnectionWaitException.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedBodyTypeException.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/AMQUnexpectedFrameTypeException.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/MinaBrokerProxy.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQBodyImpl.java (contents, props changed)
- copied, changed from r511387, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java (contents, props changed)
- copied, changed from r511389, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/MainRegistry.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodFactory_8_0.java
incubator/qpid/branches/java.multi_version/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
incubator/qpid/branches/java.multi_version/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
- copied unchanged from r511389, incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
Removed:
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_Constants.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.cpp/MethodBodyClass.h.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.java/AmqpConstantsClass.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.java/MethodBodyClass.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.java/MethodRegistryClass.tmpl
incubator/qpid/branches/java.multi_version/gentools/templ.java/ProtocolVersionListClass.tmpl
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/store/ContentChunkAdapter.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/store/MessagePublishInfoAdapter.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
Modified:
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClass.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpField.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpModel.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/CppGenerator.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/Generator.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/Main.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/NodeAware.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/Printable.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/Utils.java
incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
incubator/qpid/branches/java.multi_version/java/broker/bin/qpid-server-bdb.bat
incubator/qpid/branches/java.multi_version/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
incubator/qpid/branches/java.multi_version/java/broker/etc/config.xml
incubator/qpid/branches/java.multi_version/java/broker/etc/log4j.xml
incubator/qpid/branches/java.multi_version/java/broker/etc/virtualhosts.xml
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
incubator/qpid/branches/java.multi_version/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
incubator/qpid/branches/java.multi_version/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
incubator/qpid/branches/java.multi_version/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
incubator/qpid/branches/java.multi_version/java/client/src/old_test/java/org/apache/qpid/framing/FieldTableTest.java
incubator/qpid/branches/java.multi_version/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
incubator/qpid/branches/java.multi_version/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
incubator/qpid/branches/java.multi_version/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
incubator/qpid/branches/java.multi_version/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/BlockingHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/Broker.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/BrokerGroup.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientAdapter.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClusteredProtocolHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupRequest.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/GroupResponseHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/MethodHandlerRegistry.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/ResponseHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/ServerHandlerRegistry.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ChainedClusterMethodHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ClusterMethodHandlerFactory.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ExtendedHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/NullListener.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/PeerHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappedListener.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/WrappingMethodHandlerFactory.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ChainedMethodRecorder.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ConsumerCounts.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/MethodRecorder.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/RecordingMethodHandlerFactory.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayManager.java
incubator/qpid/branches/java.multi_version/java/cluster/src/main/java/org/apache/qpid/server/cluster/replay/ReplayStore.java
incubator/qpid/branches/java.multi_version/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
incubator/qpid/branches/java.multi_version/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
incubator/qpid/branches/java.multi_version/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
incubator/qpid/branches/java.multi_version/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClass.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClass.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClass.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClass.java Thu Mar 22 06:14:42 2007
@@ -20,129 +20,172 @@
*/
package org.apache.qpid.gentools;
-import java.io.PrintStream;
-
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class AmqpClass implements Printable, NodeAware
+import java.io.PrintStream;
+
+public class AmqpClass implements Printable, NodeAware
{
- public LanguageConverter converter;
- public AmqpVersionSet versionSet;
- public AmqpFieldMap fieldMap;
- public AmqpMethodMap methodMap;
- public String name;
- public AmqpOrdinalVersionMap indexMap;
-
- public AmqpClass(String name, LanguageConverter converter)
- {
- this.name = name;
- this.converter = converter;
- versionSet = new AmqpVersionSet();
- fieldMap = new AmqpFieldMap();
- methodMap = new AmqpMethodMap();
- indexMap = new AmqpOrdinalVersionMap();
- }
-
- public boolean addFromNode(Node classNode, int ordinal, AmqpVersion version)
- throws AmqpParseException, AmqpTypeMappingException
- {
- versionSet.add(version);
- int index = Utils.getNamedIntegerAttribute(classNode, "index");
- AmqpVersionSet indexVersionSet = indexMap.get(index);
- if (indexVersionSet != null)
- indexVersionSet.add(version);
- else
- {
- indexVersionSet = new AmqpVersionSet();
- indexVersionSet.add(version);
- indexMap.put(index, indexVersionSet);
- }
- NodeList nList = classNode.getChildNodes();
- int fieldCntr = fieldMap.size();
- for (int i=0; i<nList.getLength(); i++)
- {
- Node child = nList.item(i);
- if (child.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
- {
- String fieldName = converter.prepareDomainName(Utils.getNamedAttribute(child,
- Utils.ATTRIBUTE_NAME));
- AmqpField thisField = fieldMap.get(fieldName);
- if (thisField == null)
- {
- thisField = new AmqpField(fieldName, converter);
- fieldMap.put(fieldName, thisField);
- }
- if (!thisField.addFromNode(child, fieldCntr++, version))
- {
- String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
- Utils.ATTRIBUTE_NAME));
- System.out.println("INFO: Generation supression tag found for field " +
- className + "." + fieldName + " - removing.");
- thisField.removeVersion(version);
- fieldMap.remove(fieldName);
- }
- }
- else if (child.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
- {
- String methodName = converter.prepareMethodName(Utils.getNamedAttribute(child,
- Utils.ATTRIBUTE_NAME));
- AmqpMethod thisMethod = methodMap.get(methodName);
- if (thisMethod == null)
- {
- thisMethod = new AmqpMethod(methodName, converter);
- methodMap.put(methodName, thisMethod);
- }
- if (!thisMethod.addFromNode(child, 0, version))
- {
- String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
- Utils.ATTRIBUTE_NAME));
- System.out.println("INFO: Generation supression tag found for method " +
- className + "." + methodName + " - removing.");
- thisMethod.removeVersion(version);
- methodMap.remove(methodName);
- }
- }
- else if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
- {
- String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
- if (value.compareTo("no-gen") == 0)
- return false;
- }
- }
- return true;
- }
-
- public void removeVersion(AmqpVersion version)
- {
- indexMap.removeVersion(version);
- fieldMap.removeVersion(version);
- methodMap.removeVersion(version);
- versionSet.remove(version);
- }
-
- public void print(PrintStream out, int marginSize, int tabSize)
- {
- String margin = Utils.createSpaces(marginSize);
- String tab = Utils.createSpaces(tabSize);
- out.println(margin + "[C] " + name + ": " + versionSet);
-
- for (Integer thisIndex : indexMap.keySet())
- {
- AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
- out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
- }
-
- for (String thisFieldName : fieldMap.keySet())
- {
- AmqpField thisField = fieldMap.get(thisFieldName);
- thisField.print(out, marginSize + tabSize, tabSize);
- }
-
- for (String thisMethodName : methodMap.keySet())
- {
- AmqpMethod thisMethod = methodMap.get(thisMethodName);
- thisMethod.print(out, marginSize + tabSize, tabSize);
- }
- }
+
+ private final AmqpVersionSet _versionSet = new AmqpVersionSet();
+ private final AmqpFieldMap _fieldMap = new AmqpFieldMap();
+ private final AmqpMethodMap _methodMap = new AmqpMethodMap();
+ private final AmqpOrdinalVersionMap _indexMap = new AmqpOrdinalVersionMap();
+
+
+ private final String _name;
+ private final Generator _generator;
+
+ public AmqpClass(String name, Generator generator)
+ {
+ _name = name;
+ _generator = generator;
+ }
+
+ public boolean addFromNode(Node classNode, int ordinal, AmqpVersion version)
+ throws AmqpParseException, AmqpTypeMappingException
+ {
+ getVersionSet().add(version);
+ int index = Utils.getNamedIntegerAttribute(classNode, "index");
+ AmqpVersionSet indexVersionSet = getIndexMap().get(index);
+ if (indexVersionSet != null)
+ {
+ indexVersionSet.add(version);
+ }
+ else
+ {
+ indexVersionSet = new AmqpVersionSet();
+ indexVersionSet.add(version);
+ getIndexMap().put(index, indexVersionSet);
+ }
+ NodeList nList = classNode.getChildNodes();
+ int fieldCntr = getFieldMap().size();
+ for (int i = 0; i < nList.getLength(); i++)
+ {
+ Node child = nList.item(i);
+ if (child.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
+ {
+ String fieldName = getGenerator().prepareDomainName(Utils.getNamedAttribute(child,
+ Utils.ATTRIBUTE_NAME));
+ AmqpField thisField = getFieldMap().get(fieldName);
+ if (thisField == null)
+ {
+ thisField = new AmqpField(fieldName, getGenerator());
+ getFieldMap().add(fieldName, thisField);
+ }
+ if (!thisField.addFromNode(child, fieldCntr++, version))
+ {
+ String className = getGenerator().prepareClassName(Utils.getNamedAttribute(classNode,
+ Utils.ATTRIBUTE_NAME));
+ System.out.println("INFO: Generation supression tag found for field " +
+ className + "." + fieldName + " - removing.");
+ thisField.removeVersion(version);
+ getFieldMap().remove(fieldName);
+ }
+ }
+ else if (child.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
+ {
+ String methodName = getGenerator().prepareMethodName(Utils.getNamedAttribute(child,
+ Utils.ATTRIBUTE_NAME));
+ AmqpMethod thisMethod = getMethodMap().get(methodName);
+ if (thisMethod == null)
+ {
+ thisMethod = new AmqpMethod(methodName, getGenerator());
+ getMethodMap().put(methodName, thisMethod);
+ }
+ if (!thisMethod.addFromNode(child, 0, version))
+ {
+ String className = getGenerator().prepareClassName(Utils.getNamedAttribute(classNode,
+ Utils.ATTRIBUTE_NAME));
+ System.out.println("INFO: Generation supression tag found for method " +
+ className + "." + methodName + " - removing.");
+ thisMethod.removeVersion(version);
+ getMethodMap().remove(methodName);
+ }
+ }
+ else if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
+ {
+ String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
+ if (value.compareTo("no-gen") == 0)
+ {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ public void removeVersion(AmqpVersion version)
+ {
+ getIndexMap().removeVersion(version);
+ getFieldMap().removeVersion(version);
+ getMethodMap().removeVersion(version);
+ getVersionSet().remove(version);
+ }
+
+ public void print(PrintStream out, int marginSize, int tabSize)
+ {
+ String margin = Utils.createSpaces(marginSize);
+ String tab = Utils.createSpaces(tabSize);
+ out.println(margin + "[C] " + getName() + ": " + getVersionSet());
+
+ for (Integer thisIndex : getIndexMap().keySet())
+ {
+ AmqpVersionSet indexVersionSet = getIndexMap().get(thisIndex);
+ out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
+ }
+
+ for (String thisFieldName : getFieldMap().keySet())
+ {
+ AmqpField thisField = getFieldMap().get(thisFieldName);
+ thisField.print(out, marginSize + tabSize, tabSize);
+ }
+
+ for (String thisMethodName : getMethodMap().keySet())
+ {
+ AmqpMethod thisMethod = getMethodMap().get(thisMethodName);
+ thisMethod.print(out, marginSize + tabSize, tabSize);
+ }
+ }
+
+ public AmqpVersionSet getVersionSet()
+ {
+ return _versionSet;
+ }
+
+ public Generator getGenerator()
+ {
+ return _generator;
+ }
+
+
+ public AmqpFieldMap getFieldMap()
+ {
+ return _fieldMap;
+ }
+
+
+ public AmqpMethodMap getMethodMap()
+ {
+ return _methodMap;
+ }
+
+
+ public String getName()
+ {
+ return _name;
+ }
+
+
+ public AmqpOrdinalVersionMap getIndexMap()
+ {
+ return _indexMap;
+ }
+
+ public SingleVersionClass asSingleVersionClass(AmqpVersion version)
+ {
+ return new SingleVersionClass(this,version, _generator);
+ }
+
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java Thu Mar 22 06:14:42 2007
@@ -25,5 +25,5 @@
@SuppressWarnings("serial")
public class AmqpClassMap extends TreeMap<String, AmqpClass>
{
-
+
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstant.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstant.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstant.java Thu Mar 22 06:14:42 2007
@@ -25,151 +25,134 @@
/**
* @author kpvdr
- * Class to represent the <constant> declaration within the AMQP specification.
- * Currently, only integer values exist within the specification, however looking forward
- * to other possible types in the future, string and double types are also supported.
- *
- * The <constant> declaration in the specification contains only two attributes:
- * name and value.
- *
- * The value of the constant is mapped against the version(s) for which the name is defined.
- * This allows for a change in the value rather than the name only from one version to the next.
+ * Class to represent the <constant> declaration within the AMQP specification.
+ * Currently, only integer values exist within the specification, however looking forward
+ * to other possible types in the future, string and double types are also supported.
+ * <p/>
+ * The <constant> declaration in the specification contains only two attributes:
+ * name and value.
+ * <p/>
+ * The value of the constant is mapped against the version(s) for which the name is defined.
+ * This allows for a change in the value rather than the name only from one version to the next.
*/
@SuppressWarnings("serial")
public class AmqpConstant extends TreeMap<String, AmqpVersionSet>
- implements Printable, VersionConsistencyCheck, Comparable<AmqpConstant>
+ implements Printable, VersionConsistencyCheck, Comparable<AmqpConstant>
{
/**
* Constant name as defined by the name attribute of the <constant> declaration.
*/
- protected String name;
-
+ private final String _name;
+
/**
* Set of versions for which this constant name is defined.
*/
- protected AmqpVersionSet versionSet;
+ private final AmqpVersionSet _versionSet;
/**
* Constructor
- * @param name Constant name as defined by the name attribute of the <constant> declaration.
- * @param value Constant value as defined by the value attribute of the <constant> declaration.
+ *
+ * @param name Constant name as defined by the name attribute of the <constant> declaration.
+ * @param value Constant value as defined by the value attribute of the <constant> declaration.
* @param version AMQP version for which this constant is defined
*/
- public AmqpConstant (String name, String value, AmqpVersion version)
+ public AmqpConstant(String name, String value, AmqpVersion version)
{
- this.name = name;
- versionSet = new AmqpVersionSet(version);
- AmqpVersionSet valueVersionSet = new AmqpVersionSet(version);
+ _name = name;
+ _versionSet = new AmqpVersionSet(version);
+ AmqpVersionSet valueVersionSet = new AmqpVersionSet(version);
put(value, valueVersionSet);
- }
-
- /**
- * Constructor
- * @param name Constant name as defined by the name attribute of the <constant> declaration.
- * @param value Constant value as defined by the value attribute of the <constant> declaration.
- * @param version AMQP version for which this constant is defined
- */
- public AmqpConstant (String name, int value, AmqpVersion version)
- {
- this.name = name;
- versionSet = new AmqpVersionSet(version);
- AmqpVersionSet valueVersionSet = new AmqpVersionSet(version);
- put(String.valueOf(value), valueVersionSet);
}
- /**
- * Constructor
- * @param name Constant name as defined by the name attribute of the <constant> declaration.
- * @param value Constant value as defined by the value attribute of the <constant> declaration.
- * @param version AMQP version for which this constant is defined
- */
- public AmqpConstant (String name, double value, AmqpVersion version)
- {
- this.name = name;
- versionSet = new AmqpVersionSet(version);
- AmqpVersionSet valueVersionSet = new AmqpVersionSet(version);
- put(String.valueOf(value), valueVersionSet);
- }
/**
* Get the name of this constant.
+ *
* @return Name of this constant, being the name attribute of the <constant> declaration
- * represented by this class.
+ * represented by this class.
*/
public String getName()
{
- return name;
+ return _name;
}
-
+
/**
* Get the value of this constant as a String.
+ *
* @param version AMQP version for which this value is required.
* @return Value of this constant, being the value attribute of the <constant> declaration
- * represented by this class.
+ * represented by this class.
* @throws AmqpTypeMappingException when a value is requested for a version for which it is not
- * defined in the AMQP specifications.
+ * defined in the AMQP specifications.
*/
public String getStringValue(AmqpVersion version)
- throws AmqpTypeMappingException
+ throws AmqpTypeMappingException
{
- for (String thisValue : keySet())
+ for (String thisValue : keySet())
{
AmqpVersionSet versionSet = get(thisValue);
if (versionSet.contains(version))
+ {
return thisValue;
+ }
}
- throw new AmqpTypeMappingException("Unable to find value for constant \"" + name +
- "\" for version " + version.toString() + ".");
+ throw new AmqpTypeMappingException("Unable to find value for constant \"" + getName() +
+ "\" for version " + version.toString() + ".");
}
-
+
/**
* Get the value of this constant as an integer.
+ *
* @param version AMQP version for which this value is required.
* @return Value of this constant, being the value attribute of the <constant> declaration
- * represented by this class.
+ * represented by this class.
* @throws AmqpTypeMappingException when a value is requested for a version for which it is not
- * defined in the AMQP specifications.
+ * defined in the AMQP specifications.
*/
public int getIntegerValue(AmqpVersion version)
- throws AmqpTypeMappingException
+ throws AmqpTypeMappingException
{
return Integer.parseInt(getStringValue(version));
}
-
+
/**
* Get the value of this constant as a double.
+ *
* @param version AMQP version for which this value is required.
* @return Value of this constant, being the value attribute of the <constant> declaration
- * represented by this class.
+ * represented by this class.
* @throws AmqpTypeMappingException when a value is requested for a version for which it is not
- * defined in the AMQP specifications.
+ * defined in the AMQP specifications.
*/
public double getDoubleValue(AmqpVersion version)
- throws AmqpTypeMappingException
+ throws AmqpTypeMappingException
{
return Double.parseDouble(getStringValue(version));
}
-
+
/**
* Get the version set for this constant. It contains the all the versions for which this
* constant name exists.
+ *
* @return Set of versions for which this constant exists.
*/
public AmqpVersionSet getVersionSet()
{
- return versionSet;
+ return _versionSet;
}
-
+
/* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
-
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+
public int compareTo(AmqpConstant other)
{
- int res = name.compareTo(other.name);
+ int res = getName().compareTo(other.getName());
if (res != 0)
+ {
return res;
- return versionSet.compareTo(other.versionSet);
+ }
+ return getVersionSet().compareTo(other.getVersionSet());
}
/* (non-Javadoc)
@@ -178,7 +161,9 @@
public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
{
if (size() != 1)
+ {
return false;
+ }
return get(firstKey()).equals(globalVersionSet);
}
@@ -191,15 +176,16 @@
String tab = Utils.createSpaces(tabSize);
if (size() == 1)
{
- out.println(margin + tab + "[C] " + name + " = \"" + firstKey() + "\" " + versionSet);
+ out.println(margin + tab + "[C] " + getName() + " = \"" + firstKey() + "\" " + getVersionSet());
}
else
{
- out.println(margin + tab + "[C] " + name + ": " + versionSet);
+ out.println(margin + tab + "[C] " + getName() + ": " + getVersionSet());
for (String thisValue : keySet())
{
- out.println(margin + tab + tab + "= \"" + thisValue + "\" " + get(thisValue));
+ out.println(margin + tab + tab + "= \"" + thisValue + "\" " + get(thisValue));
}
}
}
+
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java Thu Mar 22 06:14:42 2007
@@ -20,55 +20,58 @@
*/
package org.apache.qpid.gentools;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import java.io.PrintStream;
import java.util.Iterator;
import java.util.TreeSet;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
/**
* @author kpvdr
- * This class implements a set collection for {@link #AmqpConstant AmqpConstant} objects, being the collection
- * of constants accumulated from various AMQP specification files processed. Each name occurs once only in the set.
- * The {@link #AmqpConstant AmqpConstant} objects (derived from {@link java.util#TreeMap TreeMap}) keep track of
- * the value and version(s) assigned to this name.
+ * This class implements a set collection for {@link AmqpConstant AmqpConstant} objects, being the collection
+ * of constants accumulated from various AMQP specification files processed. Each name occurs once only in the set.
+ * The {@link AmqpConstant AmqpConstant} objects (derived from {@link java.util.TreeMap TreeMap}) keep track of
+ * the value and version(s) assigned to this name.
*/
@SuppressWarnings("serial")
-public class AmqpConstantSet extends TreeSet<AmqpConstant> implements Printable, NodeAware, Comparable<AmqpConstantSet>
+public class AmqpConstantSet implements Printable, NodeAware //, Comparable<AmqpConstantSet>
{
- public LanguageConverter converter;
+ private final LanguageConverter _converter;
+ private final TreeSet<AmqpConstant> _constants = new TreeSet<AmqpConstant>();
+ private final AmqpVersionSet _versionSet = new AmqpVersionSet();
public AmqpConstantSet(LanguageConverter converter)
{
- this.converter = converter;
- this.converter.setConstantSet(this);
+ _converter = converter;
+
}
-
- /* (non-Javadoc)
- * @see org.apache.qpid.gentools.NodeAware#addFromNode(org.w3c.dom.Node, int, org.apache.qpid.gentools.AmqpVersion)
- */
+
+ /* (non-Javadoc)
+ * @see org.apache.qpid.gentools.NodeAware#addFromNode(org.w3c.dom.Node, int, org.apache.qpid.gentools.AmqpVersion)
+ */
public boolean addFromNode(Node node, int ordinal, AmqpVersion version)
- throws AmqpParseException, AmqpTypeMappingException
+ throws AmqpParseException, AmqpTypeMappingException
{
+ _versionSet.add(version);
NodeList nodeList = node.getChildNodes();
- for (int i=0; i<nodeList.getLength(); i++)
+ for (int i = 0; i < nodeList.getLength(); i++)
{
Node childNode = nodeList.item(i);
if (childNode.getNodeName().compareTo(Utils.ELEMENT_CONSTANT) == 0)
{
- String name = converter.prepareDomainName(Utils.getNamedAttribute(childNode, Utils.ATTRIBUTE_NAME));
+ String name = getConverter().prepareConstantName(Utils.getNamedAttribute(childNode, Utils.ATTRIBUTE_NAME));
String value = Utils.getNamedAttribute(childNode, Utils.ATTRIBUTE_VALUE);
// Find this name in the existing set of objects
boolean foundName = false;
- Iterator<AmqpConstant> cItr = iterator();
+ Iterator<AmqpConstant> cItr = _constants.iterator();
while (cItr.hasNext() && !foundName)
{
AmqpConstant thisConstant = cItr.next();
- if (name.compareTo(thisConstant.name) == 0)
+ if (name.compareTo(thisConstant.getName()) == 0)
{
foundName = true;
- thisConstant.versionSet.add(version);
+ thisConstant.getVersionSet().add(version);
// Now, find the value in the map
boolean foundValue = false;
for (String thisValue : thisConstant.keySet())
@@ -76,7 +79,7 @@
if (value.compareTo(thisValue) == 0)
{
foundValue = true;
- // Add this version to existing version set.
+ // Add this version to existing version set.
AmqpVersionSet versionSet = thisConstant.get(thisValue);
versionSet.add(version);
}
@@ -85,49 +88,65 @@
if (!foundValue)
{
thisConstant.put(value, new AmqpVersionSet(version));
- }
+ }
}
}
// Check that the name was found - if not, add it
if (!foundName)
{
- add(new AmqpConstant(name, value, version));
+ _constants.add(new AmqpConstant(name, value, version));
}
- }
+ }
}
return true;
}
-
+
/* (non-Javadoc)
- * @see org.apache.qpid.gentools.Printable#print(java.io.PrintStream, int, int)
- */
+ * @see org.apache.qpid.gentools.Printable#print(java.io.PrintStream, int, int)
+ */
public void print(PrintStream out, int marginSize, int tabSize)
{
out.println(Utils.createSpaces(marginSize) + "Constants: ");
- for (AmqpConstant thisAmqpConstant : this)
+ for (AmqpConstant thisAmqpConstant : _constants)
{
- thisAmqpConstant.print(out, marginSize, tabSize);
+ thisAmqpConstant.print(out, marginSize, tabSize);
}
}
-
+
/* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(AmqpConstantSet other)
- {
- int res = size() - other.size();
- if (res != 0)
- return res;
- Iterator<AmqpConstant> cItr = iterator();
- Iterator<AmqpConstant> oItr = other.iterator();
- while (cItr.hasNext() && oItr.hasNext())
- {
- AmqpConstant constant = cItr.next();
- AmqpConstant oConstant = oItr.next();
- res = constant.compareTo(oConstant);
- if (res != 0)
- return res;
- }
- return 0;
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+// public int compareTo(AmqpConstantSet other)
+// {
+// int res = size() - other.size();
+// if (res != 0)
+// return res;
+// Iterator<AmqpConstant> cItr = iterator();
+// Iterator<AmqpConstant> oItr = other.iterator();
+// while (cItr.hasNext() && oItr.hasNext())
+// {
+// AmqpConstant constant = cItr.next();
+// AmqpConstant oConstant = oItr.next();
+// res = constant.compareTo(oConstant);
+// if (res != 0)
+// return res;
+// }
+// return 0;
+// }
+
+ public Iterable<? extends AmqpConstant> getContstants()
+ {
+ return _constants;
}
+
+ public AmqpVersionSet getVersionSet()
+ {
+ return _versionSet;
+ }
+
+ public LanguageConverter getConverter()
+ {
+ return _converter;
+ }
+
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomain.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomain.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomain.java Thu Mar 22 06:14:42 2007
@@ -26,53 +26,64 @@
@SuppressWarnings("serial")
public class AmqpDomain extends TreeMap<String, AmqpVersionSet> implements Printable
{
- public String domainName;
+ private final String _domainName;
+
+ public AmqpDomain(String domainName)
+ {
+ _domainName = domainName;
+ }
+
+ public void addDomain(String domainType, AmqpVersion version) throws AmqpParseException
+ {
+ AmqpVersionSet versionSet = get(domainType);
+ if (versionSet == null) // First time, create new entry
+ {
+ versionSet = new AmqpVersionSet();
+ put(domainType, versionSet);
+ }
+ versionSet.add(version);
+ }
+
+ public String getDomainType(AmqpVersion version)
+ throws AmqpTypeMappingException
+ {
+ for (String thisDomainType : keySet())
+ {
+ AmqpVersionSet versionSet = get(thisDomainType);
+ if (versionSet.contains(version))
+ {
+ return thisDomainType;
+ }
+ }
+ throw new AmqpTypeMappingException("Unable to find version " + version + ".");
+ }
+
+ public boolean hasVersion(String type, AmqpVersion v)
+ {
+ AmqpVersionSet vs = get(type);
+ if (vs == null)
+ {
+ return false;
+ }
+ return vs.contains(v);
+ }
+
+ public void print(PrintStream out, int marginSize, int tabSize)
+ {
+ String margin = Utils.createSpaces(marginSize);
+ String tab = Utils.createSpaces(tabSize);
+ out.println(margin + getDomainName() + ":");
+
+ for (String thisDomainType : keySet())
+ {
+ AmqpVersionSet vs = get(thisDomainType);
+ out.println(margin + tab + thisDomainType + " : " + vs.toString());
+ }
+ }
+
+ public String getDomainName()
+ {
+ return _domainName;
+ }
- public AmqpDomain(String domainName)
- {
- this.domainName = domainName;
- }
-
- public void addDomain(String domainType, AmqpVersion version) throws AmqpParseException
- {
- AmqpVersionSet versionSet = get(domainType);
- if (versionSet == null) // First time, create new entry
- {
- versionSet = new AmqpVersionSet();
- put(domainType, versionSet);
- }
- versionSet.add(version);
- }
-
- public String getDomainType(AmqpVersion version)
- throws AmqpTypeMappingException
- {
- for (String thisDomainType : keySet())
- {
- AmqpVersionSet versionSet = get(thisDomainType);
- if (versionSet.contains(version))
- return thisDomainType;
- } throw new AmqpTypeMappingException("Unable to find version " + version + ".");
- }
-
- public boolean hasVersion(String type, AmqpVersion v)
- {
- AmqpVersionSet vs = get(type);
- if (vs == null)
- return false;
- return vs.contains(v);
- }
-
- public void print(PrintStream out, int marginSize, int tabSize)
- {
- String margin = Utils.createSpaces(marginSize);
- String tab = Utils.createSpaces(tabSize);
- out.println(margin + domainName + ":");
-
- for (String thisDomainType : keySet())
- {
- AmqpVersionSet vs = get(thisDomainType);
- out.println(margin + tab + thisDomainType + " : " + vs.toString());
- }
- }
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java Thu Mar 22 06:14:42 2007
@@ -20,100 +20,109 @@
*/
package org.apache.qpid.gentools;
-import java.io.PrintStream;
-import java.util.TreeMap;
-
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.io.PrintStream;
+import java.util.TreeMap;
+
@SuppressWarnings("serial")
public class AmqpDomainMap extends TreeMap<String, AmqpDomain> implements Printable, NodeAware
{
- public LanguageConverter converter;
+ private final LanguageConverter _converter;
+
+ public AmqpDomainMap(LanguageConverter converter)
+ {
+ _converter = converter;
- public AmqpDomainMap(LanguageConverter converter)
- {
- this.converter = converter;
- this.converter.setDomainMap(this);
- }
-
- public boolean addFromNode(Node n, int o, AmqpVersion v)
- throws AmqpParseException, AmqpTypeMappingException
- {
- NodeList nl = n.getChildNodes();
- for (int i=0; i<nl.getLength(); i++)
- {
- Node c = nl.item(i);
- // All versions 0.9 and greater use <domain> for all domains
- if (c.getNodeName().compareTo(Utils.ELEMENT_DOMAIN) == 0)
- {
- String domainName = converter.prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_NAME));
- String type = Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE);
- AmqpDomain thisDomain = get(domainName);
- if (thisDomain == null)
- {
- thisDomain = new AmqpDomain(domainName);
- put(domainName, thisDomain);
- }
- thisDomain.addDomain(type, v);
- }
- // Version(s) 0.8 and earlier use <domain> for all complex domains and use
- // attribute <field type=""...> for simple types. Add these simple types to
- // domain list - but beware of duplicates!
- else if (c.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
- {
- try
- {
- String type = converter.prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE));
- AmqpDomain thisDomain = get(type);
- if (thisDomain == null)
- {
- thisDomain = new AmqpDomain(type);
- put(type, thisDomain);
- }
- if (!thisDomain.hasVersion(type, v))
- thisDomain.addDomain(type, v);
- }
- catch (AmqpParseException e) {} // Ignore fields without type attribute
- }
- else if (c.getNodeName().compareTo(Utils.ELEMENT_CLASS) == 0 ||
- c.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
- {
- addFromNode(c, 0, v);
- }
- }
- return true;
- }
-
- public String getDomainType(String domainName, AmqpVersion version)
- throws AmqpTypeMappingException
- {
- AmqpDomain domainType = get(domainName);
- // For AMQP 8.0, primitive types were not described as domains, so
- // return itself as the type.
- if (domainType == null)
- {
- return domainName;
- }
- try
- {
- return domainType.getDomainType(version);
- }
- catch (AmqpTypeMappingException e)
- {
- throw new AmqpTypeMappingException("Unable to find domain type for domain \"" + domainName +
- "\" version " + version + ".");
- }
- }
-
-
- public void print(PrintStream out, int marginSize, int tabSize)
- {
+ }
+
+ public boolean addFromNode(Node n, int o, AmqpVersion v)
+ throws AmqpParseException, AmqpTypeMappingException
+ {
+ NodeList nl = n.getChildNodes();
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ Node c = nl.item(i);
+ // All versions 0.9 and greater use <domain> for all domains
+ if (c.getNodeName().compareTo(Utils.ELEMENT_DOMAIN) == 0)
+ {
+ String domainName = getConverter().prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_NAME));
+ String type = Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE);
+ AmqpDomain thisDomain = get(domainName);
+ if (thisDomain == null)
+ {
+ thisDomain = new AmqpDomain(domainName);
+ put(domainName, thisDomain);
+ }
+ thisDomain.addDomain(type, v);
+ }
+ // Version(s) 0.8 and earlier use <domain> for all complex domains and use
+ // attribute <field type=""...> for simple types. Add these simple types to
+ // domain list - but beware of duplicates!
+ else if (c.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
+ {
+ try
+ {
+ String type = getConverter().prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE));
+ AmqpDomain thisDomain = get(type);
+ if (thisDomain == null)
+ {
+ thisDomain = new AmqpDomain(type);
+ put(type, thisDomain);
+ }
+ if (!thisDomain.hasVersion(type, v))
+ {
+ thisDomain.addDomain(type, v);
+ }
+ }
+ catch (AmqpParseException e)
+ {
+ } // Ignore fields without type attribute
+ }
+ else if (c.getNodeName().compareTo(Utils.ELEMENT_CLASS) == 0 ||
+ c.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
+ {
+ addFromNode(c, 0, v);
+ }
+ }
+ return true;
+ }
+
+ public String getDomainType(String domainName, AmqpVersion version)
+ {
+ AmqpDomain domainType = get(domainName);
+ // For AMQP 8.0, primitive types were not described as domains, so
+ // return itself as the type.
+ if (domainType == null)
+ {
+ return domainName;
+ }
+ try
+ {
+ return domainType.getDomainType(version);
+ }
+ catch (AmqpTypeMappingException e)
+ {
+ throw new AmqpTypeMappingException("Unable to find domain type for domain \"" + domainName +
+ "\" version " + version + ".");
+ }
+ }
+
+
+ public void print(PrintStream out, int marginSize, int tabSize)
+ {
out.println(Utils.createSpaces(marginSize) + "Domain Map:");
for (String thisDomainName : keySet())
- {
- AmqpDomain domain = get(thisDomainName);
- domain.print(out, marginSize + tabSize, tabSize);
- }
- }
+ {
+ AmqpDomain domain = get(thisDomainName);
+ domain.print(out, marginSize + tabSize, tabSize);
+ }
+ }
+
+ public LanguageConverter getConverter()
+ {
+ return _converter;
+ }
+
}
Modified: incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java?view=diff&rev=521253&r1=511387&r2=521253
==============================================================================
--- incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java (original)
+++ incubator/qpid/branches/java.multi_version/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java Thu Mar 22 06:14:42 2007
@@ -25,34 +25,38 @@
@SuppressWarnings("serial")
public class AmqpDomainVersionMap extends TreeMap<String, AmqpVersionSet> implements VersionConsistencyCheck
-{
- public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
- {
- if (size() != 1)
- return false;
- return get(firstKey()).equals(globalVersionSet);
- }
-
- public boolean removeVersion(AmqpVersion version)
- {
- Boolean res = false;
- ArrayList<String> removeList = new ArrayList<String>();
- for (String domainName : keySet())
- {
- AmqpVersionSet versionSet = get(domainName);
- if (versionSet.contains(version))
- {
- versionSet.remove(version);
- if (versionSet.isEmpty())
- removeList.add(domainName);
- res = true;
- }
- }
- // Get rid of domains no longer in use
- for (String domainName : removeList)
- {
- remove(domainName);
- }
- return res;
- }
+{
+ public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
+ {
+ if (size() != 1)
+ {
+ return false;
+ }
+ return get(firstKey()).equals(globalVersionSet);
+ }
+
+ public boolean removeVersion(AmqpVersion version)
+ {
+ Boolean res = false;
+ ArrayList<String> removeList = new ArrayList<String>();
+ for (String domainName : keySet())
+ {
+ AmqpVersionSet versionSet = get(domainName);
+ if (versionSet.contains(version))
+ {
+ versionSet.remove(version);
+ if (versionSet.isEmpty())
+ {
+ removeList.add(domainName);
+ }
+ res = true;
+ }
+ }
+ // Get rid of domains no longer in use
+ for (String domainName : removeList)
+ {
+ remove(domainName);
+ }
+ return res;
+ }
}