svn commit: r406628 [3/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/ConnectionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConnectionInfo.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConnectionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConnectionInfo.hpp Mon May 15 06:38:57 2006
@@ -1,100 +1,109 @@
-/*
-* 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_ConnectionInfo_hpp_
-#define ActiveMQ_ConnectionInfo_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/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 ConnectionInfo
- *
- *
- *  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 ConnectionInfo : public BaseCommand
-{
-protected:
-    p<ConnectionId> connectionId ;
-    p<string> clientId ;
-    p<string> password ;
-    p<string> userName ;
-    array<BrokerId> brokerPath ;
-
-public:
-    const static unsigned char TYPE = 3;
-
-public:
-    ConnectionInfo() ;
-    virtual ~ConnectionInfo() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<ConnectionId> getConnectionId() ;
-    virtual void setConnectionId(p<ConnectionId> connectionId) ;
-
-    virtual p<string> getClientId() ;
-    virtual void setClientId(p<string> clientId) ;
-
-    virtual p<string> getPassword() ;
-    virtual void setPassword(p<string> password) ;
-
-    virtual p<string> getUserName() ;
-    virtual void setUserName(p<string> userName) ;
-
-    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_ConnectionInfo_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_ConnectionInfo_hpp_
+#define ActiveMQ_ConnectionInfo_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/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 ConnectionInfo
+ *
+ *
+ *  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 ConnectionInfo : public BaseCommand
+{
+protected:
+    p<ConnectionId> connectionId ;
+    p<string> clientId ;
+    p<string> password ;
+    p<string> userName ;
+    array<BrokerId> brokerPath ;
+    bool brokerMasterConnector ;
+    bool manageable ;
+
+public:
+    const static unsigned char TYPE = 3;
+
+public:
+    ConnectionInfo() ;
+    virtual ~ConnectionInfo() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<ConnectionId> getConnectionId() ;
+    virtual void setConnectionId(p<ConnectionId> connectionId) ;
+
+    virtual p<string> getClientId() ;
+    virtual void setClientId(p<string> clientId) ;
+
+    virtual p<string> getPassword() ;
+    virtual void setPassword(p<string> password) ;
+
+    virtual p<string> getUserName() ;
+    virtual void setUserName(p<string> userName) ;
+
+    virtual array<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(array<BrokerId> brokerPath) ;
+
+    virtual bool getBrokerMasterConnector() ;
+    virtual void setBrokerMasterConnector(bool brokerMasterConnector) ;
+
+    virtual bool getManageable() ;
+    virtual void setManageable(bool manageable) ;
+
+    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_ConnectionInfo_hpp_*/

Added: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.cpp?rev=406628&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.cpp (added)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.cpp Mon May 15 06:38:57 2006
@@ -0,0 +1,97 @@
+/*
+* 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/ConsumerControl.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ConsumerControl
+ *
+ *
+ *  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
+ *
+ */
+ConsumerControl::ConsumerControl()
+{
+    this->close = false ;
+    this->consumerId = NULL ;
+    this->prefetch = 0 ;
+}
+
+ConsumerControl::~ConsumerControl()
+{
+}
+
+unsigned char ConsumerControl::getDataStructureType()
+{
+    return ConsumerControl::TYPE ; 
+}
+
+        
+bool ConsumerControl::getClose()
+{
+    return close ;
+}
+
+void ConsumerControl::setClose(bool close)
+{
+    this->close = close ;
+}
+
+        
+p<ConsumerId> ConsumerControl::getConsumerId()
+{
+    return consumerId ;
+}
+
+void ConsumerControl::setConsumerId(p<ConsumerId> consumerId)
+{
+    this->consumerId = consumerId ;
+}
+
+        
+int ConsumerControl::getPrefetch()
+{
+    return prefetch ;
+}
+
+void ConsumerControl::setPrefetch(int prefetch)
+{
+    this->prefetch = prefetch ;
+}
+
+int ConsumerControl::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseCommand::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalBoolean(close, mode, ostream) ; 
+    size += marshaller->marshalObject(consumerId, mode, ostream) ; 
+    size += marshaller->marshalInt(prefetch, mode, ostream) ; 
+    return size ;
+}
+
+void ConsumerControl::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseCommand::unmarshal(marshaller, mode, istream) ; 
+    close = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    consumerId = p_cast<ConsumerId>(marshaller->unmarshalObject(mode, istream)) ; 
+    prefetch = (marshaller->unmarshalInt(mode, istream)) ; 
+}

Added: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.hpp?rev=406628&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.hpp (added)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerControl.hpp Mon May 15 06:38:57 2006
@@ -0,0 +1,92 @@
+/*
+* 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_ConsumerControl_hpp_
+#define ActiveMQ_ConsumerControl_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/ConsumerId.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 ConsumerControl
+ *
+ *
+ *  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 ConsumerControl : public BaseCommand
+{
+protected:
+    bool close ;
+    p<ConsumerId> consumerId ;
+    int prefetch ;
+
+public:
+    const static unsigned char TYPE = 17;
+
+public:
+    ConsumerControl() ;
+    virtual ~ConsumerControl() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual bool getClose() ;
+    virtual void setClose(bool close) ;
+
+    virtual p<ConsumerId> getConsumerId() ;
+    virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+    virtual int getPrefetch() ;
+    virtual void setPrefetch(int prefetch) ;
+
+    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_ConsumerControl_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.cpp Mon May 15 06:38:57 2006
@@ -1,95 +1,97 @@
-/*
-* 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/ConsumerId.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ConsumerId
- *
- *
- *  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
- *
- */
-ConsumerId::ConsumerId()
-{
-    this->connectionId = NULL ;
-    this->sessionId = 0 ;
-    this->value = 0 ;
-}
-
-ConsumerId::~ConsumerId()
-{
-}
-
-unsigned char ConsumerId::getDataStructureType()
-{
-    return ConsumerId::TYPE ; 
-}
-
-        
-p<string> ConsumerId::getConnectionId()
-{
-    return connectionId ;
-}
-
-void ConsumerId::setConnectionId(p<string> connectionId)
-{
-    this->connectionId = connectionId ;
-}
-
-        
-long long ConsumerId::getSessionId()
-{
-    return sessionId ;
-}
-
-void ConsumerId::setSessionId(long long sessionId)
-{
-    this->sessionId = sessionId ;
-}
-
-        
-long long ConsumerId::getValue()
-{
-    return value ;
-}
-
-void ConsumerId::setValue(long long value)
-{
-    this->value = value ;
-}
-
-int ConsumerId::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> writer) throw (IOException)
-{
-    int size = 0 ;
-
-    size += marshaller->marshalString(connectionId, mode, writer) ; 
-    size += marshaller->marshalLong(sessionId, mode, writer) ; 
-    size += marshaller->marshalLong(value, mode, writer) ; 
-    return size ;
-}
-
-void ConsumerId::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    connectionId = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    sessionId = (marshaller->unmarshalLong(mode, reader)) ; 
-    value = (marshaller->unmarshalLong(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/ConsumerId.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ConsumerId
+ *
+ *
+ *  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
+ *
+ */
+ConsumerId::ConsumerId()
+{
+    this->connectionId = NULL ;
+    this->sessionId = 0 ;
+    this->value = 0 ;
+}
+
+ConsumerId::~ConsumerId()
+{
+}
+
+unsigned char ConsumerId::getDataStructureType()
+{
+    return ConsumerId::TYPE ; 
+}
+
+        
+p<string> ConsumerId::getConnectionId()
+{
+    return connectionId ;
+}
+
+void ConsumerId::setConnectionId(p<string> connectionId)
+{
+    this->connectionId = connectionId ;
+}
+
+        
+long long ConsumerId::getSessionId()
+{
+    return sessionId ;
+}
+
+void ConsumerId::setSessionId(long long sessionId)
+{
+    this->sessionId = sessionId ;
+}
+
+        
+long long ConsumerId::getValue()
+{
+    return value ;
+}
+
+void ConsumerId::setValue(long long value)
+{
+    this->value = value ;
+}
+
+int ConsumerId::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseDataStructure::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalString(connectionId, mode, ostream) ; 
+    size += marshaller->marshalLong(sessionId, mode, ostream) ; 
+    size += marshaller->marshalLong(value, mode, ostream) ; 
+    return size ;
+}
+
+void ConsumerId::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseDataStructure::unmarshal(marshaller, mode, istream) ; 
+    connectionId = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    sessionId = (marshaller->unmarshalLong(mode, istream)) ; 
+    value = (marshaller->unmarshalLong(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerId.hpp Mon May 15 06:38:57 2006
@@ -1,90 +1,91 @@
-/*
-* 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_ConsumerId_hpp_
-#define ActiveMQ_ConsumerId_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 ConsumerId
- *
- *
- *  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 ConsumerId : public AbstractCommand
-{
-protected:
-    p<string> connectionId ;
-    long long sessionId ;
-    long long value ;
-
-public:
-    const static unsigned char TYPE = 122;
-
-public:
-    ConsumerId() ;
-    virtual ~ConsumerId() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<string> getConnectionId() ;
-    virtual void setConnectionId(p<string> connectionId) ;
-
-    virtual long long getSessionId() ;
-    virtual void setSessionId(long long sessionId) ;
-
-    virtual long long getValue() ;
-    virtual void setValue(long long value) ;
-
-    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_ConsumerId_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_ConsumerId_hpp_
+#define ActiveMQ_ConsumerId_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 ConsumerId
+ *
+ *
+ *  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 ConsumerId : public BaseDataStructure
+{
+protected:
+    p<string> connectionId ;
+    long long sessionId ;
+    long long value ;
+
+public:
+    const static unsigned char TYPE = 122;
+
+public:
+    ConsumerId() ;
+    virtual ~ConsumerId() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<string> getConnectionId() ;
+    virtual void setConnectionId(p<string> connectionId) ;
+
+    virtual long long getSessionId() ;
+    virtual void setSessionId(long long sessionId) ;
+
+    virtual long long getValue() ;
+    virtual void setValue(long long value) ;
+
+    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_ConsumerId_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.cpp Mon May 15 06:38:57 2006
@@ -1,243 +1,293 @@
-/*
-* 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/ConsumerInfo.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ConsumerInfo
- *
- *
- *  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
- *
- */
-ConsumerInfo::ConsumerInfo()
-{
-    this->consumerId = NULL ;
-    this->browser = false ;
-    this->destination = NULL ;
-    this->prefetchSize = 0 ;
-    this->dispatchAsync = false ;
-    this->selector = NULL ;
-    this->subcriptionName = NULL ;
-    this->noLocal = false ;
-    this->exclusive = false ;
-    this->retroactive = false ;
-    this->priority = 0 ;
-    this->brokerPath = NULL ;
-    this->networkSubscription = false ;
-}
-
-ConsumerInfo::~ConsumerInfo()
-{
-}
-
-unsigned char ConsumerInfo::getDataStructureType()
-{
-    return ConsumerInfo::TYPE ; 
-}
-
-        
-p<ConsumerId> ConsumerInfo::getConsumerId()
-{
-    return consumerId ;
-}
-
-void ConsumerInfo::setConsumerId(p<ConsumerId> consumerId)
-{
-    this->consumerId = consumerId ;
-}
-
-        
-bool ConsumerInfo::getBrowser()
-{
-    return browser ;
-}
-
-void ConsumerInfo::setBrowser(bool browser)
-{
-    this->browser = browser ;
-}
-
-        
-p<ActiveMQDestination> ConsumerInfo::getDestination()
-{
-    return destination ;
-}
-
-void ConsumerInfo::setDestination(p<ActiveMQDestination> destination)
-{
-    this->destination = destination ;
-}
-
-        
-int ConsumerInfo::getPrefetchSize()
-{
-    return prefetchSize ;
-}
-
-void ConsumerInfo::setPrefetchSize(int prefetchSize)
-{
-    this->prefetchSize = prefetchSize ;
-}
-
-        
-bool ConsumerInfo::getDispatchAsync()
-{
-    return dispatchAsync ;
-}
-
-void ConsumerInfo::setDispatchAsync(bool dispatchAsync)
-{
-    this->dispatchAsync = dispatchAsync ;
-}
-
-        
-p<string> ConsumerInfo::getSelector()
-{
-    return selector ;
-}
-
-void ConsumerInfo::setSelector(p<string> selector)
-{
-    this->selector = selector ;
-}
-
-        
-p<string> ConsumerInfo::getSubcriptionName()
-{
-    return subcriptionName ;
-}
-
-void ConsumerInfo::setSubcriptionName(p<string> subcriptionName)
-{
-    this->subcriptionName = subcriptionName ;
-}
-
-        
-bool ConsumerInfo::getNoLocal()
-{
-    return noLocal ;
-}
-
-void ConsumerInfo::setNoLocal(bool noLocal)
-{
-    this->noLocal = noLocal ;
-}
-
-        
-bool ConsumerInfo::getExclusive()
-{
-    return exclusive ;
-}
-
-void ConsumerInfo::setExclusive(bool exclusive)
-{
-    this->exclusive = exclusive ;
-}
-
-        
-bool ConsumerInfo::getRetroactive()
-{
-    return retroactive ;
-}
-
-void ConsumerInfo::setRetroactive(bool retroactive)
-{
-    this->retroactive = retroactive ;
-}
-
-        
-char ConsumerInfo::getPriority()
-{
-    return priority ;
-}
-
-void ConsumerInfo::setPriority(char priority)
-{
-    this->priority = priority ;
-}
-
-        
-array<BrokerId> ConsumerInfo::getBrokerPath()
-{
-    return brokerPath ;
-}
-
-void ConsumerInfo::setBrokerPath(array<BrokerId> brokerPath)
-{
-    this->brokerPath = brokerPath ;
-}
-
-        
-bool ConsumerInfo::getNetworkSubscription()
-{
-    return networkSubscription ;
-}
-
-void ConsumerInfo::setNetworkSubscription(bool networkSubscription)
-{
-    this->networkSubscription = networkSubscription ;
-}
-
-int ConsumerInfo::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(consumerId, mode, writer) ; 
-    size += marshaller->marshalBoolean(browser, mode, writer) ; 
-    size += marshaller->marshalObject(destination, mode, writer) ; 
-    size += marshaller->marshalInt(prefetchSize, mode, writer) ; 
-    size += marshaller->marshalInt(maximumPendingMessageLimit, mode, writer) ; 
-    size += marshaller->marshalBoolean(dispatchAsync, mode, writer) ; 
-    size += marshaller->marshalString(selector, mode, writer) ; 
-    size += marshaller->marshalString(subcriptionName, mode, writer) ; 
-    size += marshaller->marshalBoolean(noLocal, mode, writer) ; 
-    size += marshaller->marshalBoolean(exclusive, mode, writer) ; 
-    size += marshaller->marshalBoolean(retroactive, mode, writer) ; 
-    size += marshaller->marshalByte(priority, mode, writer) ; 
-    size += marshaller->marshalObjectArray(brokerPath, mode, writer) ; 
-    size += marshaller->marshalObject(additionalPredicate, mode, writer) ; 
-    size += marshaller->marshalBoolean(networkSubscription, mode, writer) ; 
-    return size ;
-}
-
-void ConsumerInfo::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    consumerId = p_cast<ConsumerId>(marshaller->unmarshalObject(mode, reader)) ; 
-    browser = (marshaller->unmarshalBoolean(mode, reader)) ; 
-    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, reader)) ; 
-    prefetchSize = (marshaller->unmarshalInt(mode, reader)) ; 
-    maximumPendingMessageLimit = (marshaller->unmarshalInt(mode, reader)) ; 
-    dispatchAsync = (marshaller->unmarshalBoolean(mode, reader)) ; 
-    selector = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    subcriptionName = p_cast<string>(marshaller->unmarshalString(mode, reader)) ; 
-    noLocal = (marshaller->unmarshalBoolean(mode, reader)) ; 
-    exclusive = (marshaller->unmarshalBoolean(mode, reader)) ; 
-    retroactive = (marshaller->unmarshalBoolean(mode, reader)) ; 
-    priority = (marshaller->unmarshalByte(mode, reader)) ; 
-    brokerPath = array_cast<BrokerId>(marshaller->unmarshalObjectArray(mode, reader)) ; 
-    additionalPredicate = p_cast<BooleanExpression>(marshaller->unmarshalObject(mode, reader)) ; 
-    networkSubscription = (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/ConsumerInfo.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ConsumerInfo
+ *
+ *
+ *  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
+ *
+ */
+ConsumerInfo::ConsumerInfo()
+{
+    this->consumerId = NULL ;
+    this->browser = false ;
+    this->destination = NULL ;
+    this->prefetchSize = 0 ;
+    this->maximumPendingMessageLimit = 0 ;
+    this->dispatchAsync = false ;
+    this->selector = NULL ;
+    this->subcriptionName = NULL ;
+    this->noLocal = false ;
+    this->exclusive = false ;
+    this->retroactive = false ;
+    this->priority = 0 ;
+    this->brokerPath = NULL ;
+    this->additionalPredicate = NULL ;
+    this->networkSubscription = false ;
+    this->optimizedAcknowledge = false ;
+    this->noRangeAcks = false ;
+}
+
+ConsumerInfo::~ConsumerInfo()
+{
+}
+
+unsigned char ConsumerInfo::getDataStructureType()
+{
+    return ConsumerInfo::TYPE ; 
+}
+
+        
+p<ConsumerId> ConsumerInfo::getConsumerId()
+{
+    return consumerId ;
+}
+
+void ConsumerInfo::setConsumerId(p<ConsumerId> consumerId)
+{
+    this->consumerId = consumerId ;
+}
+
+        
+bool ConsumerInfo::getBrowser()
+{
+    return browser ;
+}
+
+void ConsumerInfo::setBrowser(bool browser)
+{
+    this->browser = browser ;
+}
+
+        
+p<ActiveMQDestination> ConsumerInfo::getDestination()
+{
+    return destination ;
+}
+
+void ConsumerInfo::setDestination(p<ActiveMQDestination> destination)
+{
+    this->destination = destination ;
+}
+
+        
+int ConsumerInfo::getPrefetchSize()
+{
+    return prefetchSize ;
+}
+
+void ConsumerInfo::setPrefetchSize(int prefetchSize)
+{
+    this->prefetchSize = prefetchSize ;
+}
+
+        
+int ConsumerInfo::getMaximumPendingMessageLimit()
+{
+    return maximumPendingMessageLimit ;
+}
+
+void ConsumerInfo::setMaximumPendingMessageLimit(int maximumPendingMessageLimit)
+{
+    this->maximumPendingMessageLimit = maximumPendingMessageLimit ;
+}
+
+        
+bool ConsumerInfo::getDispatchAsync()
+{
+    return dispatchAsync ;
+}
+
+void ConsumerInfo::setDispatchAsync(bool dispatchAsync)
+{
+    this->dispatchAsync = dispatchAsync ;
+}
+
+        
+p<string> ConsumerInfo::getSelector()
+{
+    return selector ;
+}
+
+void ConsumerInfo::setSelector(p<string> selector)
+{
+    this->selector = selector ;
+}
+
+        
+p<string> ConsumerInfo::getSubcriptionName()
+{
+    return subcriptionName ;
+}
+
+void ConsumerInfo::setSubcriptionName(p<string> subcriptionName)
+{
+    this->subcriptionName = subcriptionName ;
+}
+
+        
+bool ConsumerInfo::getNoLocal()
+{
+    return noLocal ;
+}
+
+void ConsumerInfo::setNoLocal(bool noLocal)
+{
+    this->noLocal = noLocal ;
+}
+
+        
+bool ConsumerInfo::getExclusive()
+{
+    return exclusive ;
+}
+
+void ConsumerInfo::setExclusive(bool exclusive)
+{
+    this->exclusive = exclusive ;
+}
+
+        
+bool ConsumerInfo::getRetroactive()
+{
+    return retroactive ;
+}
+
+void ConsumerInfo::setRetroactive(bool retroactive)
+{
+    this->retroactive = retroactive ;
+}
+
+        
+char ConsumerInfo::getPriority()
+{
+    return priority ;
+}
+
+void ConsumerInfo::setPriority(char priority)
+{
+    this->priority = priority ;
+}
+
+        
+array<BrokerId> ConsumerInfo::getBrokerPath()
+{
+    return brokerPath ;
+}
+
+void ConsumerInfo::setBrokerPath(array<BrokerId> brokerPath)
+{
+    this->brokerPath = brokerPath ;
+}
+
+        
+p<BooleanExpression> ConsumerInfo::getAdditionalPredicate()
+{
+    return additionalPredicate ;
+}
+
+void ConsumerInfo::setAdditionalPredicate(p<BooleanExpression> additionalPredicate)
+{
+    this->additionalPredicate = additionalPredicate ;
+}
+
+        
+bool ConsumerInfo::getNetworkSubscription()
+{
+    return networkSubscription ;
+}
+
+void ConsumerInfo::setNetworkSubscription(bool networkSubscription)
+{
+    this->networkSubscription = networkSubscription ;
+}
+
+        
+bool ConsumerInfo::getOptimizedAcknowledge()
+{
+    return optimizedAcknowledge ;
+}
+
+void ConsumerInfo::setOptimizedAcknowledge(bool optimizedAcknowledge)
+{
+    this->optimizedAcknowledge = optimizedAcknowledge ;
+}
+
+        
+bool ConsumerInfo::getNoRangeAcks()
+{
+    return noRangeAcks ;
+}
+
+void ConsumerInfo::setNoRangeAcks(bool noRangeAcks)
+{
+    this->noRangeAcks = noRangeAcks ;
+}
+
+int ConsumerInfo::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseCommand::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(consumerId, mode, ostream) ; 
+    size += marshaller->marshalBoolean(browser, mode, ostream) ; 
+    size += marshaller->marshalObject(destination, mode, ostream) ; 
+    size += marshaller->marshalInt(prefetchSize, mode, ostream) ; 
+    size += marshaller->marshalInt(maximumPendingMessageLimit, mode, ostream) ; 
+    size += marshaller->marshalBoolean(dispatchAsync, mode, ostream) ; 
+    size += marshaller->marshalString(selector, mode, ostream) ; 
+    size += marshaller->marshalString(subcriptionName, mode, ostream) ; 
+    size += marshaller->marshalBoolean(noLocal, mode, ostream) ; 
+    size += marshaller->marshalBoolean(exclusive, mode, ostream) ; 
+    size += marshaller->marshalBoolean(retroactive, mode, ostream) ; 
+    size += marshaller->marshalByte(priority, mode, ostream) ; 
+    size += marshaller->marshalObjectArray(brokerPath, mode, ostream) ; 
+    size += marshaller->marshalObject(additionalPredicate, mode, ostream) ; 
+    size += marshaller->marshalBoolean(networkSubscription, mode, ostream) ; 
+    size += marshaller->marshalBoolean(optimizedAcknowledge, mode, ostream) ; 
+    size += marshaller->marshalBoolean(noRangeAcks, mode, ostream) ; 
+    return size ;
+}
+
+void ConsumerInfo::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseCommand::unmarshal(marshaller, mode, istream) ; 
+    consumerId = p_cast<ConsumerId>(marshaller->unmarshalObject(mode, istream)) ; 
+    browser = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, istream)) ; 
+    prefetchSize = (marshaller->unmarshalInt(mode, istream)) ; 
+    maximumPendingMessageLimit = (marshaller->unmarshalInt(mode, istream)) ; 
+    dispatchAsync = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    selector = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    subcriptionName = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+    noLocal = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    exclusive = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    retroactive = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    priority = (marshaller->unmarshalByte(mode, istream)) ; 
+    brokerPath = array_cast<BrokerId>(marshaller->unmarshalObjectArray(mode, istream)) ; 
+    additionalPredicate = p_cast<BooleanExpression>(marshaller->unmarshalObject(mode, istream)) ; 
+    networkSubscription = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    optimizedAcknowledge = (marshaller->unmarshalBoolean(mode, istream)) ; 
+    noRangeAcks = (marshaller->unmarshalBoolean(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ConsumerInfo.hpp Mon May 15 06:38:57 2006
@@ -1,136 +1,151 @@
-/*
-* 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_ConsumerInfo_hpp_
-#define ActiveMQ_ConsumerInfo_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/ConsumerId.hpp"
-#include "activemq/command/ActiveMQDestination.hpp"
-#include "activemq/command/BrokerId.hpp"
-#include "activemq/command/BooleanExpression.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 ConsumerInfo
- *
- *
- *  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 ConsumerInfo : public BaseCommand
-{
-protected:
-    p<ConsumerId> consumerId ;
-    p<ActiveMQDestination> destination ;
-    int prefetchSize ;
-    int maximumPendingMessageLimit ;
-    bool browser ;
-    bool dispatchAsync ;
-    p<string> selector ;
-    p<string> subcriptionName ;
-    bool noLocal ;
-    bool exclusive ;
-    bool retroactive ;
-    char priority ;
-    array<BrokerId> brokerPath ;
+/*
+* 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_ConsumerInfo_hpp_
+#define ActiveMQ_ConsumerInfo_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/ConsumerId.hpp"
+#include "activemq/command/ActiveMQDestination.hpp"
+#include "activemq/command/BrokerId.hpp"
+#include "activemq/command/BooleanExpression.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 ConsumerInfo
+ *
+ *
+ *  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 ConsumerInfo : public BaseCommand
+{
+protected:
+    p<ConsumerId> consumerId ;
+    bool browser ;
+    p<ActiveMQDestination> destination ;
+    int prefetchSize ;
+    int maximumPendingMessageLimit ;
+    bool dispatchAsync ;
+    p<string> selector ;
+    p<string> subcriptionName ;
+    bool noLocal ;
+    bool exclusive ;
+    bool retroactive ;
+    char priority ;
+    array<BrokerId> brokerPath ;
     p<BooleanExpression> additionalPredicate ;
-    bool networkSubscription ;
-
-public:
-    const static unsigned char TYPE = 5;
-
-public:
-    ConsumerInfo() ;
-    virtual ~ConsumerInfo() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<ConsumerId> getConsumerId() ;
-    virtual void setConsumerId(p<ConsumerId> consumerId) ;
-
-    virtual bool getBrowser() ;
-    virtual void setBrowser(bool browser) ;
-
-    virtual p<ActiveMQDestination> getDestination() ;
-    virtual void setDestination(p<ActiveMQDestination> destination) ;
-
-    virtual int getPrefetchSize() ;
-    virtual void setPrefetchSize(int prefetchSize) ;
-
-    virtual bool getDispatchAsync() ;
-    virtual void setDispatchAsync(bool dispatchAsync) ;
-
-    virtual p<string> getSelector() ;
-    virtual void setSelector(p<string> selector) ;
-
-    virtual p<string> getSubcriptionName() ;
-    virtual void setSubcriptionName(p<string> subcriptionName) ;
-
-    virtual bool getNoLocal() ;
-    virtual void setNoLocal(bool noLocal) ;
-
-    virtual bool getExclusive() ;
-    virtual void setExclusive(bool exclusive) ;
-
-    virtual bool getRetroactive() ;
-    virtual void setRetroactive(bool retroactive) ;
-
-    virtual char getPriority() ;
-    virtual void setPriority(char priority) ;
-
-    virtual array<BrokerId> getBrokerPath() ;
-    virtual void setBrokerPath(array<BrokerId> brokerPath) ;
-
-    virtual bool getNetworkSubscription() ;
-    virtual void setNetworkSubscription(bool networkSubscription) ;
-
-    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_ConsumerInfo_hpp_*/
+    bool networkSubscription ;
+    bool optimizedAcknowledge ;
+    bool noRangeAcks ;
+
+public:
+    const static unsigned char TYPE = 5;
+
+public:
+    ConsumerInfo() ;
+    virtual ~ConsumerInfo() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<ConsumerId> getConsumerId() ;
+    virtual void setConsumerId(p<ConsumerId> consumerId) ;
+
+    virtual bool getBrowser() ;
+    virtual void setBrowser(bool browser) ;
+
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
+
+    virtual int getPrefetchSize() ;
+    virtual void setPrefetchSize(int prefetchSize) ;
+
+    virtual int getMaximumPendingMessageLimit() ;
+    virtual void setMaximumPendingMessageLimit(int maximumPendingMessageLimit) ;
+
+    virtual bool getDispatchAsync() ;
+    virtual void setDispatchAsync(bool dispatchAsync) ;
+
+    virtual p<string> getSelector() ;
+    virtual void setSelector(p<string> selector) ;
+
+    virtual p<string> getSubcriptionName() ;
+    virtual void setSubcriptionName(p<string> subcriptionName) ;
+
+    virtual bool getNoLocal() ;
+    virtual void setNoLocal(bool noLocal) ;
+
+    virtual bool getExclusive() ;
+    virtual void setExclusive(bool exclusive) ;
+
+    virtual bool getRetroactive() ;
+    virtual void setRetroactive(bool retroactive) ;
+
+    virtual char getPriority() ;
+    virtual void setPriority(char priority) ;
+
+    virtual array<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(array<BrokerId> brokerPath) ;
+
+    virtual p<BooleanExpression> getAdditionalPredicate() ;
+    virtual void setAdditionalPredicate(p<BooleanExpression> additionalPredicate) ;
+
+    virtual bool getNetworkSubscription() ;
+    virtual void setNetworkSubscription(bool networkSubscription) ;
+
+    virtual bool getOptimizedAcknowledge() ;
+    virtual void setOptimizedAcknowledge(bool optimizedAcknowledge) ;
+
+    virtual bool getNoRangeAcks() ;
+    virtual void setNoRangeAcks(bool noRangeAcks) ;
+
+    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_ConsumerInfo_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.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/ControlCommand.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for ControlCommand
- *
- *
- *  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
- *
- */
-ControlCommand::ControlCommand()
-{
-    this->command = NULL ;
-}
-
-ControlCommand::~ControlCommand()
-{
-}
-
-unsigned char ControlCommand::getDataStructureType()
-{
-    return ControlCommand::TYPE ; 
-}
-
-        
-p<string> ControlCommand::getCommand()
-{
-    return command ;
-}
-
-void ControlCommand::setCommand(p<string> command)
-{
-    this->command = command ;
-}
-
-int ControlCommand::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(command, mode, writer) ; 
-    return size ;
-}
-
-void ControlCommand::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    command = 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/ControlCommand.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ControlCommand
+ *
+ *
+ *  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
+ *
+ */
+ControlCommand::ControlCommand()
+{
+    this->command = NULL ;
+}
+
+ControlCommand::~ControlCommand()
+{
+}
+
+unsigned char ControlCommand::getDataStructureType()
+{
+    return ControlCommand::TYPE ; 
+}
+
+        
+p<string> ControlCommand::getCommand()
+{
+    return command ;
+}
+
+void ControlCommand::setCommand(p<string> command)
+{
+    this->command = command ;
+}
+
+int ControlCommand::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseCommand::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalString(command, mode, ostream) ; 
+    return size ;
+}
+
+void ControlCommand::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseCommand::unmarshal(marshaller, mode, istream) ; 
+    command = p_cast<string>(marshaller->unmarshalString(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/ControlCommand.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_ControlCommand_hpp_
-#define ActiveMQ_ControlCommand_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 ControlCommand
- *
- *
- *  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 ControlCommand : public BaseCommand
-{
-protected:
-    p<string> command ;
-
-public:
-    const static unsigned char TYPE = 14;
-
-public:
-    ControlCommand() ;
-    virtual ~ControlCommand() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<string> getCommand() ;
-    virtual void setCommand(p<string> command) ;
-
-    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_ControlCommand_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_ControlCommand_hpp_
+#define ActiveMQ_ControlCommand_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 ControlCommand
+ *
+ *
+ *  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 ControlCommand : public BaseCommand
+{
+protected:
+    p<string> command ;
+
+public:
+    const static unsigned char TYPE = 14;
+
+public:
+    ControlCommand() ;
+    virtual ~ControlCommand() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<string> getCommand() ;
+    virtual void setCommand(p<string> command) ;
+
+    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_ControlCommand_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.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/DataArrayResponse.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DataArrayResponse
- *
- *
- *  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
- *
- */
-DataArrayResponse::DataArrayResponse()
-{
-    this->data = NULL ;
-}
-
-DataArrayResponse::~DataArrayResponse()
-{
-}
-
-unsigned char DataArrayResponse::getDataStructureType()
-{
-    return DataArrayResponse::TYPE ; 
-}
-
-        
-array<IDataStructure> DataArrayResponse::getData()
-{
-    return data ;
-}
-
-void DataArrayResponse::setData(array<IDataStructure> data)
-{
-    this->data = data ;
-}
-
-int DataArrayResponse::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->marshalObjectArray(data, mode, writer) ; 
-    return size ;
-}
-
-void DataArrayResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    data = array_cast<IDataStructure>(marshaller->unmarshalObjectArray(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/DataArrayResponse.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for DataArrayResponse
+ *
+ *
+ *  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
+ *
+ */
+DataArrayResponse::DataArrayResponse()
+{
+    this->data = NULL ;
+}
+
+DataArrayResponse::~DataArrayResponse()
+{
+}
+
+unsigned char DataArrayResponse::getDataStructureType()
+{
+    return DataArrayResponse::TYPE ; 
+}
+
+        
+array<IDataStructure> DataArrayResponse::getData()
+{
+    return data ;
+}
+
+void DataArrayResponse::setData(array<IDataStructure> data)
+{
+    this->data = data ;
+}
+
+int DataArrayResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += Response::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObjectArray(data, mode, ostream) ; 
+    return size ;
+}
+
+void DataArrayResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    Response::unmarshal(marshaller, mode, istream) ; 
+    data = array_cast<IDataStructure>(marshaller->unmarshalObjectArray(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataArrayResponse.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_DataArrayResponse_hpp_
-#define ActiveMQ_DataArrayResponse_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/IDataStructure.hpp"
-#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 DataArrayResponse
- *
- *
- *  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 DataArrayResponse : public Response
-{
-protected:
-    array<IDataStructure> data ;
-
-public:
-    const static unsigned char TYPE = 33;
-
-public:
-    DataArrayResponse() ;
-    virtual ~DataArrayResponse() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual array<IDataStructure> getData() ;
-    virtual void setData(array<IDataStructure> data) ;
-
-    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_DataArrayResponse_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_DataArrayResponse_hpp_
+#define ActiveMQ_DataArrayResponse_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/IDataStructure.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 DataArrayResponse
+ *
+ *
+ *  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 DataArrayResponse : public Response
+{
+protected:
+    array<IDataStructure> data ;
+
+public:
+    const static unsigned char TYPE = 33;
+
+public:
+    DataArrayResponse() ;
+    virtual ~DataArrayResponse() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual array<IDataStructure> getData() ;
+    virtual void setData(array<IDataStructure> data) ;
+
+    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_DataArrayResponse_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.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/DataResponse.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  Marshalling code for Open Wire Format for DataResponse
- *
- *
- *  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
- *
- */
-DataResponse::DataResponse()
-{
-    this->data = NULL ;
-}
-
-DataResponse::~DataResponse()
-{
-}
-
-unsigned char DataResponse::getDataStructureType()
-{
-    return DataResponse::TYPE ; 
-}
-
-        
-p<IDataStructure> DataResponse::getData()
-{
-    return data ;
-}
-
-void DataResponse::setData(p<IDataStructure> data)
-{
-    this->data = data ;
-}
-
-int DataResponse::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(data, mode, writer) ; 
-    return size ;
-}
-
-void DataResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    data = p_cast<IDataStructure>(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/DataResponse.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for DataResponse
+ *
+ *
+ *  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
+ *
+ */
+DataResponse::DataResponse()
+{
+    this->data = NULL ;
+}
+
+DataResponse::~DataResponse()
+{
+}
+
+unsigned char DataResponse::getDataStructureType()
+{
+    return DataResponse::TYPE ; 
+}
+
+        
+p<IDataStructure> DataResponse::getData()
+{
+    return data ;
+}
+
+void DataResponse::setData(p<IDataStructure> data)
+{
+    this->data = data ;
+}
+
+int DataResponse::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += Response::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(data, mode, ostream) ; 
+    return size ;
+}
+
+void DataResponse::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    Response::unmarshal(marshaller, mode, istream) ; 
+    data = p_cast<IDataStructure>(marshaller->unmarshalObject(mode, istream)) ; 
+}

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.hpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DataResponse.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_DataResponse_hpp_
-#define ActiveMQ_DataResponse_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-#include "activemq/IDataStructure.hpp"
-#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 DataResponse
- *
- *
- *  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 DataResponse : public Response
-{
-protected:
-    p<IDataStructure> data ;
-
-public:
-    const static unsigned char TYPE = 32;
-
-public:
-    DataResponse() ;
-    virtual ~DataResponse() ;
-
-    virtual unsigned char getDataStructureType() ;
-
-    virtual p<IDataStructure> getData() ;
-    virtual void setData(p<IDataStructure> data) ;
-
-    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_DataResponse_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_DataResponse_hpp_
+#define ActiveMQ_DataResponse_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/IDataStructure.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 DataResponse
+ *
+ *
+ *  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 DataResponse : public Response
+{
+protected:
+    p<IDataStructure> data ;
+
+public:
+    const static unsigned char TYPE = 32;
+
+public:
+    DataResponse() ;
+    virtual ~DataResponse() ;
+
+    virtual unsigned char getDataStructureType() ;
+
+    virtual p<IDataStructure> getData() ;
+    virtual void setData(p<IDataStructure> data) ;
+
+    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_DataResponse_hpp_*/

Modified: incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.cpp?rev=406628&r1=406627&r2=406628&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/command/DestinationInfo.cpp Mon May 15 06:38:57 2006
@@ -1,127 +1,125 @@
-/*
-* 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/DestinationInfo.hpp"
-
-using namespace apache::activemq::command;
-
-/*
- *
- *  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
- *
- */
-DestinationInfo::DestinationInfo()
-{
-    this->connectionId = NULL ;
-    this->destination = NULL ;
-    this->operationType = 0 ;
-    this->timeout = 0 ;
-    this->brokerPath = NULL ;
-}
-
-DestinationInfo::~DestinationInfo()
-{
-}
-
-unsigned char DestinationInfo::getDataStructureType()
-{
-    return DestinationInfo::TYPE ; 
-}
-
-        
-p<ConnectionId> DestinationInfo::getConnectionId()
-{
-    return connectionId ;
-}
-
-void DestinationInfo::setConnectionId(p<ConnectionId> connectionId)
-{
-    this->connectionId = connectionId ;
-}
-
-        
-p<ActiveMQDestination> DestinationInfo::getDestination()
-{
-    return destination ;
-}
-
-void DestinationInfo::setDestination(p<ActiveMQDestination> destination)
-{
-    this->destination = destination ;
-}
-
-        
-char DestinationInfo::getOperationType()
-{
-    return operationType ;
-}
-
-void DestinationInfo::setOperationType(char operationType)
-{
-    this->operationType = operationType ;
-}
-
-        
-long long DestinationInfo::getTimeout()
-{
-    return timeout ;
-}
-
-void DestinationInfo::setTimeout(long long timeout)
-{
-    this->timeout = timeout ;
-}
-
-        
-array<BrokerId> DestinationInfo::getBrokerPath()
-{
-    return brokerPath ;
-}
-
-void DestinationInfo::setBrokerPath(array<BrokerId> brokerPath)
-{
-    this->brokerPath = brokerPath ;
-}
-
-int DestinationInfo::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(connectionId, mode, writer) ; 
-    size += marshaller->marshalObject(destination, mode, writer) ; 
-    size += marshaller->marshalByte(operationType, mode, writer) ; 
-    size += marshaller->marshalLong(timeout, mode, writer) ; 
-    size += marshaller->marshalObjectArray(brokerPath, mode, writer) ; 
-    return size ;
-}
-
-void DestinationInfo::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> reader) throw (IOException)
-{
-    commandId = marshaller->unmarshalInt(mode, reader) ;
-    responseRequired = marshaller->unmarshalBoolean(mode, reader) ; 
-    connectionId = p_cast<ConnectionId>(marshaller->unmarshalObject(mode, reader)) ; 
-    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, reader)) ; 
-    operationType = (marshaller->unmarshalByte(mode, reader)) ; 
-    timeout = (marshaller->unmarshalLong(mode, reader)) ; 
-    brokerPath = array_cast<BrokerId>(marshaller->unmarshalObjectArray(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/DestinationInfo.hpp"
+
+using namespace apache::activemq::command;
+
+/*
+ *
+ *  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
+ *
+ */
+DestinationInfo::DestinationInfo()
+{
+    this->connectionId = NULL ;
+    this->destination = NULL ;
+    this->operationType = 0 ;
+    this->timeout = 0 ;
+    this->brokerPath = NULL ;
+}
+
+DestinationInfo::~DestinationInfo()
+{
+}
+
+unsigned char DestinationInfo::getDataStructureType()
+{
+    return DestinationInfo::TYPE ; 
+}
+
+        
+p<ConnectionId> DestinationInfo::getConnectionId()
+{
+    return connectionId ;
+}
+
+void DestinationInfo::setConnectionId(p<ConnectionId> connectionId)
+{
+    this->connectionId = connectionId ;
+}
+
+        
+p<ActiveMQDestination> DestinationInfo::getDestination()
+{
+    return destination ;
+}
+
+void DestinationInfo::setDestination(p<ActiveMQDestination> destination)
+{
+    this->destination = destination ;
+}
+
+        
+char DestinationInfo::getOperationType()
+{
+    return operationType ;
+}
+
+void DestinationInfo::setOperationType(char operationType)
+{
+    this->operationType = operationType ;
+}
+
+        
+long long DestinationInfo::getTimeout()
+{
+    return timeout ;
+}
+
+void DestinationInfo::setTimeout(long long timeout)
+{
+    this->timeout = timeout ;
+}
+
+        
+array<BrokerId> DestinationInfo::getBrokerPath()
+{
+    return brokerPath ;
+}
+
+void DestinationInfo::setBrokerPath(array<BrokerId> brokerPath)
+{
+    this->brokerPath = brokerPath ;
+}
+
+int DestinationInfo::marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException)
+{
+    int size = 0 ;
+
+    size += BaseCommand::marshal(marshaller, mode, ostream) ; 
+    size += marshaller->marshalObject(connectionId, mode, ostream) ; 
+    size += marshaller->marshalObject(destination, mode, ostream) ; 
+    size += marshaller->marshalByte(operationType, mode, ostream) ; 
+    size += marshaller->marshalLong(timeout, mode, ostream) ; 
+    size += marshaller->marshalObjectArray(brokerPath, mode, ostream) ; 
+    return size ;
+}
+
+void DestinationInfo::unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException)
+{
+    BaseCommand::unmarshal(marshaller, mode, istream) ; 
+    connectionId = p_cast<ConnectionId>(marshaller->unmarshalObject(mode, istream)) ; 
+    destination = p_cast<ActiveMQDestination>(marshaller->unmarshalObject(mode, istream)) ; 
+    operationType = (marshaller->unmarshalByte(mode, istream)) ; 
+    timeout = (marshaller->unmarshalLong(mode, istream)) ; 
+    brokerPath = array_cast<BrokerId>(marshaller->unmarshalObjectArray(mode, istream)) ; 
+}