activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [2/2] git commit: https://issues.apache.org/jira/browse/AMQCPP-512
Date Tue, 17 Sep 2013 20:26:43 GMT
https://issues.apache.org/jira/browse/AMQCPP-512

Openwire v10 support. 

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/cd031496
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/cd031496
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/cd031496

Branch: refs/heads/trunk
Commit: cd031496b10f0b4e0647863850a3d9d577b2e07d
Parents: 01dcbf9
Author: Timothy Bish <tabish121@gmai.com>
Authored: Tue Sep 17 16:26:36 2013 -0400
Committer: Timothy Bish <tabish121@gmai.com>
Committed: Tue Sep 17 16:26:36 2013 -0400

----------------------------------------------------------------------
 .../tool/commands/MessageIdHeaderGenerator.java |   2 -
 .../tool/commands/MessageIdSourceGenerator.java |  17 +-
 .../src/main/activemq/commands/ConsumerInfo.cpp |  26 +-
 .../src/main/activemq/commands/ConsumerInfo.h   |   5 +
 .../src/main/activemq/commands/Message.cpp      |  19 +-
 .../src/main/activemq/commands/Message.h        |   4 +
 .../src/main/activemq/commands/MessageId.cpp    |  53 +++-
 .../src/main/activemq/commands/MessageId.h      |   5 +-
 .../activemq/commands/NetworkBridgeFilter.cpp   |  50 ++--
 .../activemq/commands/NetworkBridgeFilter.h     |  12 +-
 .../core/kernels/ActiveMQConsumerKernel.cpp     |   1 +
 .../wireformat/openwire/OpenWireFormat.cpp      |   2 +-
 .../openwire/OpenWireFormatFactory.cpp          |   2 +-
 .../generated/ConsumerInfoMarshaller.cpp        |  15 ++
 .../marshal/generated/MessageIdMarshaller.cpp   |  30 +++
 .../marshal/generated/MessageMarshaller.cpp     |  15 ++
 .../generated/NetworkBridgeFilterMarshaller.cpp |  49 +++-
 .../utils/MessagePropertyInterceptor.cpp        | 247 +++++++++----------
 .../ActiveMQBlobMessageMarshallerTest.cpp       |   4 +-
 .../ActiveMQBytesMessageMarshallerTest.cpp      |   4 +-
 .../ActiveMQMapMessageMarshallerTest.cpp        |   4 +-
 .../generated/ActiveMQMessageMarshallerTest.cpp |   4 +-
 .../ActiveMQObjectMessageMarshallerTest.cpp     |   4 +-
 .../generated/ActiveMQQueueMarshallerTest.cpp   |   4 +-
 .../ActiveMQStreamMessageMarshallerTest.cpp     |   4 +-
 .../ActiveMQTempQueueMarshallerTest.cpp         |   4 +-
 .../ActiveMQTempTopicMarshallerTest.cpp         |   4 +-
 .../ActiveMQTextMessageMarshallerTest.cpp       |   4 +-
 .../generated/ActiveMQTopicMarshallerTest.cpp   |   4 +-
 .../generated/BrokerIdMarshallerTest.cpp        |   4 +-
 .../generated/BrokerInfoMarshallerTest.cpp      |   4 +-
 .../ConnectionControlMarshallerTest.cpp         |   4 +-
 .../generated/ConnectionErrorMarshallerTest.cpp |   4 +-
 .../generated/ConnectionIdMarshallerTest.cpp    |   4 +-
 .../generated/ConnectionInfoMarshallerTest.cpp  |   4 +-
 .../generated/ConsumerControlMarshallerTest.cpp |   4 +-
 .../generated/ConsumerIdMarshallerTest.cpp      |   4 +-
 .../generated/ConsumerInfoMarshallerTest.cpp    |   4 +-
 .../generated/ControlCommandMarshallerTest.cpp  |   4 +-
 .../DataArrayResponseMarshallerTest.cpp         |   4 +-
 .../generated/DataResponseMarshallerTest.cpp    |   4 +-
 .../generated/DestinationInfoMarshallerTest.cpp |   4 +-
 .../generated/DiscoveryEventMarshallerTest.cpp  |   4 +-
 .../ExceptionResponseMarshallerTest.cpp         |   4 +-
 .../generated/FlushCommandMarshallerTest.cpp    |   4 +-
 .../generated/IntegerResponseMarshallerTest.cpp |   4 +-
 .../generated/JournalQueueAckMarshallerTest.cpp |   4 +-
 .../generated/JournalTopicAckMarshallerTest.cpp |   4 +-
 .../generated/JournalTraceMarshallerTest.cpp    |   4 +-
 .../JournalTransactionMarshallerTest.cpp        |   4 +-
 .../generated/KeepAliveInfoMarshallerTest.cpp   |   4 +-
 .../LastPartialCommandMarshallerTest.cpp        |   4 +-
 .../LocalTransactionIdMarshallerTest.cpp        |   4 +-
 .../generated/MessageAckMarshallerTest.cpp      |   4 +-
 .../generated/MessageDispatchMarshallerTest.cpp |   4 +-
 ...essageDispatchNotificationMarshallerTest.cpp |   4 +-
 .../generated/MessageIdMarshallerTest.cpp       |   4 +-
 .../generated/MessagePullMarshallerTest.cpp     |   4 +-
 .../NetworkBridgeFilterMarshallerTest.cpp       |   4 +-
 .../generated/PartialCommandMarshallerTest.cpp  |   4 +-
 .../generated/ProducerAckMarshallerTest.cpp     |   4 +-
 .../generated/ProducerIdMarshallerTest.cpp      |   4 +-
 .../generated/ProducerInfoMarshallerTest.cpp    |   4 +-
 .../generated/RemoveInfoMarshallerTest.cpp      |   4 +-
 .../RemoveSubscriptionInfoMarshallerTest.cpp    |   4 +-
 .../generated/ReplayCommandMarshallerTest.cpp   |   4 +-
 .../generated/ResponseMarshallerTest.cpp        |   4 +-
 .../generated/SessionIdMarshallerTest.cpp       |   4 +-
 .../generated/SessionInfoMarshallerTest.cpp     |   4 +-
 .../generated/ShutdownInfoMarshallerTest.cpp    |   4 +-
 .../SubscriptionInfoMarshallerTest.cpp          |   4 +-
 .../generated/TransactionInfoMarshallerTest.cpp |   4 +-
 .../generated/WireFormatInfoMarshallerTest.cpp  |   4 +-
 .../generated/XATransactionIdMarshallerTest.cpp |   4 +-
 activemq-cpp/src/test/decaf/lang/ThreadTest.h   |   2 +-
 75 files changed, 485 insertions(+), 295 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdHeaderGenerator.java
----------------------------------------------------------------------
diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdHeaderGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdHeaderGenerator.java
index e44ef14..3013189 100644
--- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdHeaderGenerator.java
+++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdHeaderGenerator.java
@@ -56,8 +56,6 @@ public class MessageIdHeaderGenerator extends CommandHeaderGenerator {
     protected void generateAdditonalMembers( PrintWriter out ) {
         out.println("        void setValue(const std::string& key);");
         out.println("");
-        out.println("        void setTextView(const std::string& key);");
-        out.println("");
 
         super.generateAdditonalMembers( out );
     }

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdSourceGenerator.java
----------------------------------------------------------------------
diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdSourceGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdSourceGenerator.java
index da14e82..eeac8bf 100644
--- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdSourceGenerator.java
+++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/MessageIdSourceGenerator.java
@@ -80,11 +80,6 @@ public class MessageIdSourceGenerator extends CommandSourceGenerator {
         out.println("    this->key = messageKey;");
         out.println("}");
         out.println("");
-        out.println("////////////////////////////////////////////////////////////////////////////////");
-        out.println("void MessageId::setTextView(const std::string& key) {");
-        out.println("    this->key = key;");
-        out.println("}");
-        out.println("");
 
         super.generateAdditionalMethods(out);
     }
@@ -100,8 +95,16 @@ public class MessageIdSourceGenerator extends CommandSourceGenerator {
 
     protected void generateToStringBody( PrintWriter out ) {
         out.println("    if (key.empty()) {");
-        out.println("        this->key = this->producerId->toString() + \":\" + ");
-        out.println("                    Long::toString(this->producerSequenceId);");
+        out.println("        if (!textView.empty()) {");
+        out.println("            if (textView.find_first_of(\"ID:\") == 0) {");
+        out.println("                key = textView;");
+        out.println("            } else {");
+        out.println("                key = \"ID:\" + textView;");
+        out.println("            }");
+        out.println("        } else {");
+        out.println("            this->key = this->producerId->toString() + \":\" + ");
+        out.println("                        Long::toString(this->producerSequenceId);");
+        out.println("        }");
         out.println("    }");
         out.println("");
         out.println("    return this->key;");

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
index e0bb597..475df9d 100644
--- a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
+++ b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
@@ -40,8 +40,9 @@ using namespace decaf::lang::exceptions;
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerInfo::ConsumerInfo() :
     BaseCommand(), consumerId(NULL), browser(false), destination(NULL), prefetchSize(0), maximumPendingMessageLimit(0), dispatchAsync(false), 
-      selector(""), subscriptionName(""), noLocal(false), exclusive(false), retroactive(false), priority(0), brokerPath(), 
-      additionalPredicate(NULL), networkSubscription(false), optimizedAcknowledge(false), noRangeAcks(false), networkConsumerPath() {
+      selector(""), clientId(""), subscriptionName(""), noLocal(false), exclusive(false), retroactive(false), priority(0), 
+      brokerPath(), additionalPredicate(NULL), networkSubscription(false), optimizedAcknowledge(false), noRangeAcks(false), 
+      networkConsumerPath() {
 
 }
 
@@ -85,6 +86,7 @@ void ConsumerInfo::copyDataStructure(const DataStructure* src) {
     this->setMaximumPendingMessageLimit(srcPtr->getMaximumPendingMessageLimit());
     this->setDispatchAsync(srcPtr->isDispatchAsync());
     this->setSelector(srcPtr->getSelector());
+    this->setClientId(srcPtr->getClientId());
     this->setSubscriptionName(srcPtr->getSubscriptionName());
     this->setNoLocal(srcPtr->isNoLocal());
     this->setExclusive(srcPtr->isExclusive());
@@ -136,6 +138,8 @@ std::string ConsumerInfo::toString() const {
     stream << ", ";
     stream << "Selector = " << this->getSelector();
     stream << ", ";
+    stream << "ClientId = " << this->getClientId();
+    stream << ", ";
     stream << "SubscriptionName = " << this->getSubscriptionName();
     stream << ", ";
     stream << "NoLocal = " << this->isNoLocal();
@@ -235,6 +239,9 @@ bool ConsumerInfo::equals(const DataStructure* value) const {
     if (this->getSelector() != valuePtr->getSelector()) {
         return false;
     }
+    if (this->getClientId() != valuePtr->getClientId()) {
+        return false;
+    }
     if (this->getSubscriptionName() != valuePtr->getSubscriptionName()) {
         return false;
     }
@@ -376,6 +383,21 @@ void ConsumerInfo::setSelector(const std::string& selector) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const std::string& ConsumerInfo::getClientId() const {
+    return clientId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string& ConsumerInfo::getClientId() {
+    return clientId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ConsumerInfo::setClientId(const std::string& clientId) {
+    this->clientId = clientId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 const std::string& ConsumerInfo::getSubscriptionName() const {
     return subscriptionName;
 }

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
index f8160a5..fef27cb 100644
--- a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
+++ b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
@@ -58,6 +58,7 @@ namespace commands {
         int maximumPendingMessageLimit;
         bool dispatchAsync;
         std::string selector;
+        std::string clientId;
         std::string subscriptionName;
         bool noLocal;
         bool exclusive;
@@ -134,6 +135,10 @@ namespace commands {
         virtual std::string& getSelector();
         virtual void setSelector( const std::string& selector );
 
+        virtual const std::string& getClientId() const;
+        virtual std::string& getClientId();
+        virtual void setClientId( const std::string& clientId );
+
         virtual const std::string& getSubscriptionName() const;
         virtual std::string& getSubscriptionName();
         virtual void setSubscriptionName( const std::string& subscriptionName );

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/Message.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/Message.cpp b/activemq-cpp/src/main/activemq/commands/Message.cpp
index 212ef16..dcd40c1 100644
--- a/activemq-cpp/src/main/activemq/commands/Message.cpp
+++ b/activemq-cpp/src/main/activemq/commands/Message.cpp
@@ -47,7 +47,8 @@ Message::Message() :
     BaseCommand(), producerId(NULL), destination(NULL), transactionId(NULL), originalDestination(NULL), messageId(NULL), originalTransactionId(NULL), 
       groupID(""), groupSequence(0), correlationId(""), persistent(false), expiration(0), priority(0), replyTo(NULL), timestamp(0), 
       type(""), content(), marshalledProperties(), dataStructure(NULL), targetConsumerId(NULL), compressed(false), redeliveryCounter(0), 
-      brokerPath(), arrival(0), userID(""), recievedByDFBridge(false), droppable(false), cluster(), brokerInTime(0), brokerOutTime(0), ackHandler(NULL), properties(), readOnlyProperties(false), readOnlyBody(false), connection(NULL) {
+      brokerPath(), arrival(0), userID(""), recievedByDFBridge(false), droppable(false), cluster(), brokerInTime(0), brokerOutTime(0), 
+      jMSXGroupFirstForConsumer(false), ackHandler(NULL), properties(), readOnlyProperties(false), readOnlyBody(false), connection(NULL) {
 
 }
 
@@ -113,6 +114,7 @@ void Message::copyDataStructure(const DataStructure* src) {
     this->setCluster(srcPtr->getCluster());
     this->setBrokerInTime(srcPtr->getBrokerInTime());
     this->setBrokerOutTime(srcPtr->getBrokerOutTime());
+    this->setJMSXGroupFirstForConsumer(srcPtr->isJMSXGroupFirstForConsumer());
     this->properties.copy(srcPtr->properties);
     this->setAckHandler(srcPtr->getAckHandler());
     this->setReadOnlyBody(srcPtr->isReadOnlyBody());
@@ -272,6 +274,8 @@ std::string Message::toString() const {
     stream << "BrokerInTime = " << this->getBrokerInTime();
     stream << ", ";
     stream << "BrokerOutTime = " << this->getBrokerOutTime();
+    stream << ", ";
+    stream << "JMSXGroupFirstForConsumer = " << this->isJMSXGroupFirstForConsumer();
     stream << " }";
 
     return stream.str();
@@ -429,6 +433,9 @@ bool Message::equals(const DataStructure* value) const {
     if (this->getBrokerOutTime() != valuePtr->getBrokerOutTime()) {
         return false;
     }
+    if (this->isJMSXGroupFirstForConsumer() != valuePtr->isJMSXGroupFirstForConsumer()) {
+        return false;
+    }
     if (ackHandler != valuePtr->getAckHandler()){
         return false;
     }
@@ -827,6 +834,16 @@ void Message::setBrokerOutTime(long long brokerOutTime) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+bool Message::isJMSXGroupFirstForConsumer() const {
+    return jMSXGroupFirstForConsumer;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Message::setJMSXGroupFirstForConsumer(bool jMSXGroupFirstForConsumer) {
+    this->jMSXGroupFirstForConsumer = jMSXGroupFirstForConsumer;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 decaf::lang::Pointer<commands::Command> Message::visit(activemq::state::CommandVisitor* visitor) {
     return visitor->processMessage(this);
 }

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/Message.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/Message.h b/activemq-cpp/src/main/activemq/commands/Message.h
index a9b2996..bcf4c66 100644
--- a/activemq-cpp/src/main/activemq/commands/Message.h
+++ b/activemq-cpp/src/main/activemq/commands/Message.h
@@ -88,6 +88,7 @@ namespace commands{
         std::vector< decaf::lang::Pointer<BrokerId> > cluster;
         long long brokerInTime;
         long long brokerOutTime;
+        bool jMSXGroupFirstForConsumer;
 
     public:
 
@@ -375,6 +376,9 @@ namespace commands{
         virtual long long getBrokerOutTime() const;
         virtual void setBrokerOutTime( long long brokerOutTime );
 
+        virtual bool isJMSXGroupFirstForConsumer() const;
+        virtual void setJMSXGroupFirstForConsumer( bool jMSXGroupFirstForConsumer );
+
         /**
          * @return an answer of true to the isMessage() query.
          */

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/MessageId.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/MessageId.cpp b/activemq-cpp/src/main/activemq/commands/MessageId.cpp
index 758e407..a021901 100644
--- a/activemq-cpp/src/main/activemq/commands/MessageId.cpp
+++ b/activemq-cpp/src/main/activemq/commands/MessageId.cpp
@@ -44,27 +44,27 @@ using namespace decaf::internal::util;
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId() :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId(const MessageId& other) :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
     this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId(const std::string& messageKey) :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
     this->setValue(messageKey);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId(const Pointer<ProducerInfo>& producerInfo, long long producerSequenceId) :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
     this->producerId = producerInfo->getProducerId();
     this->producerSequenceId = producerSequenceId;
@@ -72,7 +72,7 @@ MessageId::MessageId(const Pointer<ProducerInfo>& producerInfo, long long produc
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId(const Pointer<ProducerId>& producerId, long long producerSequenceId) :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
     this->producerId = producerId;
     this->producerSequenceId = producerSequenceId;
@@ -80,7 +80,7 @@ MessageId::MessageId(const Pointer<ProducerId>& producerId, long long producerSe
 
 ////////////////////////////////////////////////////////////////////////////////
 MessageId::MessageId(const std::string& producerId, long long producerSequenceId) :
-    BaseDataStructure(), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
+    BaseDataStructure(), textView(""), producerId(NULL), producerSequenceId(0), brokerSequenceId(0), key("") {
 
     this->producerId.reset(new ProducerId(producerId));
     this->producerSequenceId = producerSequenceId;
@@ -119,6 +119,7 @@ void MessageId::copyDataStructure(const DataStructure* src) {
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure(src);
 
+    this->setTextView(srcPtr->getTextView());
     this->setProducerId(srcPtr->getProducerId());
     this->setProducerSequenceId(srcPtr->getProducerSequenceId());
     this->setBrokerSequenceId(srcPtr->getBrokerSequenceId());
@@ -133,8 +134,16 @@ unsigned char MessageId::getDataStructureType() const {
 std::string MessageId::toString() const {
 
     if (key.empty()) {
-        this->key = this->producerId->toString() + ":" + 
-                    Long::toString(this->producerSequenceId);
+        if (!textView.empty()) {
+            if (textView.find_first_of("ID:") == 0) {
+                key = textView;
+            } else {
+                key = "ID:" + textView;
+            }
+        } else {
+            this->key = this->producerId->toString() + ":" +
+                        Long::toString(this->producerSequenceId);
+        }
     }
 
     return this->key;
@@ -153,6 +162,9 @@ bool MessageId::equals(const DataStructure* value) const {
         return false;
     }
 
+    if (this->getTextView() != valuePtr->getTextView()) {
+        return false;
+    }
     if (this->getProducerId() != NULL) {
         if (!this->getProducerId()->equals( valuePtr->getProducerId().get())) {
             return false;
@@ -173,6 +185,21 @@ bool MessageId::equals(const DataStructure* value) const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const std::string& MessageId::getTextView() const {
+    return textView;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+std::string& MessageId::getTextView() {
+    return textView;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void MessageId::setTextView(const std::string& textView) {
+    this->textView = textView;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 const decaf::lang::Pointer<ProducerId>& MessageId::getProducerId() const {
     return producerId;
 }
@@ -214,6 +241,11 @@ int MessageId::compareTo(const MessageId& value) const {
         return 0;
     }
 
+    int textViewComp = StringUtils::compareIgnoreCase(this->textView.c_str(), value.textView.c_str());
+    if (textViewComp != 0) {
+        return textViewComp;
+    }
+
     int producerIdComp = this->producerId->compareTo(*(value.producerId));
     if (producerIdComp != 0) {
         return producerIdComp;
@@ -277,8 +309,3 @@ void MessageId::setValue(const std::string& key) {
     this->key = messageKey;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-void MessageId::setTextView(const std::string& key) {
-    this->key = key;
-}
-

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/MessageId.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/MessageId.h b/activemq-cpp/src/main/activemq/commands/MessageId.h
index b87f891..51e41fb 100644
--- a/activemq-cpp/src/main/activemq/commands/MessageId.h
+++ b/activemq-cpp/src/main/activemq/commands/MessageId.h
@@ -49,6 +49,7 @@ namespace commands {
     class AMQCPP_API MessageId : public BaseDataStructure, public decaf::lang::Comparable<MessageId> {
     protected:
 
+        std::string textView;
         Pointer<ProducerId> producerId;
         long long producerSequenceId;
         long long brokerSequenceId;
@@ -91,7 +92,9 @@ namespace commands {
 
         void setValue(const std::string& key);
 
-        void setTextView(const std::string& key);
+        virtual const std::string& getTextView() const;
+        virtual std::string& getTextView();
+        virtual void setTextView( const std::string& textView );
 
         virtual const Pointer<ProducerId>& getProducerId() const;
         virtual Pointer<ProducerId>& getProducerId();

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp b/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
index 3344c8b..4fe823f 100644
--- a/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
+++ b/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
@@ -39,7 +39,7 @@ using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 NetworkBridgeFilter::NetworkBridgeFilter() :
-    BaseDataStructure(), networkTTL(0), networkBrokerId(NULL) {
+    BaseDataStructure(), networkBrokerId(NULL), messageTTL(0), consumerTTL(0) {
 
 }
 
@@ -76,8 +76,9 @@ void NetworkBridgeFilter::copyDataStructure(const DataStructure* src) {
     // Copy the data of the base class or classes
     BaseDataStructure::copyDataStructure(src);
 
-    this->setNetworkTTL(srcPtr->getNetworkTTL());
     this->setNetworkBrokerId(srcPtr->getNetworkBrokerId());
+    this->setMessageTTL(srcPtr->getMessageTTL());
+    this->setConsumerTTL(srcPtr->getConsumerTTL());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -91,14 +92,16 @@ std::string NetworkBridgeFilter::toString() const {
     ostringstream stream;
 
     stream << "NetworkBridgeFilter { ";
-    stream << "NetworkTTL = " << this->getNetworkTTL();
-    stream << ", ";
     stream << "NetworkBrokerId = ";
     if (this->getNetworkBrokerId() != NULL) {
         stream << this->getNetworkBrokerId()->toString();
     } else {
         stream << "NULL";
     }
+    stream << ", ";
+    stream << "MessageTTL = " << this->getMessageTTL();
+    stream << ", ";
+    stream << "ConsumerTTL = " << this->getConsumerTTL();
     stream << " }";
 
     return stream.str();
@@ -117,9 +120,6 @@ bool NetworkBridgeFilter::equals(const DataStructure* value) const {
         return false;
     }
 
-    if (this->getNetworkTTL() != valuePtr->getNetworkTTL()) {
-        return false;
-    }
     if (this->getNetworkBrokerId() != NULL) {
         if (!this->getNetworkBrokerId()->equals( valuePtr->getNetworkBrokerId().get())) {
             return false;
@@ -127,6 +127,12 @@ bool NetworkBridgeFilter::equals(const DataStructure* value) const {
     } else if (valuePtr->getNetworkBrokerId() != NULL) {
         return false;
     }
+    if (this->getMessageTTL() != valuePtr->getMessageTTL()) {
+        return false;
+    }
+    if (this->getConsumerTTL() != valuePtr->getConsumerTTL()) {
+        return false;
+    }
     if (!BaseDataStructure::equals(value)) {
         return false;
     }
@@ -134,16 +140,6 @@ bool NetworkBridgeFilter::equals(const DataStructure* value) const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int NetworkBridgeFilter::getNetworkTTL() const {
-    return networkTTL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::setNetworkTTL(int networkTTL) {
-    this->networkTTL = networkTTL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 const decaf::lang::Pointer<BrokerId>& NetworkBridgeFilter::getNetworkBrokerId() const {
     return networkBrokerId;
 }
@@ -158,3 +154,23 @@ void NetworkBridgeFilter::setNetworkBrokerId(const decaf::lang::Pointer<BrokerId
     this->networkBrokerId = networkBrokerId;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int NetworkBridgeFilter::getMessageTTL() const {
+    return messageTTL;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void NetworkBridgeFilter::setMessageTTL(int messageTTL) {
+    this->messageTTL = messageTTL;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int NetworkBridgeFilter::getConsumerTTL() const {
+    return consumerTTL;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void NetworkBridgeFilter::setConsumerTTL(int consumerTTL) {
+    this->consumerTTL = consumerTTL;
+}
+

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h b/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
index ae7a6bd..911a5f6 100644
--- a/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
+++ b/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
@@ -47,8 +47,9 @@ namespace commands {
     class AMQCPP_API NetworkBridgeFilter : public BaseDataStructure {
     protected:
 
-        int networkTTL;
         Pointer<BrokerId> networkBrokerId;
+        int messageTTL;
+        int consumerTTL;
 
     public:
 
@@ -75,13 +76,16 @@ namespace commands {
 
         virtual bool equals(const DataStructure* value) const;
 
-        virtual int getNetworkTTL() const;
-        virtual void setNetworkTTL( int networkTTL );
-
         virtual const Pointer<BrokerId>& getNetworkBrokerId() const;
         virtual Pointer<BrokerId>& getNetworkBrokerId();
         virtual void setNetworkBrokerId( const Pointer<BrokerId>& networkBrokerId );
 
+        virtual int getMessageTTL() const;
+        virtual void setMessageTTL( int messageTTL );
+
+        virtual int getConsumerTTL() const;
+        virtual void setConsumerTTL( int consumerTTL );
+
     };
 
 }}

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp
index 2fad1fa..6dd61b1 100644
--- a/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp
+++ b/activemq-cpp/src/main/activemq/core/kernels/ActiveMQConsumerKernel.cpp
@@ -683,6 +683,7 @@ ActiveMQConsumerKernel::ActiveMQConsumerKernel(ActiveMQSessionKernel* session,
     Pointer<ConsumerInfo> consumerInfo(new ConsumerInfo());
 
     consumerInfo->setConsumerId(id);
+    consumerInfo->setClientId(session->getConnection()->getClientID());
     consumerInfo->setDestination(destination);
     consumerInfo->setSubscriptionName(name);
     consumerInfo->setSelector(selector);

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
index 6d47c19..2cb4287 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
@@ -50,7 +50,7 @@ using namespace decaf::lang::exceptions;
 ////////////////////////////////////////////////////////////////////////////////
 const unsigned char OpenWireFormat::NULL_TYPE = 0;
 const int OpenWireFormat::DEFAULT_VERSION = 1;
-const int OpenWireFormat::MAX_SUPPORTED_VERSION = 9;
+const int OpenWireFormat::MAX_SUPPORTED_VERSION = 10;
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireFormat::OpenWireFormat(const decaf::util::Properties& properties) :

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
index fc9accf..ca71dda 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
@@ -42,7 +42,7 @@ Pointer<WireFormat> OpenWireFormatFactory::createWireFormat(const decaf::util::P
         Pointer<WireFormatInfo> info(new WireFormatInfo());
 
         // Configure the version to use
-        info->setVersion(Integer::parseInt(properties.getProperty("wireFormat.version", "6")));
+        info->setVersion(Integer::parseInt(properties.getProperty("wireFormat.version", "10")));
 
         // parse params out of the properties
         info->setStackTraceEnabled(

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
index 3aee127..1739858 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
@@ -71,6 +71,9 @@ void ConsumerInfoMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStru
         info->setMaximumPendingMessageLimit(dataIn->readInt());
         info->setDispatchAsync(bs->readBoolean());
         info->setSelector(tightUnmarshalString(dataIn, bs));
+        if (wireVersion >= 10) {
+            info->setClientId(tightUnmarshalString(dataIn, bs));
+        }
         info->setSubscriptionName(tightUnmarshalString(dataIn, bs));
         info->setNoLocal(bs->readBoolean());
         info->setExclusive(bs->readBoolean());
@@ -128,6 +131,9 @@ int ConsumerInfoMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStruct
         rc += tightMarshalCachedObject1(wireFormat, info->getDestination().get(), bs);
         bs->writeBoolean(info->isDispatchAsync());
         rc += tightMarshalString1(info->getSelector(), bs);
+        if (wireVersion >= 10) {
+            rc += tightMarshalString1(info->getClientId(), bs);
+        }
         rc += tightMarshalString1(info->getSubscriptionName(), bs);
         bs->writeBoolean(info->isNoLocal());
         bs->writeBoolean(info->isExclusive());
@@ -167,6 +173,9 @@ void ConsumerInfoMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStruc
         dataOut->writeInt(info->getMaximumPendingMessageLimit());
         bs->readBoolean();
         tightMarshalString2(info->getSelector(), dataOut, bs);
+        if (wireVersion >= 10) {
+            tightMarshalString2(info->getClientId(), dataOut, bs);
+        }
         tightMarshalString2(info->getSubscriptionName(), dataOut, bs);
         bs->readBoolean();
         bs->readBoolean();
@@ -206,6 +215,9 @@ void ConsumerInfoMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStru
         info->setMaximumPendingMessageLimit(dataIn->readInt());
         info->setDispatchAsync(dataIn->readBoolean());
         info->setSelector(looseUnmarshalString(dataIn));
+        if (wireVersion >= 10) {
+            info->setClientId(looseUnmarshalString(dataIn));
+        }
         info->setSubscriptionName(looseUnmarshalString(dataIn));
         info->setNoLocal(dataIn->readBoolean());
         info->setExclusive(dataIn->readBoolean());
@@ -264,6 +276,9 @@ void ConsumerInfoMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStruct
         dataOut->writeInt(info->getMaximumPendingMessageLimit());
         dataOut->writeBoolean(info->isDispatchAsync());
         looseMarshalString(info->getSelector(), dataOut);
+        if (wireVersion >= 10) {
+            looseMarshalString(info->getClientId(), dataOut);
+        }
         looseMarshalString(info->getSubscriptionName(), dataOut);
         dataOut->writeBoolean(info->isNoLocal());
         dataOut->writeBoolean(info->isExclusive());

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp
index ac86f87..f9d7f45 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp
@@ -59,6 +59,12 @@ void MessageIdMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructu
 
         MessageId* info =
             dynamic_cast<MessageId*>(dataStructure);
+
+        int wireVersion = wireFormat->getVersion();
+
+        if (wireVersion >= 10) {
+            info->setTextView(tightUnmarshalString(dataIn, bs));
+        }
         info->setProducerId(Pointer<ProducerId>(dynamic_cast<ProducerId* >(
             tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
         info->setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
@@ -78,6 +84,12 @@ int MessageIdMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure
             dynamic_cast<MessageId*>(dataStructure);
 
         int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+
+        int wireVersion = wireFormat->getVersion();
+
+        if (wireVersion >= 10) {
+            rc += tightMarshalString1(info->getTextView(), bs);
+        }
         rc += tightMarshalCachedObject1(wireFormat, info->getProducerId().get(), bs);
         rc += tightMarshalLong1(wireFormat, info->getProducerSequenceId(), bs);
         rc += tightMarshalLong1(wireFormat, info->getBrokerSequenceId(), bs);
@@ -98,6 +110,12 @@ void MessageIdMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructur
 
         MessageId* info =
             dynamic_cast<MessageId*>(dataStructure);
+
+        int wireVersion = wireFormat->getVersion();
+
+        if (wireVersion >= 10) {
+            tightMarshalString2(info->getTextView(), dataOut, bs);
+        }
         tightMarshalCachedObject2(wireFormat, info->getProducerId().get(), dataOut, bs);
         tightMarshalLong2(wireFormat, info->getProducerSequenceId(), dataOut, bs);
         tightMarshalLong2(wireFormat, info->getBrokerSequenceId(), dataOut, bs);
@@ -115,6 +133,12 @@ void MessageIdMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructu
         BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         MessageId* info =
             dynamic_cast<MessageId*>(dataStructure);
+
+        int wireVersion = wireFormat->getVersion();
+
+        if (wireVersion >= 10) {
+            info->setTextView(looseUnmarshalString(dataIn));
+        }
         info->setProducerId(Pointer<ProducerId>(dynamic_cast<ProducerId*>(
             looseUnmarshalCachedObject(wireFormat, dataIn))));
         info->setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
@@ -133,6 +157,12 @@ void MessageIdMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure
         MessageId* info =
             dynamic_cast<MessageId*>(dataStructure);
         BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
+
+        int wireVersion = wireFormat->getVersion();
+
+        if (wireVersion >= 10) {
+            looseMarshalString(info->getTextView(), dataOut);
+        }
         looseMarshalCachedObject(wireFormat, info->getProducerId().get(), dataOut);
         looseMarshalLong(wireFormat, info->getProducerSequenceId(), dataOut);
         looseMarshalLong(wireFormat, info->getBrokerSequenceId(), dataOut);

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp
index b077e5d..b404d93 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp
@@ -118,6 +118,9 @@ void MessageMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, DataStructure
         if (wireVersion >= 3) {
             info->setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));
         }
+        if (wireVersion >= 10) {
+            info->setJMSXGroupFirstForConsumer(bs->readBoolean());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -172,6 +175,9 @@ int MessageMarshaller::tightMarshal1(OpenWireFormat* wireFormat, DataStructure*
         if (wireVersion >= 3) {
             rc += tightMarshalLong1(wireFormat, info->getBrokerOutTime(), bs);
         }
+        if (wireVersion >= 10) {
+            bs->writeBoolean(info->isJMSXGroupFirstForConsumer());
+        }
 
         return rc + 9;
     }
@@ -235,6 +241,9 @@ void MessageMarshaller::tightMarshal2(OpenWireFormat* wireFormat, DataStructure*
         if (wireVersion >= 3) {
             tightMarshalLong2(wireFormat, info->getBrokerOutTime(), dataOut, bs);
         }
+        if (wireVersion >= 10) {
+            bs->readBoolean();
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
@@ -318,6 +327,9 @@ void MessageMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, DataStructure
         if (wireVersion >= 3) {
             info->setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));
         }
+        if (wireVersion >= 10) {
+            info->setJMSXGroupFirstForConsumer(dataIn->readBoolean());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -380,6 +392,9 @@ void MessageMarshaller::looseMarshal(OpenWireFormat* wireFormat, DataStructure*
         if (wireVersion >= 3) {
             looseMarshalLong(wireFormat, info->getBrokerOutTime(), dataOut);
         }
+        if (wireVersion >= 10) {
+            dataOut->writeBoolean(info->isJMSXGroupFirstForConsumer());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp
index 8d7845f..d9ec23b 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp
@@ -59,9 +59,17 @@ void NetworkBridgeFilterMarshaller::tightUnmarshal(OpenWireFormat* wireFormat, D
 
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>(dataStructure);
-        info->setNetworkTTL(dataIn->readInt());
+
+        int wireVersion = wireFormat->getVersion();
+
         info->setNetworkBrokerId(Pointer<BrokerId>(dynamic_cast<BrokerId* >(
             tightUnmarshalCachedObject(wireFormat, dataIn, bs))));
+        if (wireVersion >= 10) {
+            info->setMessageTTL(dataIn->readInt());
+        }
+        if (wireVersion >= 10) {
+            info->setConsumerTTL(dataIn->readInt());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -77,9 +85,16 @@ int NetworkBridgeFilterMarshaller::tightMarshal1(OpenWireFormat* wireFormat, Dat
             dynamic_cast<NetworkBridgeFilter*>(dataStructure);
 
         int rc = BaseDataStreamMarshaller::tightMarshal1(wireFormat, dataStructure, bs);
+
+        int wireVersion = wireFormat->getVersion();
+
         rc += tightMarshalCachedObject1(wireFormat, info->getNetworkBrokerId().get(), bs);
+        if (wireVersion >= 10) {
+        }
+        if (wireVersion >= 10) {
+        }
 
-        return rc + 4;
+        return rc + 8;
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -95,8 +110,16 @@ void NetworkBridgeFilterMarshaller::tightMarshal2(OpenWireFormat* wireFormat, Da
 
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>(dataStructure);
-        dataOut->writeInt(info->getNetworkTTL());
+
+        int wireVersion = wireFormat->getVersion();
+
         tightMarshalCachedObject2(wireFormat, info->getNetworkBrokerId().get(), dataOut, bs);
+        if (wireVersion >= 10) {
+            dataOut->writeInt(info->getMessageTTL());
+        }
+        if (wireVersion >= 10) {
+            dataOut->writeInt(info->getConsumerTTL());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
@@ -111,9 +134,17 @@ void NetworkBridgeFilterMarshaller::looseUnmarshal(OpenWireFormat* wireFormat, D
         BaseDataStreamMarshaller::looseUnmarshal(wireFormat, dataStructure, dataIn);
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>(dataStructure);
-        info->setNetworkTTL(dataIn->readInt());
+
+        int wireVersion = wireFormat->getVersion();
+
         info->setNetworkBrokerId(Pointer<BrokerId>(dynamic_cast<BrokerId*>(
             looseUnmarshalCachedObject(wireFormat, dataIn))));
+        if (wireVersion >= 10) {
+            info->setMessageTTL(dataIn->readInt());
+        }
+        if (wireVersion >= 10) {
+            info->setConsumerTTL(dataIn->readInt());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -128,8 +159,16 @@ void NetworkBridgeFilterMarshaller::looseMarshal(OpenWireFormat* wireFormat, Dat
         NetworkBridgeFilter* info =
             dynamic_cast<NetworkBridgeFilter*>(dataStructure);
         BaseDataStreamMarshaller::looseMarshal(wireFormat, dataStructure, dataOut);
-        dataOut->writeInt(info->getNetworkTTL());
+
+        int wireVersion = wireFormat->getVersion();
+
         looseMarshalCachedObject(wireFormat, info->getNetworkBrokerId().get(), dataOut);
+        if (wireVersion >= 10) {
+            dataOut->writeInt(info->getMessageTTL());
+        }
+        if (wireVersion >= 10) {
+            dataOut->writeInt(info->getConsumerTTL());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
index 2fdc83c..5cd560b 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
@@ -18,6 +18,7 @@
 #include "MessagePropertyInterceptor.h"
 
 #include <decaf/lang/Integer.h>
+#include <decaf/lang/Boolean.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <cms/DeliveryMode.h>
 
@@ -33,237 +34,227 @@ using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePropertyInterceptor::MessagePropertyInterceptor(
-    commands::Message* message, PrimitiveMap* properties ) : message( message ), properties( properties ) {
+MessagePropertyInterceptor::MessagePropertyInterceptor(commands::Message* message, PrimitiveMap* properties) :
+    message(message), properties(properties) {
 
-    if( message == NULL ) {
-        throw NullPointerException(
-            __FILE__, __LINE__, "Message passed was NULL" );
+    if (message == NULL) {
+        throw NullPointerException(__FILE__, __LINE__, "Message passed was NULL");
     }
 
-    if( properties == NULL ) {
-        throw NullPointerException(
-            __FILE__, __LINE__, "PrimitiveMap passed was NULL" );
+    if (properties == NULL) {
+        throw NullPointerException(__FILE__, __LINE__, "PrimitiveMap passed was NULL");
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePropertyInterceptor::MessagePropertyInterceptor( const MessagePropertyInterceptor& )
-    : message( NULL ), properties( NULL ) {
-
+MessagePropertyInterceptor::MessagePropertyInterceptor(const MessagePropertyInterceptor&) :
+    message(NULL), properties(NULL) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePropertyInterceptor& MessagePropertyInterceptor::operator= ( const MessagePropertyInterceptor& ) {
+MessagePropertyInterceptor& MessagePropertyInterceptor::operator=(const MessagePropertyInterceptor&) {
     return *this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePropertyInterceptor::~MessagePropertyInterceptor() {
-}
+MessagePropertyInterceptor::~MessagePropertyInterceptor() {}
 
 ////////////////////////////////////////////////////////////////////////////////
-bool MessagePropertyInterceptor::getBooleanProperty( const std::string& name ) const {
+bool MessagePropertyInterceptor::getBooleanProperty(const std::string& name) const {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if (name == "JMSXGroupFirstForConsumer") {
+        return message->isJMSXGroupFirstForConsumer();
     }
 
-    return this->properties->getBool( name );
+    return this->properties->getBool(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char MessagePropertyInterceptor::getByteProperty( const std::string& name ) const {
+unsigned char MessagePropertyInterceptor::getByteProperty(const std::string& name) const {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    return this->properties->getByte( name );
+    return this->properties->getByte(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-double MessagePropertyInterceptor::getDoubleProperty( const std::string& name ) const {
+double MessagePropertyInterceptor::getDoubleProperty(const std::string& name) const {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    return this->properties->getDouble( name );
+    return this->properties->getDouble(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-float MessagePropertyInterceptor::getFloatProperty( const std::string& name ) const {
+float MessagePropertyInterceptor::getFloatProperty(const std::string& name) const {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq" || name == "JMSXGroupFirstForConsumer") {
+
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    return this->properties->getFloat( name );
+    return this->properties->getFloat(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int MessagePropertyInterceptor::getIntProperty( const std::string& name ) const {
+int MessagePropertyInterceptor::getIntProperty(const std::string& name) const {
 
-    if( name == "JMSXGroupID" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
-    } else if( name == "JMSXDeliveryCount" ) {
+    if (name == "JMSXGroupID" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if (name == "JMSXDeliveryCount") {
         return this->message->getRedeliveryCounter();
-    } else if( name == "JMSXGroupSeq" ) {
+    } else if (name == "JMSXGroupSeq") {
         return this->message->getGroupSequence();
     }
 
-    return this->properties->getInt( name );
+    return this->properties->getInt(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long MessagePropertyInterceptor::getLongProperty( const std::string& name ) const {
-
-    if( name == "JMSXGroupID" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
-    } else if( name == "JMSXDeliveryCount" ) {
-        return (long long)this->message->getRedeliveryCounter();
-    } else if( name == "JMSXGroupSeq" ) {
-        return (long long)this->message->getGroupSequence();
+long long MessagePropertyInterceptor::getLongProperty(const std::string& name) const {
+
+    if (name == "JMSXGroupID" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if (name == "JMSXDeliveryCount") {
+        return (long long) this->message->getRedeliveryCounter();
+    } else if (name == "JMSXGroupSeq") {
+        return (long long) this->message->getGroupSequence();
     }
 
-    return this->properties->getLong( name );
+    return this->properties->getLong(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-short MessagePropertyInterceptor::getShortProperty( const std::string& name ) const {
+short MessagePropertyInterceptor::getShortProperty(const std::string& name) const {
+
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq" || name == "JMSXGroupFirstForConsumer") {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    return this->properties->getShort( name );
+    return this->properties->getShort(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string MessagePropertyInterceptor::getStringProperty( const std::string& name ) const {
+std::string MessagePropertyInterceptor::getStringProperty(const std::string& name) const {
 
-    if( name == "JMSXGroupID" ) {
+    if (name == "JMSXGroupID") {
         return this->message->getGroupID();
-    } else if( name == "JMSXDeliveryCount" ) {
-        return Integer::toString( this->message->getRedeliveryCounter() );
-    } else if( name == "JMSXGroupSeq" ) {
-        return Integer::toString( this->message->getGroupSequence() );
+    } else if (name == "JMSXDeliveryCount") {
+        return Integer::toString(this->message->getRedeliveryCounter());
+    } else if (name == "JMSXGroupSeq") {
+        return Integer::toString(this->message->getGroupSequence());
+    } else if (name == "JMSXGroupFirstForConsumer") {
+        return Boolean::toString(message->isJMSXGroupFirstForConsumer());
     }
 
-    return this->properties->getString( name );
+    return this->properties->getString(name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setBooleanProperty( const std::string& name, bool value ) {
+void MessagePropertyInterceptor::setBooleanProperty(const std::string& name, bool value) {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if(name == "JMSXGroupFirstForConsumer") {
+        return message->setJMSXGroupFirstForConsumer(value);
     }
 
-    this->properties->setBool( name, value );
+    this->properties->setBool(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setByteProperty( const std::string& name, unsigned char value ) {
+void MessagePropertyInterceptor::setByteProperty(const std::string& name, unsigned char value) {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    this->properties->setByte( name, value );
+    this->properties->setByte(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setDoubleProperty( const std::string& name, double value ) {
+void MessagePropertyInterceptor::setDoubleProperty(const std::string& name, double value) {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    this->properties->setDouble( name, value );
+    this->properties->setDouble(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setFloatProperty( const std::string& name, float value ) {
+void MessagePropertyInterceptor::setFloatProperty(const std::string& name, float value) {
 
-    if( name == "JMSXDeliveryCount" || name == "JMSXGroupID" || name == "JMSXGroupSeq" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
+    if (name == "JMSXDeliveryCount" || name == "JMSXGroupID" ||
+        name == "JMSXGroupSeq" || name == "JMSXGroupFirstForConsumer") {
+
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
     }
 
-    this->properties->setFloat( name, value );
+    this->properties->setFloat(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setIntProperty( const std::string& name, int value ) {
-
-    if( name == "JMSXGroupID" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
-    } else if( name == "JMSXDeliveryCount" ) {
-        this->message->setRedeliveryCounter( value );
-    } else if( name == "JMSXGroupSeq" ) {
-        this->message->setGroupSequence( value );
+void MessagePropertyInterceptor::setIntProperty(const std::string& name, int value) {
+
+    if (name == "JMSXGroupID" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if (name == "JMSXDeliveryCount") {
+        this->message->setRedeliveryCounter(value);
+    } else if (name == "JMSXGroupSeq") {
+        this->message->setGroupSequence(value);
     }
 
-    this->properties->setInt( name, value );
+    this->properties->setInt(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setLongProperty( const std::string& name, long long value ) {
-    this->properties->setLong( name, value );
+void MessagePropertyInterceptor::setLongProperty(const std::string& name, long long value) {
+    if (name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    }
+
+    this->properties->setLong(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setShortProperty( const std::string& name, short value ) {
-
-    if( name == "JMSXGroupID" ) {
-        throw ActiveMQException(
-            __FILE__, __LINE__,
-            "Cannot Convert Reserved Property to this Type." );
-    } else if( name == "JMSXDeliveryCount" ) {
-        this->message->setRedeliveryCounter( (int)value );
-    } else if( name == "JMSXGroupSeq" ) {
-        this->message->setGroupSequence( (int)value );
+void MessagePropertyInterceptor::setShortProperty(const std::string& name, short value) {
+
+    if (name == "JMSXGroupID" || name == "JMSXGroupFirstForConsumer") {
+        throw ActiveMQException(__FILE__, __LINE__, "Cannot Convert Reserved Property to this Type.");
+    } else if (name == "JMSXDeliveryCount") {
+        this->message->setRedeliveryCounter((int) value);
+    } else if (name == "JMSXGroupSeq") {
+        this->message->setGroupSequence((int) value);
     }
 
-    this->properties->setShort( name, value );
+    this->properties->setShort(name, value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePropertyInterceptor::setStringProperty( const std::string& name,
-                                                    const std::string& value ) {
-
-    if( name == "JMSXGroupID" ) {
-        this->message->setGroupID( value );
-    } else if( name == "JMSXDeliveryCount" ) {
-        this->message->setRedeliveryCounter( Integer::parseInt( value ) );
-    } else if( name == "JMSXGroupSeq" ) {
-        this->message->setGroupSequence( Integer::parseInt( value ) );
+void MessagePropertyInterceptor::setStringProperty(const std::string& name, const std::string& value) {
+
+    if (name == "JMSXGroupID") {
+        this->message->setGroupID(value);
+    } else if (name == "JMSXDeliveryCount") {
+        this->message->setRedeliveryCounter(Integer::parseInt(value));
+    } else if (name == "JMSXGroupSeq") {
+        this->message->setGroupSequence(Integer::parseInt(value));
+    } else if (name == "JMSXGroupFirstForConsumer") {
+        this->message->setJMSXGroupFirstForConsumer(Boolean::parseBoolean(value));
     }
 
-    this->properties->setString( name, value );
+    this->properties->setString(name, value);
 }

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
index d65dc07..4619fee 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQBlobMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQBlobMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQBlobMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQBlobMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
index 7b44615..ebe7872 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQBytesMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQBytesMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQBytesMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQBytesMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
index 5e2f385..e88dbe7 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQMapMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQMapMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQMapMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQMapMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
index 1457592..257990c 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
index 899b0b2..3809754 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQObjectMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQObjectMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQObjectMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQObjectMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
index 5c2a574..5d2511c 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQQueueMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQQueue outCommand;
@@ -113,7 +113,7 @@ void ActiveMQQueueMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQQueue outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
index bbfc495..37eb26e 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQStreamMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQStreamMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQStreamMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQStreamMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
index 0d73648..a66900f 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQTempQueueMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTempQueue outCommand;
@@ -113,7 +113,7 @@ void ActiveMQTempQueueMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTempQueue outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
index ca0b5eb..7abae8f 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQTempTopicMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTempTopic outCommand;
@@ -113,7 +113,7 @@ void ActiveMQTempTopicMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTempTopic outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
index e6f7b61..4974589 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQTextMessageMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTextMessage outCommand;
@@ -125,7 +125,7 @@ void ActiveMQTextMessageMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTextMessage outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
index 9b6bb6a..6b41342 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ActiveMQTopicMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTopic outCommand;
@@ -113,7 +113,7 @@ void ActiveMQTopicMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTopic outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
index d937dfb..7bf69d2 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
@@ -73,7 +73,7 @@ void BrokerIdMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     BrokerId outCommand;
@@ -113,7 +113,7 @@ void BrokerIdMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     BrokerId outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
index 45f9031..91a1ce3 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@ void BrokerInfoMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     BrokerInfo outCommand;
@@ -113,7 +113,7 @@ void BrokerInfoMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     BrokerInfo outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
index 833520e..81600e5 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ConnectionControlMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionControl outCommand;
@@ -113,7 +113,7 @@ void ConnectionControlMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionControl outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
index 4521534..ed6a26e 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ConnectionErrorMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionError outCommand;
@@ -113,7 +113,7 @@ void ConnectionErrorMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionError outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
index 23552eb..9ae3e78 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ConnectionIdMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionId outCommand;
@@ -113,7 +113,7 @@ void ConnectionIdMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionId outCommand;

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cd031496/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
index 826de3b..36d2cbc 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@ void ConnectionInfoMarshallerTest::testLooseMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionInfo outCommand;
@@ -113,7 +113,7 @@ void ConnectionInfoMarshallerTest::testTightMarshal() {
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 9 );
+    openWireFormat.setVersion( 10 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionInfo outCommand;


Mime
View raw message