You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/06/27 00:14:01 UTC
svn commit: r788887 [2/3] - in /activemq/activemq-cpp/trunk: activemq-c/ activemq-cpp-openwire-generator/ activemq-cpp/ activemq-cpp/src/main/ activemq-cpp/src/test-benchmarks/ activemq-cpp/src/test-integration/ activemq-cpp/src/test/ maven-cpptools-pl...

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=788887&r1=788886&r2=788887&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Fri Jun 26 22:14:01 2009
@@ -16,982 +16,982 @@
 # ---------------------------------------------------------------------------
 
 cc_sources = \
-    decaf/lang/Float.cpp \
-    decaf/lang/Boolean.cpp \
-    decaf/lang/Integer.cpp \
-    decaf/lang/Byte.cpp \
-    decaf/lang/Exception.cpp \
-    decaf/lang/Double.cpp \
-    decaf/lang/Short.cpp \
-    decaf/lang/System.cpp \
-    decaf/lang/Math.cpp \
-    decaf/lang/Long.cpp \
-    decaf/lang/Character.cpp \
-    decaf/lang/Thread.cpp \
-    decaf/util/Properties.cpp \
-    decaf/util/StringTokenizer.cpp \
-    decaf/util/Random.cpp \
-    decaf/util/concurrent/TimeUnit.cpp \
-    decaf/util/concurrent/Mutex.cpp \
-    decaf/util/concurrent/PooledThread.cpp \
-    decaf/util/concurrent/ThreadPool.cpp \
-    decaf/util/concurrent/CountDownLatch.cpp \
-    decaf/util/concurrent/atomic/AtomicInteger.cpp \
-    decaf/util/concurrent/atomic/AtomicBoolean.cpp \
-    decaf/util/Date.cpp \
-    decaf/util/UUID.cpp \
-    decaf/util/logging/LogWriter.cpp \
-    decaf/util/logging/LogManager.cpp \
-    decaf/util/logging/SimpleLogger.cpp \
-    decaf/util/logging/Logger.cpp \
-    decaf/util/logging/LoggerHierarchy.cpp \
-    decaf/internal/util/ByteArrayAdapter.cpp \
-    decaf/internal/util/HexStringParser.cpp \
-    decaf/internal/AprPool.cpp \
-    decaf/internal/nio/FloatArrayBuffer.cpp \
-    decaf/internal/nio/LongArrayBuffer.cpp \
-    decaf/internal/nio/BufferFactory.cpp \
-    decaf/internal/nio/ShortArrayBuffer.cpp \
-    decaf/internal/nio/IntArrayBuffer.cpp \
-    decaf/internal/nio/DoubleArrayBuffer.cpp \
-    decaf/internal/nio/ByteArrayBuffer.cpp \
-    decaf/internal/nio/CharArrayBuffer.cpp \
-    decaf/internal/nio/ByteArrayPerspective.cpp \
-    decaf/internal/DecafRuntime.cpp \
-    decaf/internal/net/URIHelper.cpp \
-    decaf/internal/net/URIEncoderDecoder.cpp \
-    decaf/internal/io/StandardInputStream.cpp \
-    decaf/internal/io/StandardOutputStream.cpp \
-    decaf/internal/io/StandardErrorOutputStream.cpp \
-    decaf/nio/ShortBuffer.cpp \
-    decaf/nio/LongBuffer.cpp \
-    decaf/nio/FloatBuffer.cpp \
-    decaf/nio/IntBuffer.cpp \
-    decaf/nio/Buffer.cpp \
-    decaf/nio/CharBuffer.cpp \
-    decaf/nio/ByteBuffer.cpp \
-    decaf/nio/DoubleBuffer.cpp \
-    decaf/net/SocketOutputStream.cpp \
-    decaf/net/URLDecoder.cpp \
-    decaf/net/SocketInputStream.cpp \
-    decaf/net/URL.cpp \
-    decaf/net/URLEncoder.cpp \
-    decaf/net/SocketFactory.cpp \
-    decaf/net/BufferedSocket.cpp \
-    decaf/net/SocketError.cpp \
-    decaf/net/TcpSocket.cpp \
-    decaf/net/URI.cpp \
-    decaf/net/ServerSocket.cpp \
-    decaf/io/ByteArrayOutputStream.cpp \
-    decaf/io/BufferedInputStream.cpp \
-    decaf/io/DataOutputStream.cpp \
-    decaf/io/ByteArrayInputStream.cpp \
-    decaf/io/BufferedOutputStream.cpp \
-    decaf/io/BlockingByteArrayInputStream.cpp \
-    decaf/io/DataInputStream.cpp \
-    cms/MessageNotWriteableException.cpp \
-    cms/InvalidSelectorException.cpp \
-    cms/InvalidDestinationException.cpp \
-    cms/CMSException.cpp \
-    cms/CMSSecurityException.cpp \
-    cms/MessageEOFException.cpp \
-    cms/MessageNotReadableException.cpp \
-    cms/InvalidClientIdException.cpp \
-    cms/IllegalStateException.cpp \
-    cms/MessageFormatException.cpp \
-    activemq/transport/mock/MockTransportFactory.cpp \
-    activemq/transport/mock/MockTransport.cpp \
-    activemq/transport/mock/InternalCommandListener.cpp \
+    activemq/cmsutil/CmsAccessor.cpp \
+    activemq/cmsutil/CmsDestinationAccessor.cpp \
+    activemq/cmsutil/CmsTemplate.cpp \
+    activemq/cmsutil/DynamicDestinationResolver.cpp \
+    activemq/cmsutil/PooledSession.cpp \
+    activemq/cmsutil/ResourceLifecycleManager.cpp \
+    activemq/cmsutil/SessionPool.cpp \
+    activemq/commands/ActiveMQBlobMessage.cpp \
+    activemq/commands/ActiveMQBytesMessage.cpp \
+    activemq/commands/ActiveMQDestination.cpp \
+    activemq/commands/ActiveMQMapMessage.cpp \
+    activemq/commands/ActiveMQMessage.cpp \
+    activemq/commands/ActiveMQObjectMessage.cpp \
+    activemq/commands/ActiveMQQueue.cpp \
+    activemq/commands/ActiveMQStreamMessage.cpp \
+    activemq/commands/ActiveMQTempDestination.cpp \
+    activemq/commands/ActiveMQTempQueue.cpp \
+    activemq/commands/ActiveMQTempTopic.cpp \
+    activemq/commands/ActiveMQTextMessage.cpp \
+    activemq/commands/ActiveMQTopic.cpp \
+    activemq/commands/BrokerError.cpp \
+    activemq/commands/BrokerId.cpp \
+    activemq/commands/BrokerInfo.cpp \
+    activemq/commands/ConnectionControl.cpp \
+    activemq/commands/ConnectionError.cpp \
+    activemq/commands/ConnectionId.cpp \
+    activemq/commands/ConnectionInfo.cpp \
+    activemq/commands/ConsumerControl.cpp \
+    activemq/commands/ConsumerId.cpp \
+    activemq/commands/ConsumerInfo.cpp \
+    activemq/commands/ControlCommand.cpp \
+    activemq/commands/DataArrayResponse.cpp \
+    activemq/commands/DataResponse.cpp \
+    activemq/commands/DestinationInfo.cpp \
+    activemq/commands/DiscoveryEvent.cpp \
+    activemq/commands/ExceptionResponse.cpp \
+    activemq/commands/FlushCommand.cpp \
+    activemq/commands/IntegerResponse.cpp \
+    activemq/commands/JournalQueueAck.cpp \
+    activemq/commands/JournalTopicAck.cpp \
+    activemq/commands/JournalTrace.cpp \
+    activemq/commands/JournalTransaction.cpp \
+    activemq/commands/KeepAliveInfo.cpp \
+    activemq/commands/LastPartialCommand.cpp \
+    activemq/commands/LocalTransactionId.cpp \
+    activemq/commands/Message.cpp \
+    activemq/commands/MessageAck.cpp \
+    activemq/commands/MessageDispatch.cpp \
+    activemq/commands/MessageDispatchNotification.cpp \
+    activemq/commands/MessageId.cpp \
+    activemq/commands/MessagePull.cpp \
+    activemq/commands/NetworkBridgeFilter.cpp \
+    activemq/commands/PartialCommand.cpp \
+    activemq/commands/ProducerAck.cpp \
+    activemq/commands/ProducerId.cpp \
+    activemq/commands/ProducerInfo.cpp \
+    activemq/commands/RemoveInfo.cpp \
+    activemq/commands/RemoveSubscriptionInfo.cpp \
+    activemq/commands/ReplayCommand.cpp \
+    activemq/commands/Response.cpp \
+    activemq/commands/SessionId.cpp \
+    activemq/commands/SessionInfo.cpp \
+    activemq/commands/ShutdownInfo.cpp \
+    activemq/commands/SubscriptionInfo.cpp \
+    activemq/commands/TransactionId.cpp \
+    activemq/commands/TransactionInfo.cpp \
+    activemq/commands/WireFormatInfo.cpp \
+    activemq/commands/XATransactionId.cpp \
+    activemq/core/ActiveMQConnection.cpp \
+    activemq/core/ActiveMQConnectionFactory.cpp \
+    activemq/core/ActiveMQConnectionMetaData.cpp \
+    activemq/core/ActiveMQConnectionSupport.cpp \
+    activemq/core/ActiveMQConstants.cpp \
+    activemq/core/ActiveMQConsumer.cpp \
+    activemq/core/ActiveMQProducer.cpp \
+    activemq/core/ActiveMQSession.cpp \
+    activemq/core/ActiveMQSessionExecutor.cpp \
+    activemq/core/ActiveMQTransactionContext.cpp \
+    activemq/core/MessageDispatchChannel.cpp \
+    activemq/exceptions/ActiveMQException.cpp \
+    activemq/io/LoggingInputStream.cpp \
+    activemq/io/LoggingOutputStream.cpp \
+    activemq/library/ActiveMQCPP.cpp \
+    activemq/state/ConnectionState.cpp \
+    activemq/state/ConnectionStateTracker.cpp \
+    activemq/state/ConsumerState.cpp \
+    activemq/state/ProducerState.cpp \
+    activemq/state/SessionState.cpp \
+    activemq/state/Tracked.cpp \
+    activemq/state/TransactionState.cpp \
+    activemq/threads/CompositeTaskRunner.cpp \
+    activemq/threads/DedicatedTaskRunner.cpp \
+    activemq/transport/AbstractTransportFactory.cpp \
+    activemq/transport/IOTransport.cpp \
     activemq/transport/TransportFilter.cpp \
-    activemq/transport/tcp/TcpTransportFactory.cpp \
-    activemq/transport/tcp/TcpTransport.cpp \
+    activemq/transport/TransportRegistry.cpp \
+    activemq/transport/correlator/ResponseCorrelator.cpp \
+    activemq/transport/failover/BackupTransport.cpp \
     activemq/transport/failover/BackupTransportPool.cpp \
-    activemq/transport/failover/FailoverTransportListener.cpp \
-    activemq/transport/failover/URIPool.cpp \
-    activemq/transport/failover/FailoverTransportFactory.cpp \
     activemq/transport/failover/CloseTransportsTask.cpp \
-    activemq/transport/failover/BackupTransport.cpp \
     activemq/transport/failover/FailoverTransport.cpp \
-    activemq/transport/TransportRegistry.cpp \
-    activemq/transport/AbstractTransportFactory.cpp \
-    activemq/transport/correlator/ResponseCorrelator.cpp \
-    activemq/transport/IOTransport.cpp \
+    activemq/transport/failover/FailoverTransportFactory.cpp \
+    activemq/transport/failover/FailoverTransportListener.cpp \
+    activemq/transport/failover/URIPool.cpp \
     activemq/transport/logging/LoggingTransport.cpp \
-    activemq/library/ActiveMQCPP.cpp \
-    activemq/wireformat/openwire/OpenWireFormatFactory.cpp \
+    activemq/transport/mock/InternalCommandListener.cpp \
+    activemq/transport/mock/MockTransport.cpp \
+    activemq/transport/mock/MockTransportFactory.cpp \
+    activemq/transport/tcp/TcpTransport.cpp \
+    activemq/transport/tcp/TcpTransportFactory.cpp \
+    activemq/util/ActiveMQProperties.cpp \
+    activemq/util/CompositeData.cpp \
+    activemq/util/LongSequenceGenerator.cpp \
+    activemq/util/MemoryUsage.cpp \
+    activemq/util/PrimitiveList.cpp \
+    activemq/util/PrimitiveMap.cpp \
+    activemq/util/PrimitiveValueConverter.cpp \
+    activemq/util/PrimitiveValueNode.cpp \
+    activemq/util/URISupport.cpp \
+    activemq/wireformat/WireFormatRegistry.cpp \
     activemq/wireformat/openwire/OpenWireFormat.cpp \
-    activemq/wireformat/openwire/marshal/v1/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.cpp \
+    activemq/wireformat/openwire/OpenWireFormatFactory.cpp \
+    activemq/wireformat/openwire/OpenWireFormatNegotiator.cpp \
+    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/DataArrayResponseMarshaller.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/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.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/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.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/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.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/MessagePullMarshaller.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/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.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/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/XATransactionIdMarshaller.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/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.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/DataArrayResponseMarshaller.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/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.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/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.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/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v2/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.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/MessagePullMarshaller.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/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.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/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/XATransactionIdMarshaller.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/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/BrokerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/FlushCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/WireFormatInfoMarshaller.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/DataArrayResponseMarshaller.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/JournalTransactionMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/RemoveInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConsumerControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ControlCommandMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v3/ConnectionIdMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v3/ConnectionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerIdMarshaller.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/ConnectionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMapMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ExceptionResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ReplayCommandMarshaller.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/ActiveMQTempTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/NetworkBridgeFilterMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTextMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/LastPartialCommandMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConnectionControlMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/SessionInfoMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v3/DestinationInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/KeepAliveInfoMarshaller.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/MessagePullMarshaller.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/ResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBytesMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQDestinationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQStreamMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ProducerInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v3/MessageAckMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v3/MessageDispatchMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/JournalTopicAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQObjectMessageMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTopicMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/RemoveSubscriptionInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/SubscriptionInfoMarshaller.cpp \
+    activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.cpp \
     activemq/wireformat/openwire/marshal/v3/MessageIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ConsumerIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ShutdownInfoMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/LocalTransactionIdMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/IntegerResponseMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempQueueMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMessageMarshaller.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/MessageAckMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/DiscoveryEventMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/XATransactionIdMarshaller.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/JournalTraceMarshaller.cpp \
-    activemq/wireformat/openwire/marshal/v3/BrokerInfoMarshaller.cpp \
-    activemq/wireformat/openwire/OpenWireResponseBuilder.cpp \
-    activemq/wireformat/openwire/utils/OpenwireStringSupport.cpp \
-    activemq/wireformat/openwire/utils/MessagePropertyInterceptor.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/utils/BooleanStream.cpp \
     activemq/wireformat/openwire/utils/HexTable.cpp \
-    activemq/wireformat/openwire/OpenWireFormatNegotiator.cpp \
+    activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp \
+    activemq/wireformat/openwire/utils/OpenwireStringSupport.cpp \
     activemq/wireformat/stomp/StompCommandConstants.cpp \
     activemq/wireformat/stomp/StompFrame.cpp \
-    activemq/wireformat/stomp/StompWireFormatFactory.cpp \
-    activemq/wireformat/stomp/StompWireFormat.cpp \
     activemq/wireformat/stomp/StompHelper.cpp \
-    activemq/wireformat/WireFormatRegistry.cpp \
-    activemq/cmsutil/PooledSession.cpp \
-    activemq/cmsutil/ResourceLifecycleManager.cpp \
-    activemq/cmsutil/DynamicDestinationResolver.cpp \
-    activemq/cmsutil/CmsTemplate.cpp \
-    activemq/cmsutil/CmsDestinationAccessor.cpp \
-    activemq/cmsutil/CmsAccessor.cpp \
-    activemq/cmsutil/SessionPool.cpp \
-    activemq/util/ActiveMQProperties.cpp \
-    activemq/util/PrimitiveValueConverter.cpp \
-    activemq/util/URISupport.cpp \
-    activemq/util/PrimitiveMap.cpp \
-    activemq/util/PrimitiveValueNode.cpp \
-    activemq/util/CompositeData.cpp \
-    activemq/util/MemoryUsage.cpp \
-    activemq/util/LongSequenceGenerator.cpp \
-    activemq/util/PrimitiveList.cpp \
-    activemq/state/ConnectionStateTracker.cpp \
-    activemq/state/SessionState.cpp \
-    activemq/state/ConsumerState.cpp \
-    activemq/state/Tracked.cpp \
-    activemq/state/TransactionState.cpp \
-    activemq/state/ConnectionState.cpp \
-    activemq/state/ProducerState.cpp \
-    activemq/exceptions/ActiveMQException.cpp \
-    activemq/threads/DedicatedTaskRunner.cpp \
-    activemq/threads/CompositeTaskRunner.cpp \
-    activemq/core/ActiveMQSessionExecutor.cpp \
-    activemq/core/ActiveMQConstants.cpp \
-    activemq/core/ActiveMQConnectionMetaData.cpp \
-    activemq/core/ActiveMQConnection.cpp \
-    activemq/core/ActiveMQConsumer.cpp \
-    activemq/core/ActiveMQTransactionContext.cpp \
-    activemq/core/ActiveMQSession.cpp \
-    activemq/core/ActiveMQConnectionSupport.cpp \
-    activemq/core/MessageDispatchChannel.cpp \
-    activemq/core/ActiveMQConnectionFactory.cpp \
-    activemq/core/ActiveMQProducer.cpp \
-    activemq/commands/ActiveMQQueue.cpp \
-    activemq/commands/TransactionId.cpp \
-    activemq/commands/JournalTopicAck.cpp \
-    activemq/commands/ConnectionControl.cpp \
-    activemq/commands/BrokerError.cpp \
-    activemq/commands/ActiveMQStreamMessage.cpp \
-    activemq/commands/DestinationInfo.cpp \
-    activemq/commands/TransactionInfo.cpp \
-    activemq/commands/ActiveMQTopic.cpp \
-    activemq/commands/Message.cpp \
-    activemq/commands/LastPartialCommand.cpp \
-    activemq/commands/ActiveMQTempQueue.cpp \
-    activemq/commands/DiscoveryEvent.cpp \
-    activemq/commands/ActiveMQTempDestination.cpp \
-    activemq/commands/ProducerAck.cpp \
-    activemq/commands/FlushCommand.cpp \
-    activemq/commands/ActiveMQBlobMessage.cpp \
-    activemq/commands/RemoveSubscriptionInfo.cpp \
-    activemq/commands/KeepAliveInfo.cpp \
-    activemq/commands/ActiveMQTempTopic.cpp \
-    activemq/commands/BrokerInfo.cpp \
-    activemq/commands/MessageDispatchNotification.cpp \
-    activemq/commands/ShutdownInfo.cpp \
-    activemq/commands/XATransactionId.cpp \
-    activemq/commands/WireFormatInfo.cpp \
-    activemq/commands/MessageAck.cpp \
-    activemq/commands/PartialCommand.cpp \
-    activemq/commands/ConsumerControl.cpp \
-    activemq/commands/ExceptionResponse.cpp \
-    activemq/commands/NetworkBridgeFilter.cpp \
-    activemq/commands/IntegerResponse.cpp \
-    activemq/commands/Response.cpp \
-    activemq/commands/ProducerId.cpp \
-    activemq/commands/ActiveMQMessage.cpp \
-    activemq/commands/SessionId.cpp \
-    activemq/commands/ConnectionId.cpp \
-    activemq/commands/MessageId.cpp \
-    activemq/commands/SessionInfo.cpp \
-    activemq/commands/ConsumerId.cpp \
-    activemq/commands/ReplayCommand.cpp \
-    activemq/commands/JournalTrace.cpp \
-    activemq/commands/JournalQueueAck.cpp \
-    activemq/commands/ActiveMQObjectMessage.cpp \
-    activemq/commands/JournalTransaction.cpp \
-    activemq/commands/SubscriptionInfo.cpp \
-    activemq/commands/ActiveMQDestination.cpp \
-    activemq/commands/RemoveInfo.cpp \
-    activemq/commands/ActiveMQBytesMessage.cpp \
-    activemq/commands/ControlCommand.cpp \
-    activemq/commands/BrokerId.cpp \
-    activemq/commands/MessageDispatch.cpp \
-    activemq/commands/ActiveMQTextMessage.cpp \
-    activemq/commands/ActiveMQMapMessage.cpp \
-    activemq/commands/LocalTransactionId.cpp \
-    activemq/commands/DataArrayResponse.cpp \
-    activemq/commands/ConnectionInfo.cpp \
-    activemq/commands/ConsumerInfo.cpp \
-    activemq/commands/ProducerInfo.cpp \
-    activemq/commands/ConnectionError.cpp \
-    activemq/commands/MessagePull.cpp \
-    activemq/commands/DataResponse.cpp \
-    activemq/io/LoggingOutputStream.cpp \
-    activemq/io/LoggingInputStream.cpp
+    activemq/wireformat/stomp/StompWireFormat.cpp \
+    activemq/wireformat/stomp/StompWireFormatFactory.cpp \
+    cms/CMSException.cpp \
+    cms/CMSSecurityException.cpp \
+    cms/IllegalStateException.cpp \
+    cms/InvalidClientIdException.cpp \
+    cms/InvalidDestinationException.cpp \
+    cms/InvalidSelectorException.cpp \
+    cms/MessageEOFException.cpp \
+    cms/MessageFormatException.cpp \
+    cms/MessageNotReadableException.cpp \
+    cms/MessageNotWriteableException.cpp \
+    decaf/internal/AprPool.cpp \
+    decaf/internal/DecafRuntime.cpp \
+    decaf/internal/io/StandardErrorOutputStream.cpp \
+    decaf/internal/io/StandardInputStream.cpp \
+    decaf/internal/io/StandardOutputStream.cpp \
+    decaf/internal/net/URIEncoderDecoder.cpp \
+    decaf/internal/net/URIHelper.cpp \
+    decaf/internal/nio/BufferFactory.cpp \
+    decaf/internal/nio/ByteArrayBuffer.cpp \
+    decaf/internal/nio/ByteArrayPerspective.cpp \
+    decaf/internal/nio/CharArrayBuffer.cpp \
+    decaf/internal/nio/DoubleArrayBuffer.cpp \
+    decaf/internal/nio/FloatArrayBuffer.cpp \
+    decaf/internal/nio/IntArrayBuffer.cpp \
+    decaf/internal/nio/LongArrayBuffer.cpp \
+    decaf/internal/nio/ShortArrayBuffer.cpp \
+    decaf/internal/util/ByteArrayAdapter.cpp \
+    decaf/internal/util/HexStringParser.cpp \
+    decaf/io/BlockingByteArrayInputStream.cpp \
+    decaf/io/BufferedInputStream.cpp \
+    decaf/io/BufferedOutputStream.cpp \
+    decaf/io/ByteArrayInputStream.cpp \
+    decaf/io/ByteArrayOutputStream.cpp \
+    decaf/io/DataInputStream.cpp \
+    decaf/io/DataOutputStream.cpp \
+    decaf/lang/Boolean.cpp \
+    decaf/lang/Byte.cpp \
+    decaf/lang/Character.cpp \
+    decaf/lang/Double.cpp \
+    decaf/lang/Exception.cpp \
+    decaf/lang/Float.cpp \
+    decaf/lang/Integer.cpp \
+    decaf/lang/Long.cpp \
+    decaf/lang/Math.cpp \
+    decaf/lang/Short.cpp \
+    decaf/lang/System.cpp \
+    decaf/lang/Thread.cpp \
+    decaf/net/BufferedSocket.cpp \
+    decaf/net/ServerSocket.cpp \
+    decaf/net/SocketError.cpp \
+    decaf/net/SocketFactory.cpp \
+    decaf/net/SocketInputStream.cpp \
+    decaf/net/SocketOutputStream.cpp \
+    decaf/net/TcpSocket.cpp \
+    decaf/net/URI.cpp \
+    decaf/net/URL.cpp \
+    decaf/net/URLDecoder.cpp \
+    decaf/net/URLEncoder.cpp \
+    decaf/nio/Buffer.cpp \
+    decaf/nio/ByteBuffer.cpp \
+    decaf/nio/CharBuffer.cpp \
+    decaf/nio/DoubleBuffer.cpp \
+    decaf/nio/FloatBuffer.cpp \
+    decaf/nio/IntBuffer.cpp \
+    decaf/nio/LongBuffer.cpp \
+    decaf/nio/ShortBuffer.cpp \
+    decaf/util/Date.cpp \
+    decaf/util/Properties.cpp \
+    decaf/util/Random.cpp \
+    decaf/util/StringTokenizer.cpp \
+    decaf/util/UUID.cpp \
+    decaf/util/concurrent/CountDownLatch.cpp \
+    decaf/util/concurrent/Mutex.cpp \
+    decaf/util/concurrent/PooledThread.cpp \
+    decaf/util/concurrent/ThreadPool.cpp \
+    decaf/util/concurrent/TimeUnit.cpp \
+    decaf/util/concurrent/atomic/AtomicBoolean.cpp \
+    decaf/util/concurrent/atomic/AtomicInteger.cpp \
+    decaf/util/logging/LogManager.cpp \
+    decaf/util/logging/LogWriter.cpp \
+    decaf/util/logging/Logger.cpp \
+    decaf/util/logging/LoggerHierarchy.cpp \
+    decaf/util/logging/SimpleLogger.cpp
 
 
 h_sources = \
-    decaf/lang/Character.h \
-    decaf/lang/Integer.h \
-    decaf/lang/Short.h \
-    decaf/lang/Boolean.h \
-    decaf/lang/Runtime.h \
-    decaf/lang/Comparable.h \
-    decaf/lang/Pointer.h \
-    decaf/lang/Appendable.h \
-    decaf/lang/Iterable.h \
-    decaf/lang/Double.h \
-    decaf/lang/Throwable.h \
-    decaf/lang/exceptions/NumberFormatException.h \
-    decaf/lang/exceptions/InterruptedException.h \
-    decaf/lang/exceptions/UnsupportedOperationException.h \
-    decaf/lang/exceptions/IllegalMonitorStateException.h \
-    decaf/lang/exceptions/NullPointerException.h \
-    decaf/lang/exceptions/RuntimeException.h \
-    decaf/lang/exceptions/IllegalArgumentException.h \
-    decaf/lang/exceptions/ClassCastException.h \
-    decaf/lang/exceptions/IndexOutOfBoundsException.h \
-    decaf/lang/exceptions/IllegalStateException.h \
-    decaf/lang/exceptions/InvalidStateException.h \
-    decaf/lang/exceptions/ExceptionDefines.h \
-    decaf/lang/exceptions/NoSuchElementException.h \
-    decaf/lang/Float.h \
-    decaf/lang/Byte.h \
-    decaf/lang/System.h \
-    decaf/lang/Math.h \
-    decaf/lang/Number.h \
-    decaf/lang/Exception.h \
-    decaf/lang/Long.h \
-    decaf/lang/CharSequence.h \
-    decaf/lang/Thread.h \
-    decaf/lang/Runnable.h \
-    decaf/util/Date.h \
-    decaf/util/AbstractList.h \
-    decaf/util/StringTokenizer.h \
-    decaf/util/StlQueue.h \
-    decaf/util/AbstractSet.h \
-    decaf/util/StlSet.h \
-    decaf/util/Random.h \
-    decaf/util/Map.h \
-    decaf/util/concurrent/BrokenBarrierException.h \
-    decaf/util/concurrent/PooledThread.h \
-    decaf/util/concurrent/RejectedExecutionException.h \
-    decaf/util/concurrent/Executor.h \
-    decaf/util/concurrent/Future.h \
-    decaf/util/concurrent/Lock.h \
-    decaf/util/concurrent/ThreadFactory.h \
-    decaf/util/concurrent/Delayed.h \
-    decaf/util/concurrent/CancellationException.h \
-    decaf/util/concurrent/ThreadPool.h \
-    decaf/util/concurrent/TimeUnit.h \
-    decaf/util/concurrent/Mutex.h \
-    decaf/util/concurrent/ConcurrentStlMap.h \
-    decaf/util/concurrent/TaskListener.h \
-    decaf/util/concurrent/Callable.h \
-    decaf/util/concurrent/ExecutionException.h \
-    decaf/util/concurrent/TimeoutException.h \
-    decaf/util/concurrent/CountDownLatch.h \
-    decaf/util/concurrent/Synchronizable.h \
-    decaf/util/concurrent/Concurrent.h \
-    decaf/util/concurrent/PooledThreadListener.h \
-    decaf/util/concurrent/ConcurrentMap.h \
-    decaf/util/concurrent/atomic/AtomicReference.h \
-    decaf/util/concurrent/atomic/AtomicBoolean.h \
-    decaf/util/concurrent/atomic/AtomicInteger.h \
-    decaf/util/concurrent/locks/ReadWriteLock.h \
-    decaf/util/concurrent/locks/Lock.h \
-    decaf/util/concurrent/locks/Condition.h \
-    decaf/util/StlMap.h \
-    decaf/util/Collection.h \
-    decaf/util/Iterator.h \
-    decaf/util/Config.h \
-    decaf/util/Comparator.h \
-    decaf/util/StlList.h \
-    decaf/util/AbstractSequentialList.h \
-    decaf/util/List.h \
-    decaf/util/UUID.h \
-    decaf/util/Set.h \
-    decaf/util/ListIterator.h \
-    decaf/util/AbstractMap.h \
-    decaf/util/Queue.h \
-    decaf/util/AbstractQueue.h \
-    decaf/util/AbstractCollection.h \
-    decaf/util/logging/LoggerCommon.h \
-    decaf/util/logging/SimpleFormatter.h \
-    decaf/util/logging/Handler.h \
-    decaf/util/logging/ConsoleHandler.h \
-    decaf/util/logging/Formatter.h \
-    decaf/util/logging/MarkBlockLogger.h \
-    decaf/util/logging/LoggerHierarchy.h \
-    decaf/util/logging/LogWriter.h \
-    decaf/util/logging/SimpleLogger.h \
-    decaf/util/logging/LoggerDefines.h \
-    decaf/util/logging/LogManager.h \
-    decaf/util/logging/PropertiesChangeListener.h \
-    decaf/util/logging/LogRecord.h \
-    decaf/util/logging/Logger.h \
-    decaf/util/logging/StreamHandler.h \
-    decaf/util/logging/Filter.h \
-    decaf/util/Properties.h \
-    decaf/internal/AprPool.h \
-    decaf/internal/util/ByteArrayAdapter.h \
-    decaf/internal/util/HexStringParser.h \
-    decaf/internal/DecafRuntime.h \
-    decaf/internal/nio/FloatArrayBuffer.h \
-    decaf/internal/nio/IntArrayBuffer.h \
-    decaf/internal/nio/ShortArrayBuffer.h \
-    decaf/internal/nio/BufferFactory.h \
-    decaf/internal/nio/ByteArrayBuffer.h \
-    decaf/internal/nio/ByteArrayPerspective.h \
-    decaf/internal/nio/LongArrayBuffer.h \
-    decaf/internal/nio/DoubleArrayBuffer.h \
-    decaf/internal/nio/CharArrayBuffer.h \
-    decaf/internal/net/URIEncoderDecoder.h \
-    decaf/internal/net/URIHelper.h \
-    decaf/internal/net/URIType.h \
-    decaf/internal/io/StandardOutputStream.h \
-    decaf/internal/io/StandardInputStream.h \
-    decaf/internal/io/StandardErrorOutputStream.h \
-    decaf/nio/ShortBuffer.h \
-    decaf/nio/FloatBuffer.h \
-    decaf/nio/BufferOverflowException.h \
-    decaf/nio/InvalidMarkException.h \
-    decaf/nio/IntBuffer.h \
-    decaf/nio/ReadOnlyBufferException.h \
-    decaf/nio/BufferUnderflowException.h \
-    decaf/nio/Buffer.h \
-    decaf/nio/CharBuffer.h \
-    decaf/nio/ByteBuffer.h \
-    decaf/nio/LongBuffer.h \
-    decaf/nio/DoubleBuffer.h \
-    decaf/net/URLEncoder.h \
-    decaf/net/URL.h \
-    decaf/net/PortUnreachableException.h \
-    decaf/net/ProtocolException.h \
-    decaf/net/BindException.h \
-    decaf/net/TcpSocket.h \
-    decaf/net/URISyntaxException.h \
-    decaf/net/NoRouteToHostException.h \
-    decaf/net/MalformedURLException.h \
-    decaf/net/BufferedSocket.h \
-    decaf/net/SocketError.h \
-    decaf/net/SocketTimeoutException.h \
-    decaf/net/UnknownHostException.h \
-    decaf/net/SocketFactory.h \
-    decaf/net/ServerSocket.h \
-    decaf/net/ConnectException.h \
-    decaf/net/UnknownServiceException.h \
-    decaf/net/URLDecoder.h \
-    decaf/net/Socket.h \
-    decaf/net/SocketException.h \
-    decaf/net/URI.h \
-    decaf/net/SocketInputStream.h \
-    decaf/net/HttpRetryException.h \
-    decaf/net/SocketOutputStream.h \
-    decaf/io/Reader.h \
-    decaf/io/EOFException.h \
-    decaf/io/FilterOutputStream.h \
-    decaf/io/Closeable.h \
-    decaf/io/BlockingByteArrayInputStream.h \
-    decaf/io/Writer.h \
-    decaf/io/InterruptedIOException.h \
-    decaf/io/BufferedOutputStream.h \
-    decaf/io/ByteArrayInputStream.h \
-    decaf/io/OutputStream.h \
-    decaf/io/UTFDataFormatException.h \
-    decaf/io/BufferedInputStream.h \
-    decaf/io/DataInputStream.h \
-    decaf/io/IOException.h \
-    decaf/io/FilterInputStream.h \
-    decaf/io/ByteArrayOutputStream.h \
-    decaf/io/InputStream.h \
-    decaf/io/DataOutputStream.h \
-    cms/CMSException.h \
-    cms/TextMessage.h \
-    cms/Closeable.h \
-    cms/BytesMessage.h \
-    cms/CMSSecurityException.h \
-    cms/ObjectMessage.h \
-    cms/QueueBrowser.h \
-    cms/MessageEOFException.h \
-    cms/TemporaryQueue.h \
-    cms/InvalidSelectorException.h \
-    cms/IllegalStateException.h \
-    cms/MapMessage.h \
-    cms/Connection.h \
-    cms/ConnectionMetaData.h \
-    cms/Message.h \
-    cms/InvalidDestinationException.h \
-    cms/Session.h \
-    cms/InvalidClientIdException.h \
-    cms/ExceptionListener.h \
-    cms/Stoppable.h \
-    cms/StreamMessage.h \
-    cms/MessageConsumer.h \
-    cms/DeliveryMode.h \
-    cms/Config.h \
-    cms/Destination.h \
-    cms/MessageNotReadableException.h \
-    cms/CMSProperties.h \
-    cms/TemporaryTopic.h \
-    cms/Topic.h \
-    cms/MessageListener.h \
-    cms/ConnectionFactory.h \
-    cms/Startable.h \
-    cms/Queue.h \
-    cms/MessageProducer.h \
-    cms/MessageFormatException.h \
-    cms/MessageNotWriteableException.h \
-    activemq/transport/TransportListener.h \
-    activemq/transport/TransportFilter.h \
-    activemq/transport/CompositeTransport.h \
-    activemq/transport/TransportRegistry.h \
-    activemq/transport/mock/ResponseBuilder.h \
-    activemq/transport/mock/MockTransportFactory.h \
-    activemq/transport/mock/InternalCommandListener.h \
-    activemq/transport/mock/MockTransport.h \
+    activemq/cmsutil/CachedConsumer.h \
+    activemq/cmsutil/CachedProducer.h \
+    activemq/cmsutil/CmsAccessor.h \
+    activemq/cmsutil/CmsDestinationAccessor.h \
+    activemq/cmsutil/CmsTemplate.h \
+    activemq/cmsutil/DestinationResolver.h \
+    activemq/cmsutil/DynamicDestinationResolver.h \
+    activemq/cmsutil/MessageCreator.h \
+    activemq/cmsutil/PooledSession.h \
+    activemq/cmsutil/ProducerCallback.h \
+    activemq/cmsutil/ResourceLifecycleManager.h \
+    activemq/cmsutil/SessionCallback.h \
+    activemq/cmsutil/SessionPool.h \
+    activemq/commands/ActiveMQBlobMessage.h \
+    activemq/commands/ActiveMQBytesMessage.h \
+    activemq/commands/ActiveMQDestination.h \
+    activemq/commands/ActiveMQMapMessage.h \
+    activemq/commands/ActiveMQMessage.h \
+    activemq/commands/ActiveMQMessageTemplate.h \
+    activemq/commands/ActiveMQObjectMessage.h \
+    activemq/commands/ActiveMQQueue.h \
+    activemq/commands/ActiveMQStreamMessage.h \
+    activemq/commands/ActiveMQTempDestination.h \
+    activemq/commands/ActiveMQTempQueue.h \
+    activemq/commands/ActiveMQTempTopic.h \
+    activemq/commands/ActiveMQTextMessage.h \
+    activemq/commands/ActiveMQTopic.h \
+    activemq/commands/BaseCommand.h \
+    activemq/commands/BaseDataStructure.h \
+    activemq/commands/BooleanExpression.h \
+    activemq/commands/BrokerError.h \
+    activemq/commands/BrokerId.h \
+    activemq/commands/BrokerInfo.h \
+    activemq/commands/Command.h \
+    activemq/commands/ConnectionControl.h \
+    activemq/commands/ConnectionError.h \
+    activemq/commands/ConnectionId.h \
+    activemq/commands/ConnectionInfo.h \
+    activemq/commands/ConsumerControl.h \
+    activemq/commands/ConsumerId.h \
+    activemq/commands/ConsumerInfo.h \
+    activemq/commands/ControlCommand.h \
+    activemq/commands/DataArrayResponse.h \
+    activemq/commands/DataResponse.h \
+    activemq/commands/DataStructure.h \
+    activemq/commands/DestinationInfo.h \
+    activemq/commands/DiscoveryEvent.h \
+    activemq/commands/ExceptionResponse.h \
+    activemq/commands/FlushCommand.h \
+    activemq/commands/IntegerResponse.h \
+    activemq/commands/JournalQueueAck.h \
+    activemq/commands/JournalTopicAck.h \
+    activemq/commands/JournalTrace.h \
+    activemq/commands/JournalTransaction.h \
+    activemq/commands/KeepAliveInfo.h \
+    activemq/commands/LastPartialCommand.h \
+    activemq/commands/LocalTransactionId.h \
+    activemq/commands/Message.h \
+    activemq/commands/MessageAck.h \
+    activemq/commands/MessageDispatch.h \
+    activemq/commands/MessageDispatchNotification.h \
+    activemq/commands/MessageId.h \
+    activemq/commands/MessagePull.h \
+    activemq/commands/NetworkBridgeFilter.h \
+    activemq/commands/PartialCommand.h \
+    activemq/commands/ProducerAck.h \
+    activemq/commands/ProducerId.h \
+    activemq/commands/ProducerInfo.h \
+    activemq/commands/RemoveInfo.h \
+    activemq/commands/RemoveSubscriptionInfo.h \
+    activemq/commands/ReplayCommand.h \
+    activemq/commands/Response.h \
+    activemq/commands/SessionId.h \
+    activemq/commands/SessionInfo.h \
+    activemq/commands/ShutdownInfo.h \
+    activemq/commands/SubscriptionInfo.h \
+    activemq/commands/TransactionId.h \
+    activemq/commands/TransactionInfo.h \
+    activemq/commands/WireFormatInfo.h \
+    activemq/commands/XATransactionId.h \
+    activemq/core/ActiveMQAckHandler.h \
+    activemq/core/ActiveMQConnection.h \
+    activemq/core/ActiveMQConnectionFactory.h \
+    activemq/core/ActiveMQConnectionMetaData.h \
+    activemq/core/ActiveMQConnectionSupport.h \
+    activemq/core/ActiveMQConstants.h \
+    activemq/core/ActiveMQConsumer.h \
+    activemq/core/ActiveMQProducer.h \
+    activemq/core/ActiveMQSession.h \
+    activemq/core/ActiveMQSessionExecutor.h \
+    activemq/core/ActiveMQTransactionContext.h \
+    activemq/core/DispatchData.h \
+    activemq/core/Dispatcher.h \
+    activemq/core/MessageDispatchChannel.h \
+    activemq/core/Synchronization.h \
+    activemq/exceptions/ActiveMQException.h \
+    activemq/exceptions/BrokerException.h \
+    activemq/exceptions/ExceptionDefines.h \
+    activemq/io/LoggingInputStream.h \
+    activemq/io/LoggingOutputStream.h \
+    activemq/library/ActiveMQCPP.h \
+    activemq/state/CommandVisitor.h \
+    activemq/state/CommandVisitorAdapter.h \
+    activemq/state/ConnectionState.h \
+    activemq/state/ConnectionStateTracker.h \
+    activemq/state/ConsumerState.h \
+    activemq/state/ProducerState.h \
+    activemq/state/SessionState.h \
+    activemq/state/Tracked.h \
+    activemq/state/TransactionState.h \
+    activemq/threads/CompositeTask.h \
+    activemq/threads/CompositeTaskRunner.h \
+    activemq/threads/DedicatedTaskRunner.h \
+    activemq/threads/Task.h \
+    activemq/threads/TaskRunner.h \
     activemq/transport/AbstractTransportFactory.h \
-    activemq/transport/TransportFactory.h \
+    activemq/transport/CompositeTransport.h \
     activemq/transport/DefaultTransportListener.h \
+    activemq/transport/IOTransport.h \
     activemq/transport/Transport.h \
-    activemq/transport/tcp/TcpTransportFactory.h \
-    activemq/transport/tcp/TcpTransport.h \
-    activemq/transport/failover/FailoverTransportListener.h \
-    activemq/transport/failover/URIPool.h \
-    activemq/transport/failover/FailoverTransportFactory.h \
-    activemq/transport/failover/CloseTransportsTask.h \
-    activemq/transport/failover/BackupTransportPool.h \
+    activemq/transport/TransportFactory.h \
+    activemq/transport/TransportFilter.h \
+    activemq/transport/TransportListener.h \
+    activemq/transport/TransportRegistry.h \
+    activemq/transport/correlator/FutureResponse.h \
+    activemq/transport/correlator/ResponseCorrelator.h \
     activemq/transport/failover/BackupTransport.h \
+    activemq/transport/failover/BackupTransportPool.h \
+    activemq/transport/failover/CloseTransportsTask.h \
     activemq/transport/failover/FailoverTransport.h \
-    activemq/transport/correlator/ResponseCorrelator.h \
-    activemq/transport/correlator/FutureResponse.h \
-    activemq/transport/IOTransport.h \
+    activemq/transport/failover/FailoverTransportFactory.h \
+    activemq/transport/failover/FailoverTransportListener.h \
+    activemq/transport/failover/URIPool.h \
     activemq/transport/logging/LoggingTransport.h \
-    activemq/library/ActiveMQCPP.h \
+    activemq/transport/mock/InternalCommandListener.h \
+    activemq/transport/mock/MockTransport.h \
+    activemq/transport/mock/MockTransportFactory.h \
+    activemq/transport/mock/ResponseBuilder.h \
+    activemq/transport/tcp/TcpTransport.h \
+    activemq/transport/tcp/TcpTransportFactory.h \
+    activemq/util/ActiveMQProperties.h \
+    activemq/util/CompositeData.h \
+    activemq/util/Config.h \
+    activemq/util/LongSequenceGenerator.h \
+    activemq/util/MemoryUsage.h \
+    activemq/util/PrimitiveList.h \
+    activemq/util/PrimitiveMap.h \
+    activemq/util/PrimitiveValueConverter.h \
+    activemq/util/PrimitiveValueNode.h \
+    activemq/util/URISupport.h \
+    activemq/util/Usage.h \
+    activemq/wireformat/MarshalAware.h \
+    activemq/wireformat/WireFormat.h \
+    activemq/wireformat/WireFormatFactory.h \
+    activemq/wireformat/WireFormatNegotiator.h \
+    activemq/wireformat/WireFormatRegistry.h \
     activemq/wireformat/openwire/OpenWireFormat.h \
+    activemq/wireformat/openwire/OpenWireFormatFactory.h \
     activemq/wireformat/openwire/OpenWireFormatNegotiator.h \
     activemq/wireformat/openwire/OpenWireResponseBuilder.h \
-    activemq/wireformat/openwire/OpenWireFormatFactory.h \
-    activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ControlCommandMarshaller.h \
+    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/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/SessionInfoMarshaller.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/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshaller.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/SubscriptionInfoMarshaller.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/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.h \
     activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.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/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshaller.h \
     activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshaller.h \
     activemq/wireformat/openwire/marshal/v1/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshaller.h \
     activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.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/BaseDataStreamMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ControlCommandMarshaller.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/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/SessionInfoMarshaller.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/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v2/ConsumerInfoMarshaller.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/SubscriptionInfoMarshaller.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/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h \
     activemq/wireformat/openwire/marshal/v2/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/WireFormatInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.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/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/MessageAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/BrokerInfoMarshaller.h \
     activemq/wireformat/openwire/marshal/v2/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h \
     activemq/wireformat/openwire/marshal/v2/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/IntegerResponseMarshaller.h \
+    activemq/wireformat/openwire/marshal/v2/JournalTransactionMarshaller.h \
     activemq/wireformat/openwire/marshal/v2/KeepAliveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ConsumerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v2/ActiveMQTempQueueMarshaller.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/DataStreamMarshaller.h \
-    activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/NetworkBridgeFilterMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQObjectMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DataResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DataArrayResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ControlCommandMarshaller.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/XATransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/RemoveSubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchNotificationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/TransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/LocalTransactionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/TransactionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SessionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/LastPartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ReplayCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessagePullMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ExceptionResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/RemoveInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/PartialCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ProducerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/FlushCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SessionIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConnectionErrorMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MarshallerFactory.h \
-    activemq/wireformat/openwire/marshal/v3/ConsumerInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ConsumerControlMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/SubscriptionInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DestinationInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/BrokerIdMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalTransactionMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/DiscoveryEventMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/BaseCommandMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempDestinationMarshaller.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/WireFormatInfoMarshaller.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/JournalQueueAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQBlobMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageDispatchMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/MessageAckMarshaller.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/JournalTopicAckMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempTopicMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/JournalTraceMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/IntegerResponseMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/KeepAliveInfoMarshaller.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/ShutdownInfoMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQDestinationMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQMapMessageMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ActiveMQTempQueueMarshaller.h \
-    activemq/wireformat/openwire/marshal/v3/ResponseMarshaller.h \
-    activemq/wireformat/openwire/utils/OpenwireStringSupport.h \
-    activemq/wireformat/openwire/utils/BooleanStream.h \
-    activemq/wireformat/openwire/utils/HexTable.h \
-    activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h \
-    activemq/wireformat/WireFormat.h \
-    activemq/wireformat/WireFormatNegotiator.h \
-    activemq/wireformat/stomp/StompFrame.h \
-    activemq/wireformat/stomp/StompCommandConstants.h \
-    activemq/wireformat/stomp/StompWireFormatFactory.h \
-    activemq/wireformat/stomp/StompHelper.h \
-    activemq/wireformat/stomp/StompWireFormat.h \
-    activemq/wireformat/WireFormatFactory.h \
-    activemq/wireformat/MarshalAware.h \
-    activemq/wireformat/WireFormatRegistry.h \
-    activemq/cmsutil/DestinationResolver.h \
-    activemq/cmsutil/CachedProducer.h \
-    activemq/cmsutil/PooledSession.h \
-    activemq/cmsutil/CmsTemplate.h \
-    activemq/cmsutil/SessionPool.h \
-    activemq/cmsutil/CachedConsumer.h \
-    activemq/cmsutil/CmsDestinationAccessor.h \
-    activemq/cmsutil/SessionCallback.h \
-    activemq/cmsutil/DynamicDestinationResolver.h \
-    activemq/cmsutil/ProducerCallback.h \
-    activemq/cmsutil/MessageCreator.h \
-    activemq/cmsutil/CmsAccessor.h \
-    activemq/cmsutil/ResourceLifecycleManager.h \
-    activemq/util/ActiveMQProperties.h \
-    activemq/util/URISupport.h \
-    activemq/util/MemoryUsage.h \
-    activemq/util/PrimitiveValueNode.h \
-    activemq/util/CompositeData.h \
-    activemq/util/PrimitiveValueConverter.h \
-    activemq/util/Usage.h \
-    activemq/util/LongSequenceGenerator.h \
-    activemq/util/Config.h \
-    activemq/util/PrimitiveList.h \
-    activemq/util/PrimitiveMap.h \
-    activemq/state/CommandVisitor.h \
-    activemq/state/ConnectionState.h \
-    activemq/state/SessionState.h \
-    activemq/state/Tracked.h \
-    activemq/state/TransactionState.h \
-    activemq/state/ProducerState.h \
-    activemq/state/CommandVisitorAdapter.h \
-    activemq/state/ConsumerState.h \
-    activemq/state/ConnectionStateTracker.h \
-    activemq/exceptions/ExceptionDefines.h \
-    activemq/exceptions/ActiveMQException.h \
-    activemq/exceptions/BrokerException.h \
-    activemq/threads/CompositeTaskRunner.h \
-    activemq/threads/DedicatedTaskRunner.h \
-    activemq/threads/CompositeTask.h \
-    activemq/threads/TaskRunner.h \
-    activemq/threads/Task.h \
-    activemq/core/ActiveMQConsumer.h \
-    activemq/core/ActiveMQConnection.h \
-    activemq/core/ActiveMQConstants.h \
-    activemq/core/ActiveMQConnectionFactory.h \
-    activemq/core/MessageDispatchChannel.h \
-    activemq/core/ActiveMQSession.h \
-    activemq/core/Synchronization.h \
-    activemq/core/ActiveMQConnectionMetaData.h \
-    activemq/core/ActiveMQAckHandler.h \
-    activemq/core/Dispatcher.h \
-    activemq/core/ActiveMQProducer.h \
-    activemq/core/ActiveMQTransactionContext.h \
-    activemq/core/ActiveMQSessionExecutor.h \
-    activemq/core/DispatchData.h \
-    activemq/core/ActiveMQConnectionSupport.h \
-    activemq/commands/ControlCommand.h \
-    activemq/commands/SubscriptionInfo.h \
-    activemq/commands/ActiveMQQueue.h \
-    activemq/commands/XATransactionId.h \
-    activemq/commands/RemoveInfo.h \
-    activemq/commands/DataStructure.h \
-    activemq/commands/ConnectionControl.h \
-    activemq/commands/ShutdownInfo.h \
-    activemq/commands/DiscoveryEvent.h \
-    activemq/commands/MessageDispatch.h \
-    activemq/commands/ConnectionInfo.h \
-    activemq/commands/BrokerError.h \
-    activemq/commands/MessagePull.h \
-    activemq/commands/ProducerId.h \
-    activemq/commands/ProducerInfo.h \
-    activemq/commands/ActiveMQMessageTemplate.h \
-    activemq/commands/ActiveMQTopic.h \
-    activemq/commands/DataArrayResponse.h \
-    activemq/commands/LocalTransactionId.h \
-    activemq/commands/JournalTransaction.h \
-    activemq/commands/Response.h \
-    activemq/commands/ProducerAck.h \
-    activemq/commands/TransactionId.h \
-    activemq/commands/SessionInfo.h \
-    activemq/commands/JournalTopicAck.h \
-    activemq/commands/ActiveMQStreamMessage.h \
-    activemq/commands/ActiveMQMessage.h \
-    activemq/commands/BrokerId.h \
-    activemq/commands/JournalTrace.h \
-    activemq/commands/ExceptionResponse.h \
-    activemq/commands/ActiveMQTempDestination.h \
-    activemq/commands/Command.h \
-    activemq/commands/BrokerInfo.h \
-    activemq/commands/ConsumerControl.h \
-    activemq/commands/ActiveMQBytesMessage.h \
-    activemq/commands/BooleanExpression.h \
-    activemq/commands/Message.h \
-    activemq/commands/SessionId.h \
-    activemq/commands/ActiveMQBlobMessage.h \
-    activemq/commands/MessageAck.h \
-    activemq/commands/BaseCommand.h \
-    activemq/commands/ConnectionError.h \
-    activemq/commands/PartialCommand.h \
-    activemq/commands/ReplayCommand.h \
-    activemq/commands/ActiveMQMapMessage.h \
-    activemq/commands/ActiveMQTempTopic.h \
-    activemq/commands/ActiveMQDestination.h \
-    activemq/commands/BaseDataStructure.h \
-    activemq/commands/DataResponse.h \
-    activemq/commands/TransactionInfo.h \
-    activemq/commands/ActiveMQTempQueue.h \
-    activemq/commands/ActiveMQTextMessage.h \
-    activemq/commands/ConnectionId.h \
-    activemq/commands/RemoveSubscriptionInfo.h \
-    activemq/commands/NetworkBridgeFilter.h \
-    activemq/commands/KeepAliveInfo.h \
-    activemq/commands/LastPartialCommand.h \
-    activemq/commands/ActiveMQObjectMessage.h \
-    activemq/commands/DestinationInfo.h \
-    activemq/commands/ConsumerInfo.h \
-    activemq/commands/WireFormatInfo.h \
-    activemq/commands/FlushCommand.h \
-    activemq/commands/IntegerResponse.h \
-    activemq/commands/MessageId.h \
-    activemq/commands/JournalQueueAck.h \
-    activemq/commands/MessageDispatchNotification.h \
-    activemq/commands/ConsumerId.h \
-    activemq/io/LoggingOutputStream.h \
-    activemq/io/LoggingInputStream.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 \

[... 254 lines stripped ...]