activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r384616 [6/10] - in /incubator/activemq/trunk: activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/openwire/v1/ activemq-core/src/test/java/org/apache/activemq/openwire/v1/ activemq-dotnet/src/main/csharp/ActiveMQ...
Date Thu, 09 Mar 2006 21:11:47 GMT
Modified: incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp Thu Mar  9 13:11:16 2006
@@ -1,85 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef TransactionInfo_hpp_
-#define TransactionInfo_hpp_
-
-#include <string>
-#include "command/BaseCommand.hpp"
-    
-#include "command/ConnectionId.hpp"
-#include "command/TransactionId.hpp"
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for TransactionInfo
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class TransactionInfo : public BaseCommand
-{
-private:
-    p<ConnectionId> connectionId ;
-    p<TransactionId> transactionId ;
-    char type ;
-
-public:
-    const static int TYPE = 7;
-
-public:
-    TransactionInfo() ;
-    virtual ~TransactionInfo() ;
-
-    virtual int getCommandType() ;
-
-    virtual p<ConnectionId> getConnectionId() ;
-    virtual void setConnectionId(p<ConnectionId> connectionId) ;
-
-    virtual p<TransactionId> getTransactionId() ;
-    virtual void setTransactionId(p<TransactionId> transactionId) ;
-
-    virtual char getType() ;
-    virtual void setType(char type) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*TransactionInfo_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef TransactionInfo_hpp_
#define TransactionInfo_hpp_

#include <string>
#include "command/BaseCommand.hpp"
    
#include "command/ConnectionId.hpp"
#include "command/TransactionId.hpp"

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
      
   using namespace ifr;
        using namespace std;
        using namespace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for TransactionInfo
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class TransactionInfo : public BaseCommand
{
private:
    p<ConnectionId> connectionId ;
    p<TransactionId> transactionId ;
    char type ;

public:
    const static int TYPE = 7;

public:
    TransactionInfo() ;
    virtual ~TransactionInfo() ;

    virtual int getCommandType() ;

    virtual p<ConnectionId> getConnectionId() ;
    virtual void setConnectionId(p<ConnectionId> connectionId) ;

    virtual p<TransactionId> getTransactionId() ;
    virtual void setTransactionId(p<TransactionId> transactionId) ;

    virtual char getType() ;
    virtual void setType(char type) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*Tr
 ansactionInfo_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp Thu Mar  9 13:11:16 2006
@@ -32,7 +32,11 @@
 {
     this->magic = 0 ;
     this->version = 0 ;
-    this->marshalledProperties = 0 ;
+    this->cacheEnabled = 0 ;
+    this->stackTraceEnabled = 0 ;
+    this->tcpNoDelayEnabled = 0 ;
+    this->prefixPacketSize = 0 ;
+    this->tightEncodingEnabled = 0 ;
 }
 
 WireFormatInfo::~WireFormatInfo()
@@ -62,12 +66,56 @@
 }
 
         
-char* WireFormatInfo::getMarshalledProperties()
+bool WireFormatInfo::getCacheEnabled()
 {
-    return marshalledProperties ;
+    return cacheEnabled ;
 }
 
-void WireFormatInfo::setMarshalledProperties(char* marshalledProperties)
+void WireFormatInfo::setCacheEnabled(bool cacheEnabled)
 {
-    this->marshalledProperties = marshalledProperties ;
+    this->cacheEnabled = cacheEnabled ;
+}
+
+        
+bool WireFormatInfo::getStackTraceEnabled()
+{
+    return stackTraceEnabled ;
+}
+
+void WireFormatInfo::setStackTraceEnabled(bool stackTraceEnabled)
+{
+    this->stackTraceEnabled = stackTraceEnabled ;
+}
+
+        
+bool WireFormatInfo::getTcpNoDelayEnabled()
+{
+    return tcpNoDelayEnabled ;
+}
+
+void WireFormatInfo::setTcpNoDelayEnabled(bool tcpNoDelayEnabled)
+{
+    this->tcpNoDelayEnabled = tcpNoDelayEnabled ;
+}
+
+        
+bool WireFormatInfo::getPrefixPacketSize()
+{
+    return prefixPacketSize ;
+}
+
+void WireFormatInfo::setPrefixPacketSize(bool prefixPacketSize)
+{
+    this->prefixPacketSize = prefixPacketSize ;
+}
+
+        
+bool WireFormatInfo::getTightEncodingEnabled()
+{
+    return tightEncodingEnabled ;
+}
+
+void WireFormatInfo::setTightEncodingEnabled(bool tightEncodingEnabled)
+{
+    this->tightEncodingEnabled = tightEncodingEnabled ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp Thu Mar  9 13:11:16 2006
@@ -1 +1,99 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef WireFormatInfo_hpp_
#define WireFormatInfo_hpp_

#include <string>
#include "command/AbstractCommand.hpp"
    

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        using namespace std;
        using names
 pace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for WireFormatInfo
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class WireFormatInfo : public AbstractCommand
{
private:
    ap<char> magic ;
    int version ;
    char* marshalledProperties ;

public:
    const static int TYPE = 1;

public:
    WireFormatInfo() ;
    virtual ~WireFormatInfo() ;

    virtual int getCommandType() ;

    virtual ap<char> getMagic() ;
    virtual void setMagic(ap<char> magic) ;

    virtual int getVersion() ;
    virtual void setVersion(int version) ;

    virtual char* getMarshalledProperties() ;
    virtual void setMarshalledProperties(char* marshalledProperties) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*WireFormatInfo_hpp_*/
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#ifndef WireFormatInfo_hpp_
+#define WireFormatInfo_hpp_
+
+#include <string>
+#include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace client
+    {
+      namespace command
+      {
+        using namespace ifr::v1;
+        using namespace std;
+        using namespace apache::activemq::client;
+
+/*
+ *
+ *  Marshalling code for Open Wire Format for WireFormatInfo
+ *
+ *
+ *  NOTE!: This file is autogenerated - do not modify!
+ *         if you need to make a change, please see the Groovy scripts in the
+ *         activemq-core module
+ *
+ */
+class WireFormatInfo : public AbstractCommand
+{
+private:
+    ap<char> magic ;
+    int version ;
+    bool cacheEnabled ;
+    bool stackTraceEnabled ;
+    bool tcpNoDelayEnabled ;
+    bool prefixPacketSize ;
+    bool tightEncodingEnabled ;
+
+public:
+    const static int TYPE = 1;
+
+public:
+    WireFormatInfo() ;
+    virtual ~WireFormatInfo() ;
+
+    virtual int getCommandType() ;
+
+    virtual ap<char> getMagic() ;
+    virtual void setMagic(ap<char> magic) ;
+
+    virtual int getVersion() ;
+    virtual void setVersion(int version) ;
+
+    virtual bool getCacheEnabled() ;
+    virtual void setCacheEnabled(bool cacheEnabled) ;
+
+    virtual bool getStackTraceEnabled() ;
+    virtual void setStackTraceEnabled(bool stackTraceEnabled) ;
+
+    virtual bool getTcpNoDelayEnabled() ;
+    virtual void setTcpNoDelayEnabled(bool tcpNoDelayEnabled) ;
+
+    virtual bool getPrefixPacketSize() ;
+    virtual void setPrefixPacketSize(bool prefixPacketSize) ;
+
+    virtual bool getTightEncodingEnabled() ;
+    virtual void setTightEncodingEnabled(bool tightEncodingEnabled) ;
+
+
+} ;
+
+/* namespace */
+      }
+    }
+  }
+}
+
+#endif /*WireFormatInfo_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp Thu Mar  9 13:11:16 2006
@@ -1,83 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef XATransactionId_hpp_
-#define XATransactionId_hpp_
-
-#include <string>
-#include "command/TransactionId.hpp"
-    
-
-#include "util/ifr/ap.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace command
-      {
-        using namespace ifr;
-        using namespace std;
-        using namespace apache::activemq::client;
-
-/*
- *
- *  Marshalling code for Open Wire Format for XATransactionId
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class XATransactionId : public TransactionId
-{
-private:
-    int formatId ;
-    ap<char> globalTransactionId ;
-    ap<char> branchQualifier ;
-
-public:
-    const static int TYPE = 112;
-
-public:
-    XATransactionId() ;
-    virtual ~XATransactionId() ;
-
-    virtual int getCommandType() ;
-
-    virtual int getFormatId() ;
-    virtual void setFormatId(int formatId) ;
-
-    virtual ap<char> getGlobalTransactionId() ;
-    virtual void setGlobalTransactionId(ap<char> globalTransactionId) ;
-
-    virtual ap<char> getBranchQualifier() ;
-    virtual void setBranchQualifier(ap<char> branchQualifier) ;
-
-
-} ;
-
-/* namespace */
-      }
-    }
-  }
-}
-
-#endif /*XATransactionId_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef XATransactionId_hpp_
#define XATransactionId_hpp_

#include <string>
#include "command/TransactionId.hpp"
    

#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace command
      {
        using namespace ifr;
        using namespace std;
        using names
 pace apache::activemq::client;

/*
 *
 *  Marshalling code for Open Wire Format for XATransactionId
 *
 *
 *  NOTE!: This file is autogenerated - do not modify!
 *         if you need to make a change, please see the Groovy scripts in the
 *         activemq-core module
 *
 */
class XATransactionId : public TransactionId
{
private:
    int formatId ;
    ap<char> globalTransactionId ;
    ap<char> branchQualifier ;

public:
    const static int TYPE = 112;

public:
    XATransactionId() ;
    virtual ~XATransactionId() ;

    virtual int getCommandType() ;

    virtual int getFormatId() ;
    virtual void setFormatId(int formatId) ;

    virtual ap<char> getGlobalTransactionId() ;
    virtual void setGlobalTransactionId(ap<char> globalTransactionId) ;

    virtual ap<char> getBranchQualifier() ;
    virtual void setBranchQualifier(ap<char> branchQualifier) ;


} ;

/* namespace */
      }
    }
  }
}

#endif /*XATransactionId_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/io/BinaryReader.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/BinaryReader.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/BinaryReader.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/BinaryReader.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
     {
       namespace io
       {
-        using namespace ifr;
+        using namespace ifr::v1;
 
 /*
  * The BinaryReader class reads primitive C++ data types from an

Modified: incubator/activemq/trunk/openwire-cpp/src/io/BinaryWriter.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/BinaryWriter.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/BinaryWriter.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/BinaryWriter.hpp Thu Mar  9 13:11:16 2006
@@ -29,7 +29,7 @@
     {
       namespace io
       {
-        using namespace ifr;
+        using namespace ifr::v1;
 
 /*
  * The BinaryWriter class writes primitive C++ data types to an

Modified: incubator/activemq/trunk/openwire-cpp/src/io/IOException.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/IOException.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/IOException.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/IOException.hpp Thu Mar  9 13:11:16 2006
@@ -49,4 +49,4 @@
   }
 }
 
-#endif /*IOException_hpp_*/
\ No newline at end of file
+#endif /*IOException_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/io/IReader.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/IReader.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/IReader.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/IReader.hpp Thu Mar  9 13:11:16 2006
@@ -35,7 +35,7 @@
       namespace io
       {
         using namespace std ;
-        using namespace ifr ;
+        using namespace ifr::v1 ;
 
 /*
  * The IReader interface provides for reading bytes from a binary stream
@@ -43,8 +43,10 @@
  * Strings are read as raw bytes, no character decoding is performed. If
  * any byte cannot be read for any reason, an IOException is thrown.
  */
-struct IReader
+class IReader
 {
+public:
+
     virtual ~IReader() { } ;  // Required for SP's
 
     virtual void close() throw(IOException) = 0 ;
@@ -65,4 +67,4 @@
   }
 }
 
-#endif /*IReader_hpp_*/
\ No newline at end of file
+#endif /*IReader_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/io/IWriter.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/IWriter.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/IWriter.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/IWriter.hpp Thu Mar  9 13:11:16 2006
@@ -35,7 +35,7 @@
       namespace io
       {
         using namespace std ;
-        using namespace ifr ;
+        using namespace ifr::v1 ;
 
 /*
  * The IWriter interface provides for converting data from any of the
@@ -44,8 +44,10 @@
  * encoding is performed. If a byte cannot be written for any reason,
  * an IOException is thrown. 
  */
-struct IWriter
+class IWriter
 {
+public:
+
     virtual ~IWriter() { } ;  // Needed for SP's
 
     virtual void close() throw(IOException) = 0 ;

Modified: incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryReader.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryReader.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryReader.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryReader.cpp Thu Mar  9 13:11:16 2006
@@ -68,7 +68,8 @@
 
             // Construct error message
             message.assign("Failed to read from socket. Code = ") ;
-            message.append( itoa(rc, buf, 10) ) ;
+            sprintf( buf, "%d", rc );
+            message.append( buf ) ;
 
             throw IOException(__FILE__, __LINE__, message.c_str()) ;
         }

Modified: incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryWriter.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryWriter.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryWriter.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/io/SocketBinaryWriter.cpp Thu Mar  9 13:11:16 2006
@@ -73,7 +73,8 @@
 
             // Construct error message
             message.assign("Failed to write to socket. Code = ") ;
-            message.append( itoa(rc, buf, 10) ) ;
+            sprintf(buf, "%d", rc );
+            message.append( buf ) ;
 
             throw IOException(__FILE__, __LINE__, message.c_str()) ;
         }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/AbstractCommandMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/AbstractCommandMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/AbstractCommandMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/AbstractCommandMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -27,7 +27,7 @@
 #include "io/BinaryWriter.hpp"
 #include "marshal/CommandMarshallerRegistry.hpp"
 #include "util/ifr/p.hpp"
-#include "util/ifr/ap"
+#include "util/ifr/ap.hpp"
 
 namespace apache
 {

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQBytesMessageMarshaller::createObject() 
+IDataStructure* ActiveMQBytesMessageMarshaller::createObject() 
 {
     return new ActiveMQBytesMessage();
 }
 
-byte ActiveMQBytesMessageMarshaller::getDataStructureType() 
+char ActiveMQBytesMessageMarshaller::getDataStructureType() 
 {
     return ActiveMQBytesMessage.ID_ActiveMQBytesMessage;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQBytesMessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQBytesMessageMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQBytesMessageMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQBytesMessageMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQBytesMessage& info = (ActiveMQBytesMessage&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQBytesMessageMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQBytesMessageMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQBytesMessageMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQBytesMessageMarshaller_hpp_
-#define ActiveMQBytesMessageMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQMessageMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller
-{
-public:
-    ActiveMQBytesMessageMarshaller() ;
-    virtual ~ActiveMQBytesMessageMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQBytesMessageMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQBytesMessageMarshaller_hpp_
#define ActiveMQBytesMessageMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#i
 nclude "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQBytesMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQBytesMessageMarshaller() ;
    virtual ~ActiveMQBytesMessageMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    v
 irtual void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQBytesMessageMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -40,7 +40,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQDestinationMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQDestinationMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -53,7 +53,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQDestinationMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQDestinationMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQDestination& info = (ActiveMQDestination&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -65,7 +65,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQDestinationMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQDestinationMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     ActiveMQDestination& info = (ActiveMQDestination&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQDestinationMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQDestinationMarshaller_hpp_
-#define ActiveMQDestinationMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/BaseDataStreamMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
-{
-public:
-    ActiveMQDestinationMarshaller() ;
-    virtual ~ActiveMQDestinationMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQDestinationMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQDestinationMarshaller_hpp_
#define ActiveMQDestinationMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#inc
 lude "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/BaseDataStreamMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQDestinationMarshaller : public BaseDataStreamMarshaller
{
public:
    ActiveMQDestinationMarshaller() ;
    virtual ~ActiveMQDestinationMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual 
 void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQDestinationMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQMapMessageMarshaller::createObject() 
+IDataStructure* ActiveMQMapMessageMarshaller::createObject() 
 {
     return new ActiveMQMapMessage();
 }
 
-byte ActiveMQMapMessageMarshaller::getDataStructureType() 
+char ActiveMQMapMessageMarshaller::getDataStructureType() 
 {
     return ActiveMQMapMessage.ID_ActiveMQMapMessage;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQMapMessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQMapMessageMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQMapMessageMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQMapMessageMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQMapMessage& info = (ActiveMQMapMessage&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQMapMessageMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQMapMessageMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMapMessageMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQMapMessageMarshaller_hpp_
-#define ActiveMQMapMessageMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQMessageMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller
-{
-public:
-    ActiveMQMapMessageMarshaller() ;
-    virtual ~ActiveMQMapMessageMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQMapMessageMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQMapMessageMarshaller_hpp_
#define ActiveMQMapMessageMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#inclu
 de "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQMapMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQMapMessageMarshaller() ;
    virtual ~ActiveMQMapMessageMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual voi
 d marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQMapMessageMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQMessageMarshaller::createObject() 
+IDataStructure* ActiveMQMessageMarshaller::createObject() 
 {
     return new ActiveMQMessage();
 }
 
-byte ActiveMQMessageMarshaller::getDataStructureType() 
+char ActiveMQMessageMarshaller::getDataStructureType() 
 {
     return ActiveMQMessage.ID_ActiveMQMessage;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQMessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQMessageMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -68,7 +68,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQMessageMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQMessageMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQMessage& info = (ActiveMQMessage&) o;
 
     info.beforeMarshall(wireFormat);
@@ -81,7 +81,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQMessageMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQMessageMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
     ActiveMQMessage& info = (ActiveMQMessage&) o;

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQMessageMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQMessageMarshaller_hpp_
-#define ActiveMQMessageMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/MessageMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQMessageMarshaller : public MessageMarshaller
-{
-public:
-    ActiveMQMessageMarshaller() ;
-    virtual ~ActiveMQMessageMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQMessageMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQMessageMarshaller_hpp_
#define ActiveMQMessageMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "co
 mmand/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/MessageMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQMessageMarshaller : public MessageMarshaller
{
public:
    ActiveMQMessageMarshaller() ;
    virtual ~ActiveMQMessageMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(ProtocolFormat& wire
 Format, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQMessageMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQObjectMessageMarshaller::createObject() 
+IDataStructure* ActiveMQObjectMessageMarshaller::createObject() 
 {
     return new ActiveMQObjectMessage();
 }
 
-byte ActiveMQObjectMessageMarshaller::getDataStructureType() 
+char ActiveMQObjectMessageMarshaller::getDataStructureType() 
 {
     return ActiveMQObjectMessage.ID_ActiveMQObjectMessage;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQObjectMessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQObjectMessageMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQObjectMessageMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQObjectMessageMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQObjectMessage& info = (ActiveMQObjectMessage&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQObjectMessageMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQObjectMessageMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQObjectMessageMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQObjectMessageMarshaller_hpp_
-#define ActiveMQObjectMessageMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQMessageMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller
-{
-public:
-    ActiveMQObjectMessageMarshaller() ;
-    virtual ~ActiveMQObjectMessageMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQObjectMessageMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQObjectMessageMarshaller_hpp_
#define ActiveMQObjectMessageMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
 #include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQObjectMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQObjectMessageMarshaller() ;
    virtual ~ActiveMQObjectMessageMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
     virtual void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQObjectMessageMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQQueueMarshaller::createObject() 
+IDataStructure* ActiveMQQueueMarshaller::createObject() 
 {
     return new ActiveMQQueue();
 }
 
-byte ActiveMQQueueMarshaller::getDataStructureType() 
+char ActiveMQQueueMarshaller::getDataStructureType() 
 {
     return ActiveMQQueue.ID_ActiveMQQueue;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQQueueMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQQueueMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQQueueMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQQueueMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQQueue& info = (ActiveMQQueue&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQQueueMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQQueueMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQQueueMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQQueueMarshaller_hpp_
-#define ActiveMQQueueMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQDestinationMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
-{
-public:
-    ActiveMQQueueMarshaller() ;
-    virtual ~ActiveMQQueueMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQQueueMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQQueueMarshaller_hpp_
#define ActiveMQQueueMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include "comman
 d/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQQueueMarshaller : public ActiveMQDestinationMarshaller
{
public:
    ActiveMQQueueMarshaller() ;
    virtual ~ActiveMQQueueMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    virtual void marshal2(Protoc
 olFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQQueueMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQStreamMessageMarshaller::createObject() 
+IDataStructure* ActiveMQStreamMessageMarshaller::createObject() 
 {
     return new ActiveMQStreamMessage();
 }
 
-byte ActiveMQStreamMessageMarshaller::getDataStructureType() 
+char ActiveMQStreamMessageMarshaller::getDataStructureType() 
 {
     return ActiveMQStreamMessage.ID_ActiveMQStreamMessage;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQStreamMessageMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQStreamMessageMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQStreamMessageMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQStreamMessageMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQStreamMessage& info = (ActiveMQStreamMessage&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQStreamMessageMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQStreamMessageMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQStreamMessageMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQStreamMessageMarshaller_hpp_
-#define ActiveMQStreamMessageMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQMessageMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller
-{
-public:
-    ActiveMQStreamMessageMarshaller() ;
-    virtual ~ActiveMQStreamMessageMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQStreamMessageMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQStreamMessageMarshaller_hpp_
#define ActiveMQStreamMessageMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
 #include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQMessageMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQStreamMessageMarshaller : public ActiveMQMessageMarshaller
{
public:
    ActiveMQStreamMessageMarshaller() ;
    virtual ~ActiveMQStreamMessageMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
     virtual void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQStreamMessageMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -40,7 +40,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQTempDestinationMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQTempDestinationMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -50,7 +50,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQTempDestinationMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQTempDestinationMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQTempDestination& info = (ActiveMQTempDestination&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -61,7 +61,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQTempDestinationMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQTempDestinationMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempDestinationMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQTempDestinationMarshaller_hpp_
-#define ActiveMQTempDestinationMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQDestinationMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
-{
-public:
-    ActiveMQTempDestinationMarshaller() ;
-    virtual ~ActiveMQTempDestinationMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQTempDestinationMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQTempDestinationMarshaller_hpp_
#define ActiveMQTempDestinationMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.h
 pp"
#include "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQTempDestinationMarshaller : public ActiveMQDestinationMarshaller
{
public:
    ActiveMQTempDestinationMarshaller() ;
    virtual ~ActiveMQTempDestinationMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, Boo
 leanStream& bs) ;
    virtual void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTempDestinationMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQTempQueueMarshaller::createObject() 
+IDataStructure* ActiveMQTempQueueMarshaller::createObject() 
 {
     return new ActiveMQTempQueue();
 }
 
-byte ActiveMQTempQueueMarshaller::getDataStructureType() 
+char ActiveMQTempQueueMarshaller::getDataStructureType() 
 {
     return ActiveMQTempQueue.ID_ActiveMQTempQueue;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQTempQueueMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQTempQueueMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQTempQueueMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQTempQueueMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQTempQueue& info = (ActiveMQTempQueue&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQTempQueueMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQTempQueueMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempQueueMarshaller.hpp Thu Mar  9 13:11:16 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#ifndef ActiveMQTempQueueMarshaller_hpp_
-#define ActiveMQTempQueueMarshaller_hpp_
-
-#include <string>
-
-#include "command/DataStructure.hpp"
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
-#include "io/BinaryReader.hpp"
-#include "io/BinaryWriter.hpp"
-
-#include "command/ActiveMQTempDestinationMarshaller.hpp"
-#include "util/ifr/p.hpp"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace client
-    {
-      namespace marshal
-      {
-        using namespace ifr ;
-        using namespace apache::activemq::client::command;
-        using namespace apache::activemq::client::io;
-
-/*
- *
- */
-class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
-{
-public:
-    ActiveMQTempQueueMarshaller() ;
-    virtual ~ActiveMQTempQueueMarshaller() ;
-
-    virtual DataStructure* createCommand() ;
-    virtual byte getDataStructureType() ;
-    
-    virtual void unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
-    virtual int marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) ;
-    virtual void marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
-} ;
-
-/* namespace */
-     }
-    }
-  }
-}
-#endif /*ActiveMQTempQueueMarshaller_hpp_*/
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ActiveMQTempQueueMarshaller_hpp_
#define ActiveMQTempQueueMarshaller_hpp_

#include <string>

#include "command/IDataStructure.hpp"

/* we could cut this down  - for now include all possible headers */
#include "command/BrokerId.hpp"
#include "command/ConnectionId.hpp"
#include "command/ConsumerId.hpp"
#include "command/ProducerId.hpp"
#include
  "command/SessionId.hpp"

#include "io/BinaryReader.hpp"
#include "io/BinaryWriter.hpp"

#include "command/ActiveMQTempDestinationMarshaller.hpp"
#include "util/ifr/p.hpp"

#include "protocol/ProtocolFormat.hpp"

namespace apache
{
  namespace activemq
  {
    namespace client
    {
      namespace marshal
      {
        using namespace ifr ;
        using namespace apache::activemq::client::command;
        using namespace apache::activemq::client::io;
        using namespace apache::activemq::client::protocol;

/*
 *
 */
class ActiveMQTempQueueMarshaller : public ActiveMQTempDestinationMarshaller
{
public:
    ActiveMQTempQueueMarshaller() ;
    virtual ~ActiveMQTempQueueMarshaller() ;

    virtual IDataStructure* createCommand() ;
    virtual char getDataStructureType() ;
    
    virtual void unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) ;
    virtual int marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) ;
    
 virtual void marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) ;
} ;

/* namespace */
     }
    }
  }
}
#endif /*ActiveMQTempQueueMarshaller_hpp_*/
\ No newline at end of file

Modified: incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.cpp?rev=384616&r1=384615&r2=384616&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/marshal/ActiveMQTempTopicMarshaller.cpp Thu Mar  9 13:11:16 2006
@@ -38,12 +38,12 @@
 
 
 
-DataStructure* ActiveMQTempTopicMarshaller::createObject() 
+IDataStructure* ActiveMQTempTopicMarshaller::createObject() 
 {
     return new ActiveMQTempTopic();
 }
 
-byte ActiveMQTempTopicMarshaller::getDataStructureType() 
+char ActiveMQTempTopicMarshaller::getDataStructureType() 
 {
     return ActiveMQTempTopic.ID_ActiveMQTempTopic;
 }
@@ -51,7 +51,7 @@
     /* 
      * Un-marshal an object instance from the data input stream
      */ 
-void ActiveMQTempTopicMarshaller::unmarshal(OpenWireFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
+void ActiveMQTempTopicMarshaller::unmarshal(ProtocolFormat& wireFormat, Object o, BinaryReader& dataIn, BooleanStream& bs) 
 {
     base.unmarshal(wireFormat, o, dataIn, bs);
 
@@ -61,7 +61,7 @@
 /*
  * Write the booleans that this object uses to a BooleanStream
  */
-int ActiveMQTempTopicMarshaller::marshal1(OpenWireFormat& wireFormat, Object& o, BooleanStream& bs) {
+int ActiveMQTempTopicMarshaller::marshal1(ProtocolFormat& wireFormat, Object& o, BooleanStream& bs) {
     ActiveMQTempTopic& info = (ActiveMQTempTopic&) o;
 
     int rc = base.marshal1(wireFormat, info, bs);
@@ -72,7 +72,7 @@
 /* 
  * Write a object instance to data output stream
  */
-void ActiveMQTempTopicMarshaller::marshal2(OpenWireFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
+void ActiveMQTempTopicMarshaller::marshal2(ProtocolFormat& wireFormat, Object& o, BinaryWriter& dataOut, BooleanStream& bs) {
     base.marshal2(wireFormat, o, dataOut, bs);
 
 }



Mime
View raw message