activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r955066 [2/21] - in /activemq/activemq-cpp/trunk/activemq-cpp: ./ src/main/ src/main/activemq/wireformat/openwire/ src/main/activemq/wireformat/openwire/marshal/universal/ src/main/activemq/wireformat/openwire/marshal/v1/ src/main/activemq/...
Date Tue, 15 Jun 2010 21:54:21 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?rev=955066&r1=955065&r2=955066&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Tue Jun 15 21:54:15 2010
@@ -154,378 +154,68 @@ cc_sources = \
     activemq/wireformat/openwire/OpenWireResponseBuilder.cpp \
     activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp \
     activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/BaseCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConnectionErrorMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ConsumerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ControlCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/DataArrayResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/DataResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/JournalQueueAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/KeepAliveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MarshallerFactory.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/MessagePullMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/PartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ProducerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ProducerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ReplayCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/SessionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/SessionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/SubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/TransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/WireFormatInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v6/XATransactionIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQBytesMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQDestinationMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQMapMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQObjectMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQQueueMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQStreamMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempDestinationMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempQueueMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempTopicMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTextMessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTopicMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/BaseCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/BrokerIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/BrokerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConnectionControlMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConnectionErrorMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConnectionIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConnectionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConsumerControlMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConsumerIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ConsumerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ControlCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/DataArrayResponseMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/DataResponseMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/DestinationInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/DiscoveryEventMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ExceptionResponseMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/FlushCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/IntegerResponseMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/JournalQueueAckMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/JournalTopicAckMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/JournalTraceMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/JournalTransactionMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/KeepAliveInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/LastPartialCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/LocalTransactionIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MarshallerFactory.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessageAckMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessageDispatchMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessageDispatchNotificationMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessageIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessageMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/MessagePullMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/NetworkBridgeFilterMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/PartialCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ProducerAckMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ProducerIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ProducerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/RemoveInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/RemoveSubscriptionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ReplayCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ResponseMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/SessionIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/SessionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/ShutdownInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/SubscriptionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/TransactionIdMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/TransactionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/WireFormatInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/universal/XATransactionIdMarshaller.cpp \
     activemq/wireformat/openwire/utils/BooleanStream.cpp \
     activemq/wireformat/openwire/utils/HexTable.cpp \
     activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp \
@@ -883,378 +573,68 @@ h_sources = \
     activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h \
     activemq/wireformat/openwire/marshal/DataStreamMarshaller.h \
     activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v3/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v4/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v4/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v5/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v5/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQBytesMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQStreamMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/BrokerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ControlCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v6/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v6/XATransactionIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQBytesMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQDestinationMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQMapMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQObjectMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQQueueMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQStreamMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempDestinationMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempQueueMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTempTopicMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTextMessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ActiveMQTopicMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/BaseCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/BrokerIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/BrokerInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConnectionControlMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConnectionErrorMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConnectionIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConnectionInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConsumerControlMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConsumerIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ConsumerInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ControlCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/DataArrayResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/DataResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/DestinationInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/DiscoveryEventMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ExceptionResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/FlushCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/IntegerResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/JournalQueueAckMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/JournalTopicAckMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/JournalTraceMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/JournalTransactionMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/KeepAliveInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/LastPartialCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/LocalTransactionIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MarshallerFactory.h \
+    activemq/wireformat/openwire/marshal/universal/MessageAckMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MessageDispatchMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MessageDispatchNotificationMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MessageIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MessageMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/MessagePullMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/NetworkBridgeFilterMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/PartialCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ProducerAckMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ProducerIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ProducerInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/RemoveInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/RemoveSubscriptionInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ReplayCommandMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/SessionIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/SessionInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/ShutdownInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/SubscriptionInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/TransactionIdMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/TransactionInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/WireFormatInfoMarshaller.h \
+    activemq/wireformat/openwire/marshal/universal/XATransactionIdMarshaller.h \
     activemq/wireformat/openwire/utils/BooleanStream.h \
     activemq/wireformat/openwire/utils/HexTable.h \
     activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h \

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp?rev=955066&r1=955065&r2=955066&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp Tue Jun 15 21:54:15 2010
@@ -29,11 +29,7 @@
 #include <activemq/commands/WireFormatInfo.h>
 #include <activemq/commands/DataStructure.h>
 #include <activemq/wireformat/openwire/marshal/DataStreamMarshaller.h>
-#include <activemq/wireformat/openwire/marshal/v5/MarshallerFactory.h>
-#include <activemq/wireformat/openwire/marshal/v4/MarshallerFactory.h>
-#include <activemq/wireformat/openwire/marshal/v3/MarshallerFactory.h>
-#include <activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h>
-#include <activemq/wireformat/openwire/marshal/v1/MarshallerFactory.h>
+#include <activemq/wireformat/openwire/marshal/universal/MarshallerFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
 
 using namespace std;
@@ -53,6 +49,8 @@ using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 const unsigned char OpenWireFormat::NULL_TYPE = 0;
+const int OpenWireFormat::DEFAULT_VERSION = 1;
+const int OpenWireFormat::MAX_SUPPORTED_VERSION = 6;
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireFormat::OpenWireFormat( const decaf::util::Properties& properties ) {
@@ -76,6 +74,10 @@ OpenWireFormat::OpenWireFormat( const de
     this->maxInactivityDuration = 30000;
     this->maxInactivityDurationInitialDelay = 10000;
 
+    // initialize the universal marshalers, don't need to reset them again
+    // after this so its safe to do this here.
+    universal::MarshallerFactory().configure( this );
+
     // Set to Default as lowest common denominator, then we will try
     // and move up to the preferred when the wireformat is negotiated.
     this->setVersion( DEFAULT_VERSION );
@@ -117,36 +119,20 @@ void OpenWireFormat::destroyMarshalers()
 void OpenWireFormat::setVersion( int version ) throw ( IllegalArgumentException ) {
 
     try{
+
         if( version == this->getVersion() ){
             return;
         }
 
-        // Clear old marshalers in preparation for the new set.
-        this->destroyMarshalers();
-        this->version = version;
-
-        switch( this->version ){
-        case 1:
-            v1::MarshallerFactory().configure( this );
-            break;
-        case 2:
-            v2::MarshallerFactory().configure( this );
-            break;
-        case 3:
-            v3::MarshallerFactory().configure( this );
-            break;
-        case 4:
-            v4::MarshallerFactory().configure( this );
-            break;
-        case 5:
-            v5::MarshallerFactory().configure( this );
-            break;
-        default:
+        if( version > MAX_SUPPORTED_VERSION ) {
             throw IllegalArgumentException(
                 __FILE__, __LINE__,
                 "OpenWireFormat::setVersion - "
-                "Given Version: %d , is not supported", version );
+                "Given Version: %d , is not yet supported", version );
         }
+
+        // Clear old marshalers in preparation for the new set.
+        this->version = version;
     }
     AMQ_CATCH_RETHROW( IllegalArgumentException )
     AMQ_CATCHALL_THROW( IllegalArgumentException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h?rev=955066&r1=955065&r2=955066&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h Tue Jun 15 21:54:15 2010
@@ -47,7 +47,10 @@ namespace marshal {
         static const unsigned char NULL_TYPE;
 
         // V1 if the default version we start at.
-        static const int DEFAULT_VERSION = 1;
+        static const int DEFAULT_VERSION;
+
+        // Defines the maximum supported openwire version
+        static const int MAX_SUPPORTED_VERSION;
 
     private:
 

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp?rev=955066&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp Tue Jun 15 21:54:15 2010
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h>
+
+#include <activemq/commands/ActiveMQBlobMessage.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
+
+//
+//     NOTE!: This file is autogenerated - do not modify!
+//            if you need to make a change, please see the Java Classes in the
+//            activemq-core module
+//
+
+using namespace std;
+using namespace activemq;
+using namespace activemq::exceptions;
+using namespace activemq::commands;
+using namespace activemq::wireformat;
+using namespace activemq::wireformat::openwire;
+using namespace activemq::wireformat::openwire::marshal;
+using namespace activemq::wireformat::openwire::utils;
+using namespace activemq::wireformat::openwire::marshal::universal;
+using namespace decaf;
+using namespace decaf::io;
+using namespace decaf::lang;
+
+///////////////////////////////////////////////////////////////////////////////
+DataStructure* ActiveMQBlobMessageMarshaller::createObject() const {
+    return new ActiveMQBlobMessage();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+unsigned char ActiveMQBlobMessageMarshaller::getDataStructureType() const {
+    return ActiveMQBlobMessage::ID_ACTIVEMQBLOBMESSAGE;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void ActiveMQBlobMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
+
+    try {
+
+        MessageMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
+
+        ActiveMQBlobMessage* info =
+            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+
+        int wireVersion = wireFormat->getVersion();
+
+        if( wireVersion >= 3 ) {
+            info->setRemoteBlobUrl( tightUnmarshalString( dataIn, bs ) );
+        }
+        if( wireVersion >= 3 ) {
+            info->setMimeType( tightUnmarshalString( dataIn, bs ) );
+        }
+        if( wireVersion >= 3 ) {
+            info->setDeletedByBroker( bs->readBoolean() );
+        }
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+
+///////////////////////////////////////////////////////////////////////////////
+int ActiveMQBlobMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
+
+    try {
+
+        ActiveMQBlobMessage* info =
+            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+
+        int rc = MessageMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
+
+        int wireVersion = wireFormat->getVersion();
+
+        if( wireVersion >= 3 ) {
+            rc += tightMarshalString1( info->getRemoteBlobUrl(), bs );
+        }
+        if( wireVersion >= 3 ) {
+            rc += tightMarshalString1( info->getMimeType(), bs );
+        }
+        if( wireVersion >= 3 ) {
+            bs->writeBoolean( info->isDeletedByBroker() );
+        }
+
+        return rc + 0;
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void ActiveMQBlobMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
+
+    try {
+
+        MessageMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
+
+        ActiveMQBlobMessage* info =
+            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+
+        int wireVersion = wireFormat->getVersion();
+
+        if( wireVersion >= 3 ) {
+            tightMarshalString2( info->getRemoteBlobUrl(), dataOut, bs );
+        }
+        if( wireVersion >= 3 ) {
+            tightMarshalString2( info->getMimeType(), dataOut, bs );
+        }
+        if( wireVersion >= 3 ) {
+            bs->readBoolean();
+        }
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void ActiveMQBlobMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
+
+    try {
+
+        MessageMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
+        ActiveMQBlobMessage* info =
+            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+
+        int wireVersion = wireFormat->getVersion();
+
+        if( wireVersion >= 3 ) {
+            info->setRemoteBlobUrl( looseUnmarshalString( dataIn ) );
+        }
+        if( wireVersion >= 3 ) {
+            info->setMimeType( looseUnmarshalString( dataIn ) );
+        }
+        if( wireVersion >= 3 ) {
+            info->setDeletedByBroker( dataIn->readBoolean() );
+        }
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void ActiveMQBlobMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
+
+    try {
+
+        ActiveMQBlobMessage* info =
+            dynamic_cast<ActiveMQBlobMessage*>( dataStructure );
+        MessageMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+
+        int wireVersion = wireFormat->getVersion();
+
+        if( wireVersion >= 3 ) {
+            looseMarshalString( info->getRemoteBlobUrl(), dataOut );
+        }
+        if( wireVersion >= 3 ) {
+            looseMarshalString( info->getMimeType(), dataOut );
+        }
+        if( wireVersion >= 3 ) {
+            dataOut->writeBoolean( info->isDeletedByBroker() );
+        }
+    }
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
+}
+

Propchange: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h?rev=955066&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h Tue Jun 15 21:54:15 2010
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_ACTIVEMQBLOBMESSAGEMARSHALLER_H_
+#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_ACTIVEMQBLOBMESSAGEMARSHALLER_H_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <activemq/wireformat/openwire/marshal/universal/MessageMarshaller.h>
+
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
+#include <activemq/util/Config.h>
+#include <activemq/commands/DataStructure.h>
+#include <activemq/wireformat/openwire/OpenWireFormat.h>
+#include <activemq/wireformat/openwire/utils/BooleanStream.h>
+
+namespace activemq{
+namespace wireformat{
+namespace openwire{
+namespace marshal{
+namespace universal{
+
+    /**
+     * Marshaling code for Open Wire Format for ActiveMQBlobMessageMarshaller
+     *
+     *  NOTE!: This file is auto generated - do not modify!
+     *         if you need to make a change, please see the Java Classes
+     *         in the activemq-openwire-generator module
+     */
+    class AMQCPP_API ActiveMQBlobMessageMarshaller : public MessageMarshaller {
+    public:
+
+        ActiveMQBlobMessageMarshaller() {}
+        virtual ~ActiveMQBlobMessageMarshaller() {}
+
+        /**
+         * Creates a new instance of this marshalable type.
+         *
+         * @return new DataStructure object pointer caller owns it.
+         */
+        virtual commands::DataStructure* createObject() const;
+
+        /**
+         * Get the Data Structure Type that identifies this Marshaler
+         *
+         * @return byte holding the data structure type value
+         */
+        virtual unsigned char getDataStructureType() const;
+
+        /**
+         * Un-marshal an object instance from the data input stream.
+         *
+         * @param wireFormat - describes the wire format of the broker.
+         * @param dataStructure - Object to be un-marshaled.
+         * @param dataIn - BinaryReader that provides that data.
+         * @param bs - BooleanStream stream used to unpack bits from the wire.
+         *
+         * @throws IOException if an error occurs during the unmarshal.
+         */
+        virtual void tightUnmarshal( OpenWireFormat* wireFormat,
+                                     commands::DataStructure* dataStructure,
+                                     decaf::io::DataInputStream* dataIn,
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException );
+
+        /**
+         * Write the booleans that this object uses to a BooleanStream
+         *
+         * @param wireFormat - describes the wire format of the broker
+         * @param dataStructure - Object to be marshaled
+         * @param bs - BooleanStream stream used to pack bits from the wire.
+         * @returns int value indicating the size of the marshaled object.
+         *
+         * @throws IOException if an error occurs during the marshal.
+         */
+        virtual int tightMarshal1( OpenWireFormat* wireFormat,
+                                   commands::DataStructure* dataStructure,
+                                   utils::BooleanStream* bs ) throw( decaf::io::IOException );
+
+        /**
+         * Write a object instance to data output stream
+         *
+         * @param wireFormat - describes the wire format of the broker
+         * @param dataStructure - Object to be marshaled
+         * @param dataOut - BinaryReader that provides that data sink
+         * @param bs - BooleanStream stream used to pack bits from the wire.
+         *
+         * @throws IOException if an error occurs during the marshal.
+         */
+        virtual void tightMarshal2( OpenWireFormat* wireFormat,
+                                    commands::DataStructure* dataStructure,
+                                    decaf::io::DataOutputStream* dataOut,
+                                    utils::BooleanStream* bs ) throw( decaf::io::IOException );
+
+        /**
+         * Un-marshal an object instance from the data input stream
+         *
+         * @param wireFormat - describes the wire format of the broker
+         * @param dataStructure - Object to be marshaled
+         * @param dataIn - BinaryReader that provides that data source
+         *
+         * @throws IOException if an error occurs during the unmarshal.
+         */
+        virtual void looseUnmarshal( OpenWireFormat* wireFormat,
+                                     commands::DataStructure* dataStructure,
+                                     decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
+
+        /**
+         * Write a object instance to data output stream
+         *
+         * @param wireFormat - describs the wire format of the broker
+         * @param dataStructure - Object to be marshaled
+         * @param dataOut - BinaryWriter that provides that data sink
+         *
+         * @throws IOException if an error occurs during the marshal.
+         */
+        virtual void looseMarshal( OpenWireFormat* wireFormat,
+                                   commands::DataStructure* dataStructure,
+                                   decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
+
+    };
+
+}}}}}
+
+#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSAHAL_UNIVERSAL_ACTIVEMQBLOBMESSAGEMARSHALLER_H_*/
+

Propchange: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/universal/ActiveMQBlobMessageMarshaller.h
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message