From commits-return-4552-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Sun Feb 04 01:45:09 2007
Return-Path: <commits-return-4552-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 97416 invoked from network); 4 Feb 2007 01:45:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Feb 2007 01:45:09 -0000
Received: (qmail 39294 invoked by uid 500); 4 Feb 2007 01:45:15 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 39260 invoked by uid 500); 4 Feb 2007 01:45:15 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 39251 invoked by uid 99); 4 Feb 2007 01:45:15 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Feb 2007 17:45:13 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id BBFB51A981A; Sat,  3 Feb 2007 17:44:16 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r503343 - in /activemq/activemq-cpp/trunk/activemq-cpp:
 src/main/activemq/connector/openwire/
 src/main/activemq/connector/openwire/commands/
 src/main/activemq/connector/openwire/marshal/
 src/main/activemq/connector/openwire/marshal/v2/ vs20...
Date: Sun, 04 Feb 2007 01:44:16 -0000
To: commits@activemq.apache.org
From: nmittler@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070204014416.BBFB51A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: nmittler
Date: Sat Feb  3 17:44:14 2007
New Revision: 503343

URL: http://svn.apache.org/viewvc?view=rev&rev=503343
Log:
fixing link error related to openwire classes

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp Sat Feb  3 17:44:14 2007
@@ -79,9 +79,6 @@
     sizePrefixDisabled = Boolean::parseBoolean( 
         properties.getProperty( "wireFormat.sizePrefixDisabled", 
                                 "0" ) );
-    maxInactivityDuration = Long::parseLong( 
-        properties.getProperty( "wireFormat.maxInactivityDuration", 
-                                "30000" ) );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -119,7 +116,6 @@
         preferedWireFormatInfo->setTcpNoDelayEnabled( tcpNoDelayEnabled );
         preferedWireFormatInfo->setTightEncodingEnabled( tightEncodingEnabled );
         preferedWireFormatInfo->setSizePrefixDisabled( sizePrefixDisabled );
-        preferedWireFormatInfo->setMaxInactivityDuration( maxInactivityDuration );
     } catch( ActiveMQException& e ) {
         throw IllegalStateException(
             __FILE__, __LINE__,
@@ -180,7 +176,7 @@
                 
                 if( !sizePrefixDisabled ) {
                     looseOut->close();
-                    dataOut->writeInt( baos->getByteArraySize() );
+                    dataOut->writeInt( (int)baos->getByteArraySize() );
                     dataOut->write( baos->getByteArray(), 
                                     baos->getByteArraySize() );
                                     
@@ -302,7 +298,7 @@
                 object->getMarshaledForm(this);
             bs->writeBoolean( !sequence.empty() );
             if( !sequence.empty() ) {
-                return 1 + sequence.size();
+                return (int)(1 + sequence.size());
             }
         }
         

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.h Sat Feb  3 17:44:14 2007
@@ -242,22 +242,6 @@
             this->sizePrefixDisabled = sizePrefixDisabled;
         }
 
-        /**
-         * Get the current value of the maxInactivityDuration feild
-         * @return the value of the maxInactivityDuration
-         */
-        long getMaxInactivityDuration() const {
-            return maxInactivityDuration;
-        }
-
-        /**
-         * Set the current Wireformat Version
-         * @param version - int that identifies the version
-         */
-        void setMaxInactivityDuration( long maxInactivityDuration ) {
-            this->maxInactivityDuration = maxInactivityDuration;
-        }
-
     protected:
 
         /**
@@ -298,7 +282,6 @@
         bool cacheEnabled;
         bool tightEncodingEnabled;
         bool sizePrefixDisabled;
-        int maxInactivityDuration;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.cpp Sat Feb  3 17:44:14 2007
@@ -54,7 +54,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int OpenwireCommandReader::read( unsigned char* buffer, int count ) 
+size_t OpenwireCommandReader::read( unsigned char* buffer, size_t count ) 
    throw( io::IOException )
 {
     try
@@ -66,7 +66,7 @@
                 "OpenwireCommandReader::read(char*,int) - input stream is NULL" );
         }
        
-        int head = 0;
+        size_t head = 0;
        
         // We call the read(buffer, size) version asking for one
         // byte, if this returns zero, then there wasn't anything 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandReader.h Sat Feb  3 17:44:14 2007
@@ -82,7 +82,7 @@
          * @return The number of bytes read.
          * @throws IOException thrown if an error occurs.
          */
-        virtual int read( unsigned char* buffer, int count ) 
+        virtual size_t read( unsigned char* buffer, size_t count ) 
             throw( io::IOException );
        
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.cpp Sat Feb  3 17:44:14 2007
@@ -38,7 +38,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void OpenwireCommandWriter::writeCommand( const Command* command ) 
+void OpenwireCommandWriter::writeCommand( Command* command ) 
     throw ( transport::CommandIOException )
 {
     try
@@ -59,7 +59,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void OpenwireCommandWriter::write( const unsigned char* buffer, int count ) 
+void OpenwireCommandWriter::write( const unsigned char* buffer, size_t count ) 
     throw( IOException )
 {
     if( outputStream == NULL )
@@ -85,9 +85,4 @@
     outputStream->write( v );
 }
 
-////////////////////////////////////////////////////////////////////////////////
-void OpenwireCommandWriter::write( const char* buffer, int count ) 
-   throw( io::IOException )
-{
-    write( reinterpret_cast<const unsigned char*>( buffer ), count );
-}
+

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireCommandWriter.h Sat Feb  3 17:44:14 2007
@@ -21,12 +21,11 @@
 #include <activemq/transport/CommandWriter.h>
 #include <activemq/io/InputStream.h>
 #include <activemq/transport/CommandIOException.h>
-#include <activemq/connector/stomp/StompConnectorException.h>
 #include <activemq/transport/Command.h>
 
-using namespace activemq{
-using namespace connector{
-using namespace openwire{
+namespace activemq{
+namespace connector{
+namespace openwire{
 
     class OpenwireCommandWriter : public transport::CommandWriter
     {
@@ -40,7 +39,7 @@
         /**
          * Marshaler of Stomp Commands
          */
-        marshal::Marshaler marshaler;
+        //marshal::Marshaler marshaler;
 
     public:
     
@@ -77,7 +76,7 @@
          * @param os the target stream for the write.
          * @throws CommandIOException if a problem occurs during the write.
          */
-        virtual void writeCommand( const transport::Command* command ) 
+        virtual void writeCommand( transport::Command* command ) 
             throw ( transport::CommandIOException );
 
         /**
@@ -86,7 +85,7 @@
          * @param count the number of bytes in the array to write.
          * @throws IOException thrown if an error occurs.
          */
-        virtual void write( const unsigned char* buffer, int count ) 
+        virtual void write( const unsigned char* buffer, size_t count ) 
             throw( io::IOException );
        
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.cpp Sat Feb  3 17:44:14 2007
@@ -23,6 +23,7 @@
 #include <activemq/transport/ExceptionResponse.h>
 #include <activemq/exceptions/UnsupportedOperationException.h>
 #include <activemq/util/Integer.h>
+#include <activemq/connector/openwire/OpenwireConnectorException.h>
 
 using namespace std;
 using namespace activemq;
@@ -159,7 +160,7 @@
     try
     {
         // Mark this connector as started.
-        state = this->CONNECTING;
+        /*state = this->CONNECTING;
 
         // TODO - Create a Connect Command        
 
@@ -207,7 +208,7 @@
         state = CONNECTED;
         
         // Clean up
-        delete response;
+        delete response;*/
     }
     AMQ_CATCH_RETHROW( BrokerError )
     AMQ_CATCH_RETHROW( ActiveMQException )

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenwireConnector.h Sat Feb  3 17:44:14 2007
@@ -46,7 +46,7 @@
 #include <activemq/transport/CommandListener.h>
 #include <activemq/transport/TransportExceptionListener.h>
 #include <activemq/concurrent/Mutex.h>
-#include <activemq/util/Properties.h>
+#include <activemq/util/SimpleProperties.h>
 #include <activemq/core/ActiveMQConstants.h>
 
 #include <activemq/connector/openwire/OpenwireCommandReader.h>
@@ -57,7 +57,7 @@
 namespace openwire{
     
     class OpenwireConnector : 
-        public Connector
+        public Connector,
         public transport::CommandListener,
         public transport::TransportExceptionListener
     {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h Sat Feb  3 17:44:14 2007
@@ -45,7 +45,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {
-            ActiveMQMessage::copyDataStructure( src );
+            ActiveMQMessageBase<cms::Message>::copyDataStructure( src );
         }
 
     public:  // cms::Message

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h Sat Feb  3 17:44:14 2007
@@ -54,7 +54,7 @@
          * @return src - Source Object
          */
         virtual void copyDataStructure( const DataStructure* src ) {        
-            Message::copyDataStructure( src );
+            openwire::commands::Message::copyDataStructure( src );
         }
 
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp Sat Feb  3 17:44:14 2007
@@ -43,7 +43,7 @@
 std::string ActiveMQTextMessage::getText() const throw( cms::CMSException ) {
 
     try{
-        return std::string( getContent()[0], getContent().size() ); 
+        return std::string( (const char*)&getContent()[0], getContent().size() ); 
     }
     AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
     AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
@@ -52,8 +52,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessage::setText( const char* msg ) throw( cms::CMSException ) {
     try{
-        int length = strlen( msg );
-        for( int i = 0; i < length; ++i ){
+        size_t length = strlen( msg );
+        for( size_t i = 0; i < length; ++i ){
             getContent().push_back( msg[i] );
         }
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -222,13 +222,13 @@
         bs->writeBoolean( value == "" );
         if( value != "" )
         {
-            int strlen = value.length();
+            size_t strlen = value.length();
             
             int utflen = 0;
             int c = 0;
             bool isOnlyAscii = true;
             
-            for( int i = 0; i < strlen; ++i ) {
+            for( size_t i = 0; i < strlen; ++i ) {
                 
                 c = value[i];
                 if( (c >= 0x0001) && (c <= 0x007F) )  // ASCII char
@@ -661,11 +661,11 @@
             
             if( wireFormat->isStackTraceEnabled() ) {
                 
-                int length = error->getStackTraceElements().size();
+                size_t length = error->getStackTraceElements().size();
                 
                 dataOut->writeShort( (short)length );
                 
-                for( int i = 0; i < length; ++i ) {
+                for( size_t i = 0; i < length; ++i ) {
                     
                     BrokerError::StackTraceElement* element = 
                         error->getStackTraceElements()[i];
@@ -829,7 +829,7 @@
         // Now build a string and copy data into it.
         std::string text;
         text.resize( size );
-        text.copy( (char*)data, size );
+        text.assign( (char*)data, (int)size );
         delete data;
         
         return text; 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h Sat Feb  3 17:44:14 2007
@@ -53,18 +53,6 @@
         virtual ~ActiveMQDestinationMarshaller() {}
 
         /**
-         * 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 Marshaller
-         * @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 - describs the wire format of the broker
          * @param o - Object to be un-marshaled

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h Sat Feb  3 17:44:14 2007
@@ -53,18 +53,6 @@
         virtual ~ActiveMQTempDestinationMarshaller() {}
 
         /**
-         * 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 Marshaller
-         * @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 - describs the wire format of the broker
          * @param o - Object to be un-marshaled

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h Sat Feb  3 17:44:14 2007
@@ -53,18 +53,6 @@
         virtual ~BaseCommandMarshaller() {}
 
         /**
-         * 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 Marshaller
-         * @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 - describs the wire format of the broker
          * @param o - Object to be un-marshaled

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -111,9 +111,9 @@
     rc += tightMarshalLong1( wireFormat, info->getTimestamp(), bs );
     rc += tightMarshalString1( info->getType(), bs );
     bs->writeBoolean( info->getContent().size() != 0 );
-    rc += info->getContent().size() == 0 ? 0 : info->getContent().size() + 4;
+    rc += (int)(info->getContent().size() == 0 ? 0 : info->getContent().size() + 4);
     bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
-    rc += info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4;
+    rc += (int)(info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4);
     rc += tightMarshalNestedObject1( wireFormat, info->getDataStructure(), bs );
     rc += tightMarshalCachedObject1( wireFormat, info->getTargetConsumerId(), bs );
     bs->writeBoolean( info->isCompressed() );
@@ -149,11 +149,11 @@
     tightMarshalLong2( wireFormat, info->getTimestamp(), dataOut, bs );
     tightMarshalString2( info->getType(), dataOut, bs );
     if( bs->readBoolean() ) {
-        dataOut->write( info->getContent().size() );
+        dataOut->write( (int)info->getContent().size() );
         dataOut->write( &info->getContent()[0], info->getContent().size() );
     }
     if( bs->readBoolean() ) {
-        dataOut->write( info->getMarshalledProperties().size() );
+        dataOut->write( (int)info->getMarshalledProperties().size() );
         dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
     }
     tightMarshalNestedObject2( wireFormat, info->getDataStructure(), dataOut, bs );
@@ -245,12 +245,12 @@
     looseMarshalString( info->getType(), dataOut );
     dataOut->write( info->getContent().size() != 0 );
     if( info->getContent().size() != 0 ) {
-        dataOut->write( info->getContent().size() );
+        dataOut->write( (int)info->getContent().size() );
         dataOut->write( &info->getContent()[0], info->getContent().size() );
     }
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
-        dataOut->write( info->getMarshalledProperties().size() );
+        dataOut->write( (int)info->getMarshalledProperties().size() );
         dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
     }
     looseMarshalNestedObject( wireFormat, info->getDataStructure(), dataOut );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h Sat Feb  3 17:44:14 2007
@@ -53,18 +53,6 @@
         virtual ~MessageMarshaller() {}
 
         /**
-         * 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 Marshaller
-         * @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 - describs the wire format of the broker
          * @param o - Object to be un-marshaled

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -64,7 +64,7 @@
 
     int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->getData().size() != 0 );
-    rc += info->getData().size() == 0 ? 0 : info->getData().size() + 4;
+    rc += (int)(info->getData().size() == 0 ? 0 : info->getData().size() + 4);
 
     return rc + 4;
 }
@@ -78,7 +78,7 @@
         dynamic_cast<PartialCommand*>( dataStructure );
     dataOut->write( info->getCommandId() );
     if( bs->readBoolean() ) {
-        dataOut->write( info->getData().size() );
+        dataOut->write( (int)info->getData().size() );
         dataOut->write( &info->getData()[0], info->getData().size() );
     }
 }
@@ -103,7 +103,7 @@
     dataOut->write( info->getCommandId() );
     dataOut->write( info->getData().size() != 0 );
     if( info->getData().size() != 0 ) {
-        dataOut->write( info->getData().size() );
+        dataOut->write( (int)info->getData().size() );
         dataOut->write( &info->getData()[0], info->getData().size() );
     }
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -36,6 +36,16 @@
 using namespace activemq::connector::openwire::marshal::v2;
 
 ///////////////////////////////////////////////////////////////////////////////
+unsigned char TransactionIdMarshaller::getDataStructureType() const {
+    return TransactionId::ID_TRANSACTIONID;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+commands::DataStructure* TransactionIdMarshaller::createObject() const {
+    return new TransactionId();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 void TransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
 
     BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -70,7 +70,7 @@
     info->beforeMarshal( wireFormat );
     int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->getMarshalledProperties().size() != 0 );
-    rc += info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4;
+    rc += (int)(info->getMarshalledProperties().size() == 0 ? 0 : info->getMarshalledProperties().size() + 4);
 
     return rc + 12;
 }
@@ -85,7 +85,7 @@
     dataOut->write( &info->getMagic()[0], 8 );
     dataOut->write( info->getVersion() );
     if( bs->readBoolean() ) {
-        dataOut->write( info->getMarshalledProperties().size() );
+        dataOut->write( (int)info->getMarshalledProperties().size() );
         dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
     }
     info->afterMarshal( wireFormat );
@@ -116,7 +116,7 @@
     dataOut->write( info->getVersion() );
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
-        dataOut->write( info->getMarshalledProperties().size() );
+        dataOut->write( (int)info->getMarshalledProperties().size() );
         dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size() );
     }
     info->afterMarshal( wireFormat );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp Sat Feb  3 17:44:14 2007
@@ -65,9 +65,9 @@
 
     int rc = TransactionIdMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
     bs->writeBoolean( info->getGlobalTransactionId().size() != 0 );
-    rc += info->getGlobalTransactionId().size() == 0 ? 0 : info->getGlobalTransactionId().size() + 4;
+    rc += (int)(info->getGlobalTransactionId().size() == 0 ? 0 : info->getGlobalTransactionId().size() + 4);
     bs->writeBoolean( info->getBranchQualifier().size() != 0 );
-    rc += info->getBranchQualifier().size() == 0 ? 0 : info->getBranchQualifier().size() + 4;
+    rc += (int)(info->getBranchQualifier().size() == 0 ? 0 : info->getBranchQualifier().size() + 4);
 
     return rc + 4;
 }
@@ -81,11 +81,11 @@
         dynamic_cast<XATransactionId*>( dataStructure );
     dataOut->write( info->getFormatId() );
     if( bs->readBoolean() ) {
-        dataOut->write( info->getGlobalTransactionId().size() );
+        dataOut->write( (int)info->getGlobalTransactionId().size() );
         dataOut->write( &info->getGlobalTransactionId()[0], info->getGlobalTransactionId().size() );
     }
     if( bs->readBoolean() ) {
-        dataOut->write( info->getBranchQualifier().size() );
+        dataOut->write( (int)info->getBranchQualifier().size() );
         dataOut->write( &info->getBranchQualifier()[0], info->getBranchQualifier().size() );
     }
 }
@@ -111,12 +111,12 @@
     dataOut->write( info->getFormatId() );
     dataOut->write( info->getGlobalTransactionId().size() != 0 );
     if( info->getGlobalTransactionId().size() != 0 ) {
-        dataOut->write( info->getGlobalTransactionId().size() );
+        dataOut->write( (int)info->getGlobalTransactionId().size() );
         dataOut->write( &info->getGlobalTransactionId()[0], info->getGlobalTransactionId().size() );
     }
     dataOut->write( info->getBranchQualifier().size() != 0 );
     if( info->getBranchQualifier().size() != 0 ) {
-        dataOut->write( info->getBranchQualifier().size() );
+        dataOut->write( (int)info->getBranchQualifier().size() );
         dataOut->write( &info->getBranchQualifier()[0], info->getBranchQualifier().size() );
     }
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj?view=diff&rev=503343&r1=503342&r2=503343
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj Sat Feb  3 17:44:14 2007
@@ -659,6 +659,54 @@
 				<Filter
 					Name="openwire"
 					>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\DataStreamMarshaller.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireCommandReader.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireCommandReader.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireCommandWriter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireCommandWriter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireConnector.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireConnector.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenwireConnectorException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenWireFormat.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenWireFormat.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenWireFormatFactory.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\activemq\connector\openwire\OpenWireFormatFactory.h"
+						>
+					</File>
 					<Filter
 						Name="utils"
 						>
@@ -691,6 +739,18 @@
 						Name="marshal"
 						>
 						<File
+							RelativePath="..\src\main\activemq\connector\openwire\marshal\BaseDataStreamMarshaller.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\marshal\BaseDataStreamMarshaller.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\marshal\MarshalAware.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\activemq\connector\openwire\marshal\PrimitiveMapMarshaller.cpp"
 							>
 						</File>
@@ -698,11 +758,503 @@
 							RelativePath="..\src\main\activemq\connector\openwire\marshal\PrimitiveMapMarshaller.h"
 							>
 						</File>
+						<Filter
+							Name="v2"
+							>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQBytesMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQBytesMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQDestinationMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQDestinationMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQMapMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQMapMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQObjectMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQObjectMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQQueueMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQQueueMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQStreamMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQStreamMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempDestinationMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempDestinationMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempQueueMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempQueueMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempTopicMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTempTopicMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTextMessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTextMessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTopicMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ActiveMQTopicMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BaseCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BaseCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BrokerIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BrokerIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BrokerInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\BrokerInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionControlMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionControlMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionErrorMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionErrorMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConnectionInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerControlMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerControlMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ConsumerInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ControlCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ControlCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DataArrayResponseMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DataArrayResponseMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DataResponseMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DataResponseMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DestinationInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DestinationInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DiscoveryEventMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\DiscoveryEventMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ExceptionResponseMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ExceptionResponseMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\FlushCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\FlushCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\IntegerResponseMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\IntegerResponseMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalQueueAckMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalQueueAckMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTopicAckMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTopicAckMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTraceMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTraceMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTransactionMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\JournalTransactionMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\KeepAliveInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\KeepAliveInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\LastPartialCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\LastPartialCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\LocalTransactionIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\LocalTransactionIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MarshallerFactory.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MarshallerFactory.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageAckMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageAckMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageDispatchMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageDispatchMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageDispatchNotificationMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageDispatchNotificationMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessageMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessagePullMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\MessagePullMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\NetworkBridgeFilterMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\NetworkBridgeFilterMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\PartialCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\PartialCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ProducerIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ProducerIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ProducerInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ProducerInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\RemoveInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\RemoveInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\RemoveSubscriptionInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\RemoveSubscriptionInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ReplayCommandMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ReplayCommandMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ResponseMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ResponseMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SessionIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SessionIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SessionInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SessionInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ShutdownInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\ShutdownInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SubscriptionInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\SubscriptionInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\TransactionIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\TransactionIdMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\TransactionInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\TransactionInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\WireFormatInfoMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\WireFormatInfoMarshaller.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\XATransactionIdMarshaller.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\activemq\connector\openwire\marshal\v2\XATransactionIdMarshaller.h"
+								>
+							</File>
+						</Filter>
 					</Filter>
 					<Filter
 						Name="commands"
 						>
 						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQBytesMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQBytesMessage.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQDestination.cpp"
 							>
 						</File>
@@ -711,6 +1263,34 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQMapMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQMapMessage.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQMessage.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQMessageBase.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQObjectMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQObjectMessage.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQQueue.cpp"
 							>
 						</File>
@@ -719,6 +1299,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQStreamMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQStreamMessage.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQTempDestination.cpp"
 							>
 						</File>
@@ -743,6 +1331,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQTextMessage.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQTextMessage.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\activemq\connector\openwire\commands\ActiveMQTopic.cpp"
 							>
 						</File>
@@ -764,6 +1360,382 @@
 						</File>
 						<File
 							RelativePath="..\src\main\activemq\connector\openwire\commands\BooleanExpression.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\BrokerError.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\BrokerId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\BrokerId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\BrokerInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\BrokerInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionControl.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionControl.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionError.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionError.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConnectionInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerControl.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerControl.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ConsumerInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ControlCommand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ControlCommand.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DataArrayResponse.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DataArrayResponse.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DataResponse.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DataResponse.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DataStructure.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DestinationInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DestinationInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DiscoveryEvent.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\DiscoveryEvent.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ExceptionResponse.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ExceptionResponse.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\FlushCommand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\FlushCommand.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\IntegerResponse.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\IntegerResponse.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalQueueAck.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalQueueAck.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTopicAck.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTopicAck.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTrace.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTrace.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTransaction.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\JournalTransaction.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\KeepAliveInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\KeepAliveInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\LastPartialCommand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\LastPartialCommand.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\LocalTransactionId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\LocalTransactionId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\Message.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\Message.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageAck.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageAck.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageDispatch.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageDispatch.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageDispatchNotification.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageDispatchNotification.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessageId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessagePull.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\MessagePull.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\NetworkBridgeFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\NetworkBridgeFilter.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\PartialCommand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\PartialCommand.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ProducerId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ProducerId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ProducerInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ProducerInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\RemoveInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\RemoveInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\RemoveSubscriptionInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\RemoveSubscriptionInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ReplayCommand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ReplayCommand.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\Response.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\Response.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SessionId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SessionId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SessionInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SessionInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ShutdownInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\ShutdownInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SubscriptionInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\SubscriptionInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\TransactionId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\TransactionId.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\TransactionInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\TransactionInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\WireFormatInfo.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\WireFormatInfo.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\XATransactionId.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\activemq\connector\openwire\commands\XATransactionId.h"
 							>
 						</File>
 					</Filter>