activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r741774 [1/17] - in /activemq/activemq-cpp/trunk/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/exceptions/ main/activemq/state/ main/activemq/wireformat/openwire/marshal/ main/activemq/wireformat/openwire/marshal/v1/ ...
Date Fri, 06 Feb 2009 23:11:39 GMT
Author: tabish
Date: Fri Feb  6 23:11:28 2009
New Revision: 741774

URL: http://svn.apache.org/viewvc?rev=741774&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-100

Add a smart pointer implementation to allow for sharing of command objects without over copying them due to lifetime constraints on command elements.  Refactored the codebase to use smart pointers in the Commands and in the Core classes.  This results in less copying of commands and their associated data whenever messages are sent and received.  Also allows for safely storing pointers to Command Id type objects in STL containers without worrying about their lifetime.

Added:
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageTemplate.h   (with props)
Removed:
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQMessage.h
Modified:
    activemq/activemq-cpp/trunk/src/main/Makefile.am
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBlobMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageBase.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQObjectMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQObjectMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQQueue.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQStreamMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQTempQueue.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQTempTopic.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQTextMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQTopic.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerError.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerError.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/BrokerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Command.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionControl.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionError.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConnectionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerControl.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ConsumerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ControlCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataArrayResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DataResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DestinationInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/DiscoveryEvent.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ExceptionResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/FlushCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/IntegerResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalQueueAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTopicAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTrace.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/JournalTransaction.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/KeepAliveInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LastPartialCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/LocalTransactionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Message.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/WireFormatInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/WireFormatInfo.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h
    activemq/activemq-cpp/trunk/src/main/activemq/commands/srcmakefile.mk
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQAckHandler.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConsumer.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConsumer.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/DispatchData.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/BrokerException.h
    activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitor.h
    activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitorAdapter.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MarshallerFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SessionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/TransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ActiveMQTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BaseCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BrokerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionErrorMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SessionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/SubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/TransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQTempDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQTempQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQTempTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ActiveMQTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/FlushCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/KeepAliveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/LastPartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ProducerAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/ShutdownInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppClassesGenerator.java
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppHeadersGenerator.java
    activemq/activemq-cpp/trunk/src/main/java/org/apache/activemq/openwire/tool/AmqCppMarshallingClassesGenerator.java
    activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/transport/IOTransportTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/transport/correlator/ResponseCorrelatorTest.h

Modified: activemq/activemq-cpp/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/Makefile.am?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Fri Feb  6 23:11:28 2009
@@ -156,7 +156,6 @@
 h_sources = \
     activemq/library/ActiveMQCPP.h \
     activemq/core/ActiveMQProducer.h \
-    activemq/core/ActiveMQMessage.h \
     activemq/core/ActiveMQConnection.h \
     activemq/core/ActiveMQConnectionSupport.h \
     activemq/core/ActiveMQConnectionMetaData.h \

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBlobMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBlobMessage.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBlobMessage.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBlobMessage.h Fri Feb  6 23:11:28 2009
@@ -24,15 +24,16 @@
 #endif
 
 #include <activemq/util/Config.h>
-#include <activemq/commands/ActiveMQMessageBase.h>
+#include <activemq/commands/ActiveMQMessageTemplate.h>
 #include <cms/Message.h>
 #include <string>
+#include <memory>
 
 namespace activemq {
 namespace commands {
 
     class AMQCPP_API ActiveMQBlobMessage :
-        public ActiveMQMessageBase< cms::Message > {
+        public ActiveMQMessageTemplate< cms::Message > {
 
     private:
 
@@ -59,9 +60,9 @@
          * @returns new copy of this object.
          */
         virtual ActiveMQBlobMessage* cloneDataStructure() const {
-            ActiveMQBlobMessage* message = new ActiveMQBlobMessage();
+            std::auto_ptr<ActiveMQBlobMessage> message( new ActiveMQBlobMessage() );
             message->copyDataStructure( this );
-            return message;
+            return message.release();
         }
 
         /**
@@ -70,7 +71,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            ActiveMQMessageBase<cms::Message>::copyDataStructure( src );
+            ActiveMQMessageTemplate<cms::Message>::copyDataStructure( src );
         }
 
         /**
@@ -82,7 +83,7 @@
             std::ostringstream stream;
 
             stream << "Begin Class = ActiveMQBlobMessage" << std::endl;
-            stream << ActiveMQMessageBase<cms::Message>::toString();
+            stream << ActiveMQMessageTemplate<cms::Message>::toString();
             stream << "End Class = ActiveMQBlobMessage" << std::endl;
 
             return stream.str();
@@ -95,7 +96,7 @@
          * @returns true if DataStructure's are Equal.
          */
         virtual bool equals( const DataStructure* value ) const {
-            return ActiveMQMessageBase<cms::Message>::equals( value );
+            return ActiveMQMessageTemplate<cms::Message>::equals( value );
         }
 
     public:  // cms::Message

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.cpp Fri Feb  6 23:11:28 2009
@@ -24,7 +24,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQBytesMessage::ActiveMQBytesMessage() :
-    ActiveMQMessageBase< cms::BytesMessage >(),
+    ActiveMQMessageTemplate< cms::BytesMessage >(),
     dataInputStream( &inputStream ),
     dataOutputStream( &outputStream ) {
 
@@ -53,7 +53,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char* ActiveMQBytesMessage::getBodyBytes(void) const {
+const unsigned char* ActiveMQBytesMessage::getBodyBytes() const {
 
     try{
 
@@ -69,7 +69,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQBytesMessage::getBodyLength(void) const {
+std::size_t ActiveMQBytesMessage::getBodyLength() const {
 
     try{
         return getContent().size();
@@ -179,8 +179,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessage::writeBytes( const unsigned char* value,
-                         std::size_t offset,
-                         std::size_t length ) throw ( cms::CMSException ) {
+                                       std::size_t offset,
+                                       std::size_t length ) throw ( cms::CMSException ) {
 
     try{
         checkWriteOnly();

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQBytesMessage.h Fri Feb  6 23:11:28 2009
@@ -24,7 +24,7 @@
 #endif
 
 #include <activemq/util/Config.h>
-#include <activemq/commands/ActiveMQMessageBase.h>
+#include <activemq/commands/ActiveMQMessageTemplate.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/DataInputStream.h>
@@ -32,12 +32,13 @@
 #include <cms/BytesMessage.h>
 #include <vector>
 #include <string>
+#include <memory>
 
 namespace activemq{
 namespace commands{
 
     class AMQCPP_API ActiveMQBytesMessage :
-        public ActiveMQMessageBase< cms::BytesMessage > {
+        public ActiveMQMessageTemplate< cms::BytesMessage > {
 
     public:
 
@@ -56,9 +57,9 @@
          * @returns new copy of this object.
          */
         virtual ActiveMQBytesMessage* cloneDataStructure() const {
-            ActiveMQBytesMessage* message = new ActiveMQBytesMessage();
+            std::auto_ptr<ActiveMQBytesMessage> message( new ActiveMQBytesMessage() );
             message->copyDataStructure( this );
-            return message;
+            return message.release();
         }
 
         /**
@@ -67,7 +68,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            ActiveMQMessageBase<cms::BytesMessage>::copyDataStructure( src );
+            ActiveMQMessageTemplate<cms::BytesMessage>::copyDataStructure( src );
             this->reset();
         }
 
@@ -80,7 +81,7 @@
             std::ostringstream stream;
 
             stream << "Begin Class = ActiveMQBytesMessage" << std::endl;
-            stream << ActiveMQMessageBase<cms::BytesMessage>::toString();
+            stream << ActiveMQMessageTemplate<cms::BytesMessage>::toString();
             stream << "End Class = ActiveMQBytesMessage" << std::endl;
 
             return stream.str();
@@ -93,7 +94,7 @@
          * @returns true if DataStructure's are Equal.
          */
         virtual bool equals( const DataStructure* value ) const {
-            return ActiveMQMessageBase<cms::BytesMessage>::equals( value );
+            return ActiveMQMessageTemplate<cms::BytesMessage>::equals( value );
         }
 
     public:   // CMS Message
@@ -114,7 +115,7 @@
         virtual void clearBody(){
 
             // Invoke base class's version.
-            ActiveMQMessageBase<cms::BytesMessage>::clearBody();
+            ActiveMQMessageTemplate<cms::BytesMessage>::clearBody();
 
             // Set the stream in write only mode.
             readOnly = false;
@@ -130,10 +131,8 @@
          * @param Number of bytes in Buffer to copy
          * @throws CMSException
          */
-        virtual void setBodyBytes(
-            const unsigned char* buffer,
-            std::size_t numBytes )
-                throw( cms::CMSException );
+        virtual void setBodyBytes( const unsigned char* buffer,
+                                   std::size_t numBytes ) throw( cms::CMSException );
 
         /**
          * Gets the bytes that are contained in this message, user should
@@ -187,7 +186,6 @@
          */
         virtual void writeByte( unsigned char value ) throw ( cms::CMSException );
 
-
         /**
          * Reads a byte array from the bytes message stream.
          *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.cpp Fri Feb  6 23:11:28 2009
@@ -31,7 +31,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQMapMessage::ActiveMQMapMessage() :
-    ActiveMQMessageBase<cms::MapMessage>() {
+    ActiveMQMessageTemplate<cms::MapMessage>() {
     this->map = NULL;
 }
 
@@ -52,7 +52,7 @@
     try{
 
         // Let the base class do its thing.
-        ActiveMQMessageBase<cms::MapMessage>::beforeMarshal( wireFormat );
+        ActiveMQMessageTemplate<cms::MapMessage>::beforeMarshal( wireFormat );
 
         if( map != NULL && !map->isEmpty() ) {
             // Marshal as Content.

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMapMessage.h Fri Feb  6 23:11:28 2009
@@ -24,7 +24,7 @@
 #endif
 
 #include <activemq/util/Config.h>
-#include <activemq/commands/ActiveMQMessageBase.h>
+#include <activemq/commands/ActiveMQMessageTemplate.h>
 #include <activemq/util/PrimitiveMap.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 #include <cms/MapMessage.h>
@@ -35,11 +35,11 @@
 namespace commands{
 
     class AMQCPP_API ActiveMQMapMessage :
-        public ActiveMQMessageBase<cms::MapMessage> {
+        public ActiveMQMessageTemplate<cms::MapMessage> {
 
     private:
 
-        // Map Structure to hold unmarshalled Map Data
+        // Map Structure to hold unmarshaled Map Data
         mutable util::PrimitiveMap* map;
 
     public:
@@ -79,7 +79,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            ActiveMQMessageBase<cms::MapMessage>::copyDataStructure( src );
+            ActiveMQMessageTemplate<cms::MapMessage>::copyDataStructure( src );
 
             const ActiveMQMapMessage* srcMap =
                 dynamic_cast< const ActiveMQMapMessage* >( src );
@@ -105,7 +105,7 @@
             std::ostringstream stream;
 
             stream << "Begin Class = ActiveMQMapMessage" << std::endl;
-            stream << ActiveMQMessageBase<cms::MapMessage>::toString();
+            stream << ActiveMQMessageTemplate<cms::MapMessage>::toString();
             stream << "End Class = ActiveMQMapMessage" << std::endl;
 
             return stream.str();
@@ -118,7 +118,7 @@
          * @returns true if DataStructure's are Equal.
          */
         virtual bool equals( const DataStructure* value ) const {
-            return ActiveMQMessageBase<cms::MapMessage>::equals( value );
+            return ActiveMQMessageTemplate<cms::MapMessage>::equals( value );
         }
 
     public:   // CMS Message
@@ -129,8 +129,7 @@
          * @return new copy of this message
          */
         virtual cms::MapMessage* clone() const {
-            return dynamic_cast<cms::MapMessage*>(
-                this->cloneDataStructure() );
+            return dynamic_cast<cms::MapMessage*>( this->cloneDataStructure() );
         }
 
     public:   // CMS MapMessage
@@ -202,7 +201,7 @@
          */
         virtual void setBytes( const std::string& name,
                                const std::vector<unsigned char>& value )
-                                throw( cms::CMSException );
+                                   throw( cms::CMSException );
 
         /**
          * Returns the Char value of the Specified name

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.cpp Fri Feb  6 23:11:28 2009
@@ -23,7 +23,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQMessage::ActiveMQMessage() :
-    ActiveMQMessageBase<cms::Message>()
+    ActiveMQMessageTemplate<cms::Message>()
 {}
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessage.h Fri Feb  6 23:11:28 2009
@@ -18,14 +18,20 @@
 #ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQMESSAGE_H_
 #define _ACTIVEMQ_COMMANDS_ACTIVEMQMESSAGE_H_
 
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <cms/Message.h>
 #include <activemq/util/Config.h>
-#include <activemq/commands/ActiveMQMessageBase.h>
+#include <activemq/commands/ActiveMQMessageTemplate.h>
 
 namespace activemq{
 namespace commands{
 
     class AMQCPP_API ActiveMQMessage :
-        public ActiveMQMessageBase<cms::Message> {
+        public ActiveMQMessageTemplate<cms::Message> {
 
     public:
 
@@ -44,7 +50,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            ActiveMQMessageBase<cms::Message>::copyDataStructure( src );
+            ActiveMQMessageTemplate<cms::Message>::copyDataStructure( src );
         }
 
         /**
@@ -67,7 +73,7 @@
             std::ostringstream stream;
 
             stream << "Begin Class = ActiveMQMessage" << std::endl;
-            stream << ActiveMQMessageBase<cms::Message>::toString();
+            stream << ActiveMQMessageTemplate<cms::Message>::toString();
             stream << "Begin Class = ActiveMQMessage" << std::endl;
 
             return stream.str();
@@ -80,7 +86,7 @@
          * @returns true if DataStructure's are Equal.
          */
         virtual bool equals( const DataStructure* value ) const {
-            return ActiveMQMessageBase<cms::Message>::equals( value );
+            return ActiveMQMessageTemplate<cms::Message>::equals( value );
         }
 
     public:  // cms::Message
@@ -91,8 +97,7 @@
          * @return new copy of this message
          */
         virtual cms::Message* clone() const {
-            return dynamic_cast<cms::Message*>(
-                this->cloneDataStructure() );
+            return dynamic_cast<cms::Message*>( this->cloneDataStructure() );
         }
 
     };

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageBase.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageBase.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ActiveMQMessageBase.h Fri Feb  6 23:11:28 2009
@@ -20,12 +20,10 @@
 
 #include <activemq/commands/Message.h>
 #include <activemq/core/ActiveMQAckHandler.h>
-#include <activemq/core/ActiveMQMessage.h>
 #include <activemq/util/PrimitiveMap.h>
 #include <activemq/util/Config.h>
 #include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>
 #include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
-#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h>
 #include <cms/DeliveryMode.h>
 #include <decaf/util/Date.h>
 #include <memory>
@@ -40,26 +38,18 @@
      * core::ActiveMQMessage interface and the cms::Message method of which
      * T must be a derivation of.
      */
-    template< typename T>
-    class AMQCPP_API ActiveMQMessageBase : public T,
-                                           public Message,
-                                           public core::ActiveMQMessage {
+    class AMQCPP_API ActiveMQMessageBase : public Message {
     private:
 
         core::ActiveMQAckHandler* ackHandler;
-        int redeliveryCount;
-        util::PrimitiveMap properties;
-        std::auto_ptr<wireformat::openwire::utils::MessagePropertyInterceptor> propertiesInterceptor;
+
+    protected:  // TODO - Ugly Hack, fix this, protected data is a no-no.
+
+        activemq::util::PrimitiveMap properties;
 
     public:
 
-        ActiveMQMessageBase() {
-            this->ackHandler = NULL;
-            this->redeliveryCount = 0;
-            this->propertiesInterceptor.reset(
-                new wireformat::openwire::utils::MessagePropertyInterceptor(
-                    this, &this->properties ) );
-        }
+        ActiveMQMessageBase() : ackHandler( NULL ) {}
 
         virtual ~ActiveMQMessageBase() {}
 
@@ -69,20 +59,19 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            const ActiveMQMessageBase<T>* message =
-                dynamic_cast< const ActiveMQMessageBase<T>* >( src );
+            const ActiveMQMessageBase* message =
+                dynamic_cast< const ActiveMQMessageBase* >( src );
 
             this->properties.copy( message->properties );
             this->setAckHandler( message->getAckHandler() );
-            this->setRedeliveryCount( message->getRedeliveryCount() );
 
             commands::Message::copyDataStructure( src );
         }
 
         /**
-         * Indicates that this command is aware of Marshalling, and needs
-         * to have its Marshalling methods invoked.
-         * @returns boolean indicating desire to be in marshalling stages
+         * Indicates that this command is aware of Marshaling, and needs
+         * to have its Marshaling methods invoked.
+         * @returns boolean indicating desire to be in marshaling stages
          */
         virtual bool isMarshalAware() const {
             return true;
@@ -139,7 +128,6 @@
 
             stream << "Begin Class = ActiveMQMessageBase" << std::endl;
             stream << " Value of ackHandler = " << ackHandler << std::endl;
-            stream << " Value of redeliveryCount = " << this->redeliveryCount << std::endl;
             stream << " Value of properties = " << this->properties.toString() << std::endl;
             stream << commands::Message::toString();
             stream << "End Class = ActiveMQMessageBase" << std::endl;
@@ -155,8 +143,8 @@
          */
         virtual bool equals( const DataStructure* value ) const {
 
-            const ActiveMQMessageBase<T>* valuePtr =
-                dynamic_cast< const ActiveMQMessageBase<T>* >( value );
+            const ActiveMQMessageBase* valuePtr =
+                dynamic_cast< const ActiveMQMessageBase* >( value );
 
             if( value == NULL || valuePtr == NULL ) {
                 return false;
@@ -166,9 +154,6 @@
             if( ackHandler != valuePtr->getAckHandler() ){
                 return false;
             }
-            if( redeliveryCount != valuePtr->getRedeliveryCount() ) {
-                return false;
-            }
             if( !properties.equals( valuePtr->properties ) ) {
                 return false;
             }
@@ -181,8 +166,6 @@
             return true;
         }
 
-    public:   // core::ActiveMQMessage
-
         /**
          * Sets the Acknowledgment Handler that this Message will use
          * when the Acknowledge method is called.
@@ -202,29 +185,12 @@
         }
 
         /**
-         * Gets the number of times this message has been redelivered.
-         * @return redelivery count
-         */
-        virtual int getRedeliveryCount(void) const {
-            return redeliveryCount;
-        }
-
-        /**
-         * Sets the count of the number of times this message has been
-         * redelivered
-         * @param count the redelivery count
-         */
-        virtual void setRedeliveryCount( int count ) {
-            this->redeliveryCount = count;
-        }
-
-        /**
          * Returns if this message has expired, meaning that its
          * Expiration time has elapsed.
          * @returns true if message is expired.
          */
         virtual bool isExpired() const {
-            long long expireTime = this->getCMSExpiration();
+            long long expireTime = this->getExpiration();
             long long currentTime = decaf::util::Date::getCurrentTimeMilliseconds();
             if( expireTime > 0 && currentTime > expireTime ) {
                 return true;
@@ -232,509 +198,6 @@
             return false;
         }
 
-    public:   // CMS Message
-
-        /**
-         * Acknowledges all consumed messages of the session
-         * of this consumed message.
-         */
-        virtual void acknowledge() const throw( cms::CMSException ) {
-            try{
-                this->getAckHandler()->acknowledgeMessage( this );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Clears out the body of the message.  This does not clear the
-         * headers or properties.
-         */
-        virtual void clearBody() {
-            this->setContent( std::vector<unsigned char>() );
-        }
-
-        /**
-         * Clears the message properties.  Does not clear the body or
-         * header values.
-         */
-        virtual void clearProperties() {
-            properties.clear();
-        }
-
-        /**
-         * Retrieves the property names.
-         * @return The complete set of property names currently in this
-         * message.
-         */
-        virtual std::vector<std::string> getPropertyNames() const {
-            return properties.getKeys();
-        }
-
-        /**
-         * Indicates whether or not a given property exists.
-         * @param name The name of the property to look up.
-         * @return True if the property exists in this message.
-         */
-        virtual bool propertyExists( const std::string& name ) const {
-            return properties.containsKey( name );
-        }
-
-        /**
-         * Gets a boolean property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual bool getBooleanProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getBooleanProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a byte property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual unsigned char getByteProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getByteProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a double property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual double getDoubleProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getDoubleProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a float property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual float getFloatProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getFloatProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a int property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual int getIntProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getIntProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a long property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual long long getLongProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getLongProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a short property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual short getShortProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getShortProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Gets a string property.
-         * @param name The name of the property to retrieve.
-         * @return The value for the named property.
-         * @throws CMSException if the property does not exist.
-         */
-        virtual std::string getStringProperty( const std::string& name ) const
-            throw( cms::CMSException ) {
-
-            try{
-                return this->propertiesInterceptor->getStringProperty( name );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a boolean property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setBooleanProperty( const std::string& name,
-                                         bool value )
-                                            throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setBooleanProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a byte property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setByteProperty( const std::string& name,
-                                      unsigned char value )
-                                        throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setByteProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a double property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setDoubleProperty( const std::string& name,
-                                        double value )
-                                            throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setDoubleProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a float property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setFloatProperty( const std::string& name,
-                                       float value )
-                                        throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setFloatProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a int property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setIntProperty( const std::string& name,
-                                     int value )
-                                        throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setIntProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a long property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setLongProperty( const std::string& name,
-                                      long long value )
-                                        throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setLongProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a short property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setShortProperty( const std::string& name,
-                                       short value )
-                                        throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setShortProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Sets a string property.
-         * @param name The name of the property to retrieve.
-         * @param value The value for the named property.
-         * @throws CMSException
-         */
-        virtual void setStringProperty( const std::string& name,
-                                        const std::string& value )
-                                            throw( cms::CMSException ) {
-
-            try{
-                this->propertiesInterceptor->setStringProperty( name, value );
-            }
-            AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
-            AMQ_CATCH_EXCEPTION_CONVERT( decaf::lang::Exception, exceptions::ActiveMQException )
-            AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
-        }
-
-        /**
-         * Get the Correlation Id for this message
-         * @return string representation of the correlation Id
-         */
-        virtual std::string getCMSCorrelationID() const {
-            return this->getCorrelationId();
-        }
-
-        /**
-         * Sets the Correlation Id used by this message
-         * @param correlationId - String representing the correlation id.
-         */
-        virtual void setCMSCorrelationID( const std::string& correlationId ) {
-            this->setCorrelationId( correlationId );
-        }
-
-        /**
-         * Gets the DeliveryMode for this message
-         * @return DeliveryMode enumerated value.
-         */
-        virtual int getCMSDeliveryMode() const {
-            return this->isPersistent();
-        }
-
-        /**
-         * Sets the DeliveryMode for this message
-         * @param mode - DeliveryMode enumerated value.
-         */
-        virtual void setCMSDeliveryMode( int mode ) {
-            this->setPersistent( mode == (int)cms::DeliveryMode::PERSISTENT );
-        }
-
-        /**
-         * Gets the Destination for this Message, returns a
-         * @return Destination object
-         */
-        virtual const cms::Destination* getCMSDestination(void) const {
-            return dynamic_cast<const cms::Destination*>(
-                this->getDestination() );
-        }
-
-        /**
-         * Sets the Destination for this message
-         * @param destination - Destination Object
-         */
-        virtual void setCMSDestination( const cms::Destination* destination ) {
-
-            delete getDestination();
-            if( destination != NULL ) {
-                this->setDestination(
-                    dynamic_cast<ActiveMQDestination*>(
-                        destination->clone() ) );
-            } else {
-                this->setDestination( NULL );
-            }
-        }
-
-        /**
-         * Gets the Expiration Time for this Message
-         * @return time value
-         */
-        virtual long long getCMSExpiration() const {
-            return this->getExpiration();
-        }
-
-        /**
-         * Sets the Expiration Time for this message
-         * @param expireTime - time value
-         */
-        virtual void setCMSExpiration( long long expireTime ) {
-            this->setExpiration( expireTime );
-        }
-
-        /**
-         * Gets the CMS Message Id for this Message
-         * @return time value
-         */
-        virtual std::string getCMSMessageID() const {
-            return wireformat::openwire::marshal::BaseDataStreamMarshaller::toString( this->getMessageId() );
-        }
-
-        /**
-         * Sets the CMS Message Id for this message
-         * @param id - time value
-         */
-        virtual void setCMSMessageID( const std::string& id AMQCPP_UNUSED) {}
-
-        /**
-         * Gets the Priority Value for this Message
-         * @return priority value
-         */
-        virtual int getCMSPriority() const {
-            return this->getPriority();
-        }
-
-        /**
-         * Sets the Priority Value for this message
-         * @param priority - priority value for this message
-         */
-        virtual void setCMSPriority( int priority ) {
-            this->setPriority( priority );
-        }
-
-        /**
-         * Gets the Redelivered Flag for this Message
-         * @return redelivered value
-         */
-        virtual bool getCMSRedelivered() const {
-            return this->getRedeliveryCounter() != 0;
-        }
-
-        /**
-         * Sets the Redelivered Flag for this message
-         * @param redelivered - boolean redelivered value
-         */
-        virtual void setCMSRedelivered( bool redelivered AMQCPP_UNUSED) {}
-
-        /**
-         * Gets the CMS Reply To Address for this Message
-         * @return Reply To Value
-         */
-        virtual const cms::Destination* getCMSReplyTo(void) const {
-            return dynamic_cast< const cms::Destination* >(
-                this->getReplyTo() );
-        }
-
-        /**
-         * Sets the CMS Reply To Address for this message
-         * @param id - Reply To value
-         */
-        virtual void setCMSReplyTo( const cms::Destination* destination ) {
-
-            delete getReplyTo();
-            if( destination != NULL ) {
-                this->setReplyTo(
-                    dynamic_cast<ActiveMQDestination*>(
-                        destination->clone() ) );
-            } else {
-                this->setReplyTo( NULL );
-            }
-        }
-
-        /**
-         * Gets the Time Stamp for this Message
-         * @return time stamp value
-         */
-        virtual long long getCMSTimestamp() const {
-            return this->getTimestamp();
-        }
-
-        /**
-         * Sets the Time Stamp for this message
-         * @param timeStamp - integer time stamp value
-         */
-        virtual void setCMSTimestamp( long long timeStamp ) {
-            this->setTimestamp( timeStamp );
-        }
-
-        /**
-         * Gets the CMS Message Type for this Message
-         * @return type value
-         */
-        virtual std::string getCMSType() const {
-            return this->getType();
-        }
-
-        /**
-         * Sets the CMS Message Type for this message
-         * @param type - message type value string
-         */
-        virtual void setCMSType( const std::string& type ) {
-            this->setType( type );
-        }
-
     };
 
 }}



Mime
View raw message