svn commit: r406628 [4/10] - in /incubator/activemq/trunk/openwire-cpp: ./ src/gram/java/org/apache/activemq/openwire/tool/ src/gram/script/ src/main/cpp/activemq/ src/main/cpp/activemq/command/ src/main/cpp/activemq/protocol/ src/main/cpp/activemq/pro...

[nm...@apache.org]

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.hpp Mon May 15 06:38:57 2006
@@ -1,101 +1,102 @@
-/*
-* 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 ActiveMQ_DestinationInfo_hpp_
-#define ActiveMQ_DestinationInfo_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/BaseCommand.hpp"
-#include "activemq/command/ConnectionId.hpp"
-#include "activemq/command/ActiveMQDestination.hpp"
-#include "activemq/command/BrokerId.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DestinationInfo
- *
- *
- *  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 DestinationInfo : public BaseCommand
-{
-protected:
-    p<ConnectionId> connectionId ;
-    p<ActiveMQDestination> destination ;
-    char operationType ;
-    long long timeout ;
-    array<BrokerId> brokerPath ;
-
-public:
-    const static unsigned char TYPE = 8;
-
-public:
-    DestinationInfo() ;
-    virtual ~DestinationInfo() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<ConnectionId> getConnectionId() ;
-    virtual void setConnectionId(p<ConnectionId> connectionId) ;
-
-    virtual p<ActiveMQDestination> getDestination() ;
-    virtual void setDestination(p<ActiveMQDestination> destination) ;
-
-    virtual char getOperationType() ;
-    virtual void setOperationType(char operationType) ;
-
-    virtual long long getTimeout() ;
-    virtual void setTimeout(long long timeout) ;
-
-    virtual array<BrokerId> getBrokerPath() ;
-    virtual void setBrokerPath(array<BrokerId> brokerPath) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_DestinationInfo_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 ActiveMQ_DestinationInfo_hpp_
+#define ActiveMQ_DestinationInfo_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseCommand.hpp"
+#include "activemq/command/ConnectionId.hpp"
+#include "activemq/command/ActiveMQDestination.hpp"
+#include "activemq/command/BrokerId.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for DestinationInfo
+ *
+ *
+ *  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 DestinationInfo : public BaseCommand
+{
+protected:
+    p<ConnectionId> connectionId ;
+    p<ActiveMQDestination> destination ;
+    char operationType ;
+    long long timeout ;
+    array<BrokerId> brokerPath ;
+
+public:
+    const static unsigned char TYPE = 8;
+
+public:
+    DestinationInfo() ;
+    virtual ~DestinationInfo() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual char getOperationType() ;
+    virtual void setOperationType(char operationType) ;
+
+    virtual long long getTimeout() ;
+    virtual void setTimeout(long long timeout) ;
+
+    virtual array<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(array<BrokerId> brokerPath) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_DestinationInfo_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.cpp Mon May 15 06:38:57 2006
@@ -1,85 +1,83 @@
-/*
-* 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.
-*/
-#include "activemq/command/DiscoveryEvent.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DiscoveryEvent
- *
- *
- *  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
- *
- */
-DiscoveryEvent::DiscoveryEvent()
-{
-    this->serviceName = NULL ;
-    this->brokerName = NULL ;
-}
-
-DiscoveryEvent::~DiscoveryEvent()
-{
-}
-
-unsigned char DiscoveryEvent::getDataStructureType()
-{
-    return DiscoveryEvent::TYPE ; 
-}
-
-        
-p<string> DiscoveryEvent::getServiceName()
-{
-    return serviceName ;
-}
-
-void DiscoveryEvent::setServiceName(p<string> serviceName)
-{
-    this->serviceName = serviceName ;
-}
-
-        
-p<string> DiscoveryEvent::getBrokerName()
-{
-    return brokerName ;
-}
-
-void DiscoveryEvent::setBrokerName(p<string> brokerName)
-{
-    this->brokerName = brokerName ;
-}
-
-int DiscoveryEvent::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalString(serviceName, mode, writer) ; 
-    size += marshaller->marshalString(brokerName, mode, writer) ; 
-    return size ;
-}
-
-void DiscoveryEvent::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    serviceName = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    brokerName = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/DiscoveryEvent.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for DiscoveryEvent
+ *
+ *
+ *  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
+ *
+ */
+DiscoveryEvent::DiscoveryEvent()
+{
+    this->serviceName = NULL ;
+    this->brokerName = NULL ;
+}
+
+DiscoveryEvent::~DiscoveryEvent()
+{
+}
+
+unsigned char DiscoveryEvent::getDataStructureType()
+{
+    return DiscoveryEvent::TYPE ; 
+}
+
+        
+p<string> DiscoveryEvent::getServiceName()
+{
+    return serviceName ;
+}
+
+void DiscoveryEvent::setServiceName(p<string> serviceName)
+{
+    this->serviceName = serviceName ;
+}
+
+        
+p<string> DiscoveryEvent::getBrokerName()
+{
+    return brokerName ;
+}
+
+void DiscoveryEvent::setBrokerName(p<string> brokerName)
+{
+    this->brokerName = brokerName ;
+}
+
+int DiscoveryEvent::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseDataStructure::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalString(serviceName, mode, ostream) ; 
+    size += marshaller->marshalString(brokerName, mode, ostream) ; 
+    return size ;
+}
+
+void DiscoveryEvent::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseDataStructure::unmarshal(marshaller, mode, istream) ; 
+    serviceName = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    brokerName = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DiscoveryEvent.hpp Mon May 15 06:38:57 2006
@@ -1,86 +1,87 @@
-/*
-* 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 ActiveMQ_DiscoveryEvent_hpp_
-#define ActiveMQ_DiscoveryEvent_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/AbstractCommand.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DiscoveryEvent
- *
- *
- *  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 DiscoveryEvent : public AbstractCommand
-{
-protected:
-    p<string> serviceName ;
-    p<string> brokerName ;
-
-public:
-    const static unsigned char TYPE = 40;
-
-public:
-    DiscoveryEvent() ;
-    virtual ~DiscoveryEvent() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<string> getServiceName() ;
-    virtual void setServiceName(p<string> serviceName) ;
-
-    virtual p<string> getBrokerName() ;
-    virtual void setBrokerName(p<string> brokerName) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_DiscoveryEvent_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 ActiveMQ_DiscoveryEvent_hpp_
+#define ActiveMQ_DiscoveryEvent_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseDataStructure.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for DiscoveryEvent
+ *
+ *
+ *  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 DiscoveryEvent : public BaseDataStructure
+{
+protected:
+    p<string> serviceName ;
+    p<string> brokerName ;
+
+public:
+    const static unsigned char TYPE = 40;
+
+public:
+    DiscoveryEvent() ;
+    virtual ~DiscoveryEvent() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<string> getServiceName() ;
+    virtual void setServiceName(p<string> serviceName) ;
+
+    virtual p<string> getBrokerName() ;
+    virtual void setBrokerName(p<string> brokerName) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_DiscoveryEvent_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.cpp Mon May 15 06:38:57 2006
@@ -1,71 +1,69 @@
-/*
-* 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.
-*/
-#include "activemq/command/ExceptionResponse.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ExceptionResponse
- *
- *
- *  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
- *
- */
-ExceptionResponse::ExceptionResponse()
-{
-    this->exception = NULL ;
-}
-
-ExceptionResponse::~ExceptionResponse()
-{
-}
-
-unsigned char ExceptionResponse::getDataStructureType()
-{
-    return ExceptionResponse::TYPE ; 
-}
-
-        
-p<BrokerError> ExceptionResponse::getException()
-{
-    return exception ;
-}
-
-void ExceptionResponse::setException(p<BrokerError> exception)
-{
-    this->exception = exception ;
-}
-
-int ExceptionResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalObject(exception, mode, writer) ; 
-    return size ;
-}
-
-void ExceptionResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    exception = p_cast<BrokerError>(marshaller->unmarshalObject(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/ExceptionResponse.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ExceptionResponse
+ *
+ *
+ *  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
+ *
+ */
+ExceptionResponse::ExceptionResponse()
+{
+    this->exception = NULL ;
+}
+
+ExceptionResponse::~ExceptionResponse()
+{
+}
+
+unsigned char ExceptionResponse::getDataStructureType()
+{
+    return ExceptionResponse::TYPE ; 
+}
+
+        
+p<BrokerError> ExceptionResponse::getException()
+{
+    return exception ;
+}
+
+void ExceptionResponse::setException(p<BrokerError> exception)
+{
+    this->exception = exception ;
+}
+
+int ExceptionResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += Response::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(exception, mode, ostream) ; 
+    return size ;
+}
+
+void ExceptionResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    Response::unmarshal(marshaller, mode, istream) ; 
+    exception = p_cast<BrokerError>(marshaller->unmarshalObject(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ExceptionResponse.hpp Mon May 15 06:38:57 2006
@@ -1,83 +1,84 @@
-/*
-* 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 ActiveMQ_ExceptionResponse_hpp_
-#define ActiveMQ_ExceptionResponse_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/Response.hpp"
-#include "activemq/command/BrokerError.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ExceptionResponse
- *
- *
- *  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 ExceptionResponse : public Response
-{
-protected:
-    p<BrokerError> exception ;
-
-public:
-    const static unsigned char TYPE = 31;
-
-public:
-    ExceptionResponse() ;
-    virtual ~ExceptionResponse() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<BrokerError> getException() ;
-    virtual void setException(p<BrokerError> exception) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_ExceptionResponse_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 ActiveMQ_ExceptionResponse_hpp_
+#define ActiveMQ_ExceptionResponse_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/Response.hpp"
+#include "activemq/command/BrokerError.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ExceptionResponse
+ *
+ *
+ *  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 ExceptionResponse : public Response
+{
+protected:
+    p<BrokerError> exception ;
+
+public:
+    const static unsigned char TYPE = 31;
+
+public:
+    ExceptionResponse() ;
+    virtual ~ExceptionResponse() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<BrokerError> getException() ;
+    virtual void setException(p<BrokerError> exception) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_ExceptionResponse_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.cpp Mon May 15 06:38:57 2006
@@ -1,57 +1,55 @@
-/*
-* 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.
-*/
-#include "activemq/command/FlushCommand.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for FlushCommand
- *
- *
- *  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
- *
- */
-FlushCommand::FlushCommand()
-{
-}
-
-FlushCommand::~FlushCommand()
-{
-}
-
-unsigned char FlushCommand::getDataStructureType()
-{
-    return FlushCommand::TYPE ; 
-}
-
-int FlushCommand::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    return size ;
-}
-
-void FlushCommand::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/FlushCommand.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for FlushCommand
+ *
+ *
+ *  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
+ *
+ */
+FlushCommand::FlushCommand()
+{
+}
+
+FlushCommand::~FlushCommand()
+{
+}
+
+unsigned char FlushCommand::getDataStructureType()
+{
+    return FlushCommand::TYPE ; 
+}
+
+int FlushCommand::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseCommand::marshal(marshaller, mode, ostream) ; 
+    return size ;
+}
+
+void FlushCommand::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseCommand::unmarshal(marshaller, mode, istream) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/FlushCommand.hpp Mon May 15 06:38:57 2006
@@ -1,78 +1,79 @@
-/*
-* 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 ActiveMQ_FlushCommand_hpp_
-#define ActiveMQ_FlushCommand_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/BaseCommand.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for FlushCommand
- *
- *
- *  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 FlushCommand : public BaseCommand
-{
-protected:
-
-public:
-    const static unsigned char TYPE = 15;
-
-public:
-    FlushCommand() ;
-    virtual ~FlushCommand() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_FlushCommand_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 ActiveMQ_FlushCommand_hpp_
+#define ActiveMQ_FlushCommand_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseCommand.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for FlushCommand
+ *
+ *
+ *  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 FlushCommand : public BaseCommand
+{
+protected:
+
+public:
+    const static unsigned char TYPE = 15;
+
+public:
+    FlushCommand() ;
+    virtual ~FlushCommand() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_FlushCommand_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.cpp Mon May 15 06:38:57 2006
@@ -1,71 +1,69 @@
-/*
-* 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.
-*/
-#include "activemq/command/IntegerResponse.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for IntegerResponse
- *
- *
- *  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
- *
- */
-IntegerResponse::IntegerResponse()
-{
-    this->result = 0 ;
-}
-
-IntegerResponse::~IntegerResponse()
-{
-}
-
-unsigned char IntegerResponse::getDataStructureType()
-{
-    return IntegerResponse::TYPE ; 
-}
-
-        
-int IntegerResponse::getResult()
-{
-    return result ;
-}
-
-void IntegerResponse::setResult(int result)
-{
-    this->result = result ;
-}
-
-int IntegerResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalInt(result, mode, writer) ; 
-    return size ;
-}
-
-void IntegerResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    result = (marshaller->unmarshalInt(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/IntegerResponse.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for IntegerResponse
+ *
+ *
+ *  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
+ *
+ */
+IntegerResponse::IntegerResponse()
+{
+    this->result = 0 ;
+}
+
+IntegerResponse::~IntegerResponse()
+{
+}
+
+unsigned char IntegerResponse::getDataStructureType()
+{
+    return IntegerResponse::TYPE ; 
+}
+
+        
+int IntegerResponse::getResult()
+{
+    return result ;
+}
+
+void IntegerResponse::setResult(int result)
+{
+    this->result = result ;
+}
+
+int IntegerResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += Response::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalInt(result, mode, ostream) ; 
+    return size ;
+}
+
+void IntegerResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    Response::unmarshal(marshaller, mode, istream) ; 
+    result = (marshaller->unmarshalInt(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/IntegerResponse.hpp Mon May 15 06:38:57 2006
@@ -1,82 +1,83 @@
-/*
-* 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 ActiveMQ_IntegerResponse_hpp_
-#define ActiveMQ_IntegerResponse_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/Response.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for IntegerResponse
- *
- *
- *  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 IntegerResponse : public Response
-{
-protected:
-    int result ;
-
-public:
-    const static unsigned char TYPE = 34;
-
-public:
-    IntegerResponse() ;
-    virtual ~IntegerResponse() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual int getResult() ;
-    virtual void setResult(int result) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_IntegerResponse_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 ActiveMQ_IntegerResponse_hpp_
+#define ActiveMQ_IntegerResponse_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/Response.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for IntegerResponse
+ *
+ *
+ *  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 IntegerResponse : public Response
+{
+protected:
+    int result ;
+
+public:
+    const static unsigned char TYPE = 34;
+
+public:
+    IntegerResponse() ;
+    virtual ~IntegerResponse() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual int getResult() ;
+    virtual void setResult(int result) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_IntegerResponse_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.cpp Mon May 15 06:38:57 2006
@@ -1,85 +1,83 @@
-/*
-* 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.
-*/
-#include "activemq/command/JournalQueueAck.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalQueueAck
- *
- *
- *  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
- *
- */
-JournalQueueAck::JournalQueueAck()
-{
-    this->destination = NULL ;
-    this->messageAck = NULL ;
-}
-
-JournalQueueAck::~JournalQueueAck()
-{
-}
-
-unsigned char JournalQueueAck::getDataStructureType()
-{
-    return JournalQueueAck::TYPE ; 
-}
-
-        
-p<ActiveMQDestination> JournalQueueAck::getDestination()
-{
-    return destination ;
-}
-
-void JournalQueueAck::setDestination(p<ActiveMQDestination> destination)
-{
-    this->destination = destination ;
-}
-
-        
-p<MessageAck> JournalQueueAck::getMessageAck()
-{
-    return messageAck ;
-}
-
-void JournalQueueAck::setMessageAck(p<MessageAck> messageAck)
-{
-    this->messageAck = messageAck ;
-}
-
-int JournalQueueAck::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalObject(destination, mode, writer) ; 
-    size += marshaller->marshalObject(messageAck, mode, writer) ; 
-    return size ;
-}
-
-void JournalQueueAck::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, reader)) ; 
-    messageAck = p_cast<MessageAck>(marshaller->unmarshalObject(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/JournalQueueAck.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalQueueAck
+ *
+ *
+ *  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
+ *
+ */
+JournalQueueAck::JournalQueueAck()
+{
+    this->destination = NULL ;
+    this->messageAck = NULL ;
+}
+
+JournalQueueAck::~JournalQueueAck()
+{
+}
+
+unsigned char JournalQueueAck::getDataStructureType()
+{
+    return JournalQueueAck::TYPE ; 
+}
+
+        
+p<ActiveMQDestination> JournalQueueAck::getDestination()
+{
+    return destination ;
+}
+
+void JournalQueueAck::setDestination(p<ActiveMQDestination> destination)
+{
+    this->destination = destination ;
+}
+
+        
+p<MessageAck> JournalQueueAck::getMessageAck()
+{
+    return messageAck ;
+}
+
+void JournalQueueAck::setMessageAck(p<MessageAck> messageAck)
+{
+    this->messageAck = messageAck ;
+}
+
+int JournalQueueAck::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseDataStructure::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(destination, mode, ostream) ; 
+    size += marshaller->marshalObject(messageAck, mode, ostream) ; 
+    return size ;
+}
+
+void JournalQueueAck::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseDataStructure::unmarshal(marshaller, mode, istream) ; 
+    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, istream)) ; 
+    messageAck = p_cast<MessageAck>(marshaller->unmarshalObject(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalQueueAck.hpp Mon May 15 06:38:57 2006
@@ -1,88 +1,89 @@
-/*
-* 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 ActiveMQ_JournalQueueAck_hpp_
-#define ActiveMQ_JournalQueueAck_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/AbstractCommand.hpp"
-#include "activemq/command/ActiveMQDestination.hpp"
-#include "activemq/command/MessageAck.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalQueueAck
- *
- *
- *  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 JournalQueueAck : public AbstractCommand
-{
-protected:
-    p<ActiveMQDestination> destination ;
-    p<MessageAck> messageAck ;
-
-public:
-    const static unsigned char TYPE = 52;
-
-public:
-    JournalQueueAck() ;
-    virtual ~JournalQueueAck() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<ActiveMQDestination> getDestination() ;
-    virtual void setDestination(p<ActiveMQDestination> destination) ;
-
-    virtual p<MessageAck> getMessageAck() ;
-    virtual void setMessageAck(p<MessageAck> messageAck) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_JournalQueueAck_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 ActiveMQ_JournalQueueAck_hpp_
+#define ActiveMQ_JournalQueueAck_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseDataStructure.hpp"
+#include "activemq/command/ActiveMQDestination.hpp"
+#include "activemq/command/MessageAck.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalQueueAck
+ *
+ *
+ *  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 JournalQueueAck : public BaseDataStructure
+{
+protected:
+    p<ActiveMQDestination> destination ;
+    p<MessageAck> messageAck ;
+
+public:
+    const static unsigned char TYPE = 52;
+
+public:
+    JournalQueueAck() ;
+    virtual ~JournalQueueAck() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<MessageAck> getMessageAck() ;
+    virtual void setMessageAck(p<MessageAck> messageAck) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_JournalQueueAck_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.cpp Mon May 15 06:38:57 2006
@@ -1,141 +1,139 @@
-/*
-* 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.
-*/
-#include "activemq/command/JournalTopicAck.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalTopicAck
- *
- *
- *  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
- *
- */
-JournalTopicAck::JournalTopicAck()
-{
-    this->destination = NULL ;
-    this->messageId = NULL ;
-    this->messageSequenceId = 0 ;
-    this->subscritionName = NULL ;
-    this->clientId = NULL ;
-    this->transactionId = NULL ;
-}
-
-JournalTopicAck::~JournalTopicAck()
-{
-}
-
-unsigned char JournalTopicAck::getDataStructureType()
-{
-    return JournalTopicAck::TYPE ; 
-}
-
-        
-p<ActiveMQDestination> JournalTopicAck::getDestination()
-{
-    return destination ;
-}
-
-void JournalTopicAck::setDestination(p<ActiveMQDestination> destination)
-{
-    this->destination = destination ;
-}
-
-        
-p<MessageId> JournalTopicAck::getMessageId()
-{
-    return messageId ;
-}
-
-void JournalTopicAck::setMessageId(p<MessageId> messageId)
-{
-    this->messageId = messageId ;
-}
-
-        
-long long JournalTopicAck::getMessageSequenceId()
-{
-    return messageSequenceId ;
-}
-
-void JournalTopicAck::setMessageSequenceId(long long messageSequenceId)
-{
-    this->messageSequenceId = messageSequenceId ;
-}
-
-        
-p<string> JournalTopicAck::getSubscritionName()
-{
-    return subscritionName ;
-}
-
-void JournalTopicAck::setSubscritionName(p<string> subscritionName)
-{
-    this->subscritionName = subscritionName ;
-}
-
-        
-p<string> JournalTopicAck::getClientId()
-{
-    return clientId ;
-}
-
-void JournalTopicAck::setClientId(p<string> clientId)
-{
-    this->clientId = clientId ;
-}
-
-        
-p<TransactionId> JournalTopicAck::getTransactionId()
-{
-    return transactionId ;
-}
-
-void JournalTopicAck::setTransactionId(p<TransactionId> transactionId)
-{
-    this->transactionId = transactionId ;
-}
-
-int JournalTopicAck::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalObject(destination, mode, writer) ; 
-    size += marshaller->marshalObject(messageId, mode, writer) ; 
-    size += marshaller->marshalLong(messageSequenceId, mode, writer) ; 
-    size += marshaller->marshalString(subscritionName, mode, writer) ; 
-    size += marshaller->marshalString(clientId, mode, writer) ; 
-    size += marshaller->marshalObject(transactionId, mode, writer) ; 
-    return size ;
-}
-
-void JournalTopicAck::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, reader)) ; 
-    messageId = p_cast<MessageId>(marshaller->unmarshalObject(mode, reader)) ; 
-    messageSequenceId = (marshaller->unmarshalLong(mode, reader)) ; 
-    subscritionName = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    clientId = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    transactionId = p_cast<TransactionId>(marshaller->unmarshalObject(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/JournalTopicAck.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalTopicAck
+ *
+ *
+ *  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
+ *
+ */
+JournalTopicAck::JournalTopicAck()
+{
+    this->destination = NULL ;
+    this->messageId = NULL ;
+    this->messageSequenceId = 0 ;
+    this->subscritionName = NULL ;
+    this->clientId = NULL ;
+    this->transactionId = NULL ;
+}
+
+JournalTopicAck::~JournalTopicAck()
+{
+}
+
+unsigned char JournalTopicAck::getDataStructureType()
+{
+    return JournalTopicAck::TYPE ; 
+}
+
+        
+p<ActiveMQDestination> JournalTopicAck::getDestination()
+{
+    return destination ;
+}
+
+void JournalTopicAck::setDestination(p<ActiveMQDestination> destination)
+{
+    this->destination = destination ;
+}
+
+        
+p<MessageId> JournalTopicAck::getMessageId()
+{
+    return messageId ;
+}
+
+void JournalTopicAck::setMessageId(p<MessageId> messageId)
+{
+    this->messageId = messageId ;
+}
+
+        
+long long JournalTopicAck::getMessageSequenceId()
+{
+    return messageSequenceId ;
+}
+
+void JournalTopicAck::setMessageSequenceId(long long messageSequenceId)
+{
+    this->messageSequenceId = messageSequenceId ;
+}
+
+        
+p<string> JournalTopicAck::getSubscritionName()
+{
+    return subscritionName ;
+}
+
+void JournalTopicAck::setSubscritionName(p<string> subscritionName)
+{
+    this->subscritionName = subscritionName ;
+}
+
+        
+p<string> JournalTopicAck::getClientId()
+{
+    return clientId ;
+}
+
+void JournalTopicAck::setClientId(p<string> clientId)
+{
+    this->clientId = clientId ;
+}
+
+        
+p<TransactionId> JournalTopicAck::getTransactionId()
+{
+    return transactionId ;
+}
+
+void JournalTopicAck::setTransactionId(p<TransactionId> transactionId)
+{
+    this->transactionId = transactionId ;
+}
+
+int JournalTopicAck::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseDataStructure::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(destination, mode, ostream) ; 
+    size += marshaller->marshalObject(messageId, mode, ostream) ; 
+    size += marshaller->marshalLong(messageSequenceId, mode, ostream) ; 
+    size += marshaller->marshalString(subscritionName, mode, ostream) ; 
+    size += marshaller->marshalString(clientId, mode, ostream) ; 
+    size += marshaller->marshalObject(transactionId, mode, ostream) ; 
+    return size ;
+}
+
+void JournalTopicAck::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseDataStructure::unmarshal(marshaller, mode, istream) ; 
+    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, istream)) ; 
+    messageId = p_cast<MessageId>(marshaller->unmarshalObject(mode, istream)) ; 
+    messageSequenceId = (marshaller->unmarshalLong(mode, istream)) ; 
+    subscritionName = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    clientId = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    transactionId = p_cast<TransactionId>(marshaller->unmarshalObject(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTopicAck.hpp Mon May 15 06:38:57 2006
@@ -1,105 +1,106 @@
-/*
-* 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 ActiveMQ_JournalTopicAck_hpp_
-#define ActiveMQ_JournalTopicAck_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/AbstractCommand.hpp"
-#include "activemq/command/ActiveMQDestination.hpp"
-#include "activemq/command/MessageId.hpp"
-#include "activemq/command/TransactionId.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalTopicAck
- *
- *
- *  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 JournalTopicAck : public AbstractCommand
-{
-protected:
-    p<ActiveMQDestination> destination ;
-    p<MessageId> messageId ;
-    long long messageSequenceId ;
-    p<string> subscritionName ;
-    p<string> clientId ;
-    p<TransactionId> transactionId ;
-
-public:
-    const static unsigned char TYPE = 50;
-
-public:
-    JournalTopicAck() ;
-    virtual ~JournalTopicAck() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<ActiveMQDestination> getDestination() ;
-    virtual void setDestination(p<ActiveMQDestination> destination) ;
-
-    virtual p<MessageId> getMessageId() ;
-    virtual void setMessageId(p<MessageId> messageId) ;
-
-    virtual long long getMessageSequenceId() ;
-    virtual void setMessageSequenceId(long long messageSequenceId) ;
-
-    virtual p<string> getSubscritionName() ;
-    virtual void setSubscritionName(p<string> subscritionName) ;
-
-    virtual p<string> getClientId() ;
-    virtual void setClientId(p<string> clientId) ;
-
-    virtual p<TransactionId> getTransactionId() ;
-    virtual void setTransactionId(p<TransactionId> transactionId) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_JournalTopicAck_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 ActiveMQ_JournalTopicAck_hpp_
+#define ActiveMQ_JournalTopicAck_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseDataStructure.hpp"
+#include "activemq/command/ActiveMQDestination.hpp"
+#include "activemq/command/MessageId.hpp"
+#include "activemq/command/TransactionId.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalTopicAck
+ *
+ *
+ *  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 JournalTopicAck : public BaseDataStructure
+{
+protected:
+    p<ActiveMQDestination> destination ;
+    p<MessageId> messageId ;
+    long long messageSequenceId ;
+    p<string> subscritionName ;
+    p<string> clientId ;
+    p<TransactionId> transactionId ;
+
+public:
+    const static unsigned char TYPE = 50;
+
+public:
+    JournalTopicAck() ;
+    virtual ~JournalTopicAck() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual p<MessageId> getMessageId() ;
+    virtual void setMessageId(p<MessageId> messageId) ;
+
+    virtual long long getMessageSequenceId() ;
+    virtual void setMessageSequenceId(long long messageSequenceId) ;
+
+    virtual p<string> getSubscritionName() ;
+    virtual void setSubscritionName(p<string> subscritionName) ;
+
+    virtual p<string> getClientId() ;
+    virtual void setClientId(p<string> clientId) ;
+
+    virtual p<TransactionId> getTransactionId() ;
+    virtual void setTransactionId(p<TransactionId> transactionId) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_JournalTopicAck_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.cpp Mon May 15 06:38:57 2006
@@ -1,71 +1,69 @@
-/*
-* 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.
-*/
-#include "activemq/command/JournalTrace.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalTrace
- *
- *
- *  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
- *
- */
-JournalTrace::JournalTrace()
-{
-    this->message = NULL ;
-}
-
-JournalTrace::~JournalTrace()
-{
-}
-
-unsigned char JournalTrace::getDataStructureType()
-{
-    return JournalTrace::TYPE ; 
-}
-
-        
-p<string> JournalTrace::getMessage()
-{
-    return message ;
-}
-
-void JournalTrace::setMessage(p<string> message)
-{
-    this->message = message ;
-}
-
-int JournalTrace::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalInt(commandId, mode, writer) ;
-    size += marshaller->marshalBoolean(responseRequired, mode, writer) ; 
-    size += marshaller->marshalString(message, mode, writer) ; 
-    return size ;
-}
-
-void JournalTrace::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    message = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-}
+/*
+* 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.
+*/
+#include "activemq/command/JournalTrace.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalTrace
+ *
+ *
+ *  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
+ *
+ */
+JournalTrace::JournalTrace()
+{
+    this->message = NULL ;
+}
+
+JournalTrace::~JournalTrace()
+{
+}
+
+unsigned char JournalTrace::getDataStructureType()
+{
+    return JournalTrace::TYPE ; 
+}
+
+        
+p<string> JournalTrace::getMessage()
+{
+    return message ;
+}
+
+void JournalTrace::setMessage(p<string> message)
+{
+    this->message = message ;
+}
+
+int JournalTrace::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseDataStructure::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalString(message, mode, ostream) ; 
+    return size ;
+}
+
+void JournalTrace::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseDataStructure::unmarshal(marshaller, mode, istream) ; 
+    message = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/JournalTrace.hpp Mon May 15 06:38:57 2006
@@ -1,82 +1,83 @@
-/*
-* 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 ActiveMQ_JournalTrace_hpp_
-#define ActiveMQ_JournalTrace_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/command/AbstractCommand.hpp"
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
-      using namespace apache::activemq;
-      using namespace apache::activemq::protocol;
-      using namespace apache::ppr::io;
-
-/*
- *
- *  Marshalling code for Open Wire Format for JournalTrace
- *
- *
- *  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 JournalTrace : public AbstractCommand
-{
-protected:
-    p<string> message ;
-
-public:
-    const static unsigned char TYPE = 53;
-
-public:
-    JournalTrace() ;
-    virtual ~JournalTrace() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<string> getMessage() ;
-    virtual void setMessage(p<string> message) ;
-
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_JournalTrace_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 ActiveMQ_JournalTrace_hpp_
+#define ActiveMQ_JournalTrace_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+#include "activemq/command/BaseDataStructure.hpp"
+
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
+      using namespace apache::activemq;
+      using namespace apache::activemq::protocol;
+      using namespace apache::ppr::io;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for JournalTrace
+ *
+ *
+ *  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 JournalTrace : public BaseDataStructure
+{
+protected:
+    p<string> message ;
+
+public:
+    const static unsigned char TYPE = 53;
+
+public:
+    JournalTrace() ;
+    virtual ~JournalTrace() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<string> getMessage() ;
+    virtual void setMessage(p<string> message) ;
+
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_JournalTrace_hpp_*/