activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r894734 [1/2] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ transport/logging/
Date Wed, 30 Dec 2009 23:14:23 GMT
Author: tabish
Date: Wed Dec 30 23:14:20 2009
New Revision: 894734

URL: http://svn.apache.org/viewvc?rev=894734&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-274

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/WireFormatInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/logging/LoggingTransport.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/logging/LoggingTransport.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.cpp Wed Dec 30 23:14:20 2009
@@ -50,13 +50,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQBlobMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQBlobMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::Message>::toString();
-    stream << "End Class = ActiveMQBlobMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::Message>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp Wed Dec 30 23:14:20 2009
@@ -78,13 +78,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQBytesMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQBytesMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::BytesMessage>::toString();
-    stream << "End Class = ActiveMQBytesMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::BytesMessage>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp Wed Dec 30 23:14:20 2009
@@ -112,23 +112,18 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQDestination::toString() const {
-    std::ostringstream stream;
 
-    stream << "Begin Class = ActiveMQDestination" << std::endl;
+    switch( this->getDestinationType() ) {
 
-    stream << " Value of exclusive = "
-           << std::boolalpha << exclusive << std::endl;
-    stream << " Value of ordered = "
-           << std::boolalpha << ordered << std::endl;
-    stream << " Value of advisory = "
-           << std::boolalpha << advisory << std::endl;
-    stream << " Value of orderedTarget = " << orderedTarget << std::endl;
-    stream << " Value of physicalName = " << physicalName << std::endl;
-    stream << " Value of options = " << this->options.toString() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = ActiveMQDestination" << std::endl;
-
-    return stream.str();
+        case cms::Destination::TOPIC:
+            return std::string( "topic://" ) + this->getPhysicalName();
+        case cms::Destination::TEMPORARY_TOPIC:
+            return std::string( "temp-topic://" ) + this->getPhysicalName();
+        case cms::Destination::TEMPORARY_QUEUE:
+            return std::string( "temp-queue://" ) + this->getPhysicalName();
+        default:
+            return std::string( "queue://" ) + this->getPhysicalName();
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp Wed Dec 30 23:14:20 2009
@@ -67,13 +67,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQMapMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQMapMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::MapMessage>::toString();
-    stream << "End Class = ActiveMQMapMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::MapMessage>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.cpp Wed Dec 30 23:14:20 2009
@@ -45,13 +45,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::Message>::toString();
-    stream << "Begin Class = ActiveMQMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::Message>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp Wed Dec 30 23:14:20 2009
@@ -44,13 +44,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQObjectMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQObjectMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::ObjectMessage>::toString();
-    stream << "Begin Class = ActiveMQObjectMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::ObjectMessage>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.cpp Wed Dec 30 23:14:20 2009
@@ -48,13 +48,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQQueue::toString() const {
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQQueue" << std::endl;
-    stream << ActiveMQDestination::toString();
-    stream << "End Class = ActiveMQQueue" << std::endl;
-
-    return stream.str();
+    return ActiveMQDestination::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp Wed Dec 30 23:14:20 2009
@@ -100,13 +100,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQStreamMessage::toString() const{
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQStreamMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::StreamMessage>::toString();
-    stream << "End Class = ActiveMQStreamMessage" << std::endl;
-
-    return stream.str();
+    return ActiveMQMessageTemplate<cms::StreamMessage>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp Wed Dec 30 23:14:20 2009
@@ -46,13 +46,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQTempDestination::toString() const {
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQTempDestination" << std::endl;
-    stream << ActiveMQDestination::toString();
-    stream << "End Class = ActiveMQTempDestination" << std::endl;
-
-    return stream.str();
+    return ActiveMQDestination::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp Wed Dec 30 23:14:20 2009
@@ -59,13 +59,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQTempQueue::toString() const {
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQTempQueue" << std::endl;
-    stream << ActiveMQTempDestination::toString();
-    stream << "End Class = ActiveMQTempQueue" << std::endl;
-
-    return stream.str();
+    return ActiveMQDestination::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp Wed Dec 30 23:14:20 2009
@@ -58,13 +58,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQTempTopic::toString() const {
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQTempTopic" << std::endl;
-    stream << ActiveMQTempDestination::toString();
-    stream << "End Class = ActiveMQTempTopic" << std::endl;
-
-    return stream.str();
+    return ActiveMQDestination::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp Wed Dec 30 23:14:20 2009
@@ -23,6 +23,7 @@
 
 #include <activemq/wireformat/openwire/utils/OpenwireStringSupport.h>
 #include <activemq/util/CMSExceptionSupport.h>
+#include <cms/CMSException.h>
 
 using namespace std;
 using namespace activemq;
@@ -80,13 +81,21 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQTextMessage::toString() const {
-    std::ostringstream stream;
 
-    stream << "Begin Class = ActiveMQTextMessage" << std::endl;
-    stream << ActiveMQMessageTemplate<cms::TextMessage>::toString();
-    stream << "End Class = ActiveMQTextMessage" << std::endl;
+    try {
 
-    return stream.str();
+        std::string text = getText();
+
+        if( text != "" && text.length() > 63 ) {
+
+            text = text.substr( 0, 45 ) + "..." + text.substr( text.length() - 12 );
+            return ActiveMQMessageTemplate<cms::TextMessage>::toString() + "Text = " + text;
+        }
+
+    } catch( cms::CMSException& e ) {
+    }
+
+    return ActiveMQMessageTemplate<cms::TextMessage>::toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp Wed Dec 30 23:14:20 2009
@@ -54,11 +54,5 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQTopic::toString() const {
-    std::ostringstream stream;
-
-    stream << "Begin Class = ActiveMQTopic" << std::endl;
-    stream << ActiveMQDestination::toString();
-    stream << "End Class = ActiveMQTopic" << std::endl;
-
-    return stream.str();
+    return ActiveMQDestination::toString();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp Wed Dec 30 23:14:20 2009
@@ -93,15 +93,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 std::string BrokerId::toString() const {
 
-    ostringstream stream;
-
-    stream << "Begin Class = BrokerId" << std::endl;
-    stream << " Value of BrokerId::ID_BROKERID = 124" << std::endl;
-    stream << " Value of Value = " << this->getValue() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = BrokerId" << std::endl;
-
-    return stream.str();
+    return this->value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp Wed Dec 30 23:14:20 2009
@@ -109,34 +109,52 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = BrokerInfo" << std::endl;
-    stream << " Value of BrokerInfo::ID_BROKERINFO = 2" << std::endl;
-    stream << " Value of BrokerId is Below:" << std::endl;
+    stream << "BrokerInfo { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "BrokerId = ";
     if( this->getBrokerId() != NULL ) {
-        stream << this->getBrokerId()->toString() << std::endl;
+        stream << this->getBrokerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of BrokerURL = " << this->getBrokerURL() << std::endl;
-    for( size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos ) {
-        stream << " Value of PeerBrokerInfos[" << ipeerBrokerInfos << "] is Below:" << std::endl;
-        if( this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
-            stream << this->getPeerBrokerInfos()[ipeerBrokerInfos]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "BrokerURL = " << this->getBrokerURL();
+    stream << ", ";
+    stream << "PeerBrokerInfos = ";
+    if( this->getPeerBrokerInfos().size() > 0 ) {
+        stream << "[";
+        for( size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos ) {
+            if( this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
+                stream << this->getPeerBrokerInfos()[ipeerBrokerInfos]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of BrokerName = " << this->getBrokerName() << std::endl;
-    stream << " Value of SlaveBroker = " << this->isSlaveBroker() << std::endl;
-    stream << " Value of MasterBroker = " << this->isMasterBroker() << std::endl;
-    stream << " Value of FaultTolerantConfiguration = " << this->isFaultTolerantConfiguration() << std::endl;
-    stream << " Value of DuplexConnection = " << this->isDuplexConnection() << std::endl;
-    stream << " Value of NetworkConnection = " << this->isNetworkConnection() << std::endl;
-    stream << " Value of ConnectionId = " << this->getConnectionId() << std::endl;
-    stream << " Value of BrokerUploadUrl = " << this->getBrokerUploadUrl() << std::endl;
-    stream << " Value of NetworkProperties = " << this->getNetworkProperties() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = BrokerInfo" << std::endl;
+    stream << ", ";
+    stream << "BrokerName = " << this->getBrokerName();
+    stream << ", ";
+    stream << "SlaveBroker = " << this->isSlaveBroker();
+    stream << ", ";
+    stream << "MasterBroker = " << this->isMasterBroker();
+    stream << ", ";
+    stream << "FaultTolerantConfiguration = " << this->isFaultTolerantConfiguration();
+    stream << ", ";
+    stream << "DuplexConnection = " << this->isDuplexConnection();
+    stream << ", ";
+    stream << "NetworkConnection = " << this->isNetworkConnection();
+    stream << ", ";
+    stream << "ConnectionId = " << this->getConnectionId();
+    stream << ", ";
+    stream << "BrokerUploadUrl = " << this->getBrokerUploadUrl();
+    stream << ", ";
+    stream << "NetworkProperties = " << this->getNetworkProperties();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp Wed Dec 30 23:14:20 2009
@@ -97,15 +97,20 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConnectionControl" << std::endl;
-    stream << " Value of ConnectionControl::ID_CONNECTIONCONTROL = 18" << std::endl;
-    stream << " Value of Close = " << this->isClose() << std::endl;
-    stream << " Value of Exit = " << this->isExit() << std::endl;
-    stream << " Value of FaultTolerant = " << this->isFaultTolerant() << std::endl;
-    stream << " Value of Resume = " << this->isResume() << std::endl;
-    stream << " Value of Suspend = " << this->isSuspend() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = ConnectionControl" << std::endl;
+    stream << "ConnectionControl { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "Close = " << this->isClose();
+    stream << ", ";
+    stream << "Exit = " << this->isExit();
+    stream << ", ";
+    stream << "FaultTolerant = " << this->isFaultTolerant();
+    stream << ", ";
+    stream << "Resume = " << this->isResume();
+    stream << ", ";
+    stream << "Suspend = " << this->isSuspend();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp Wed Dec 30 23:14:20 2009
@@ -89,22 +89,24 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConnectionError" << std::endl;
-    stream << " Value of ConnectionError::ID_CONNECTIONERROR = 16" << std::endl;
-    stream << " Value of Exception is Below:" << std::endl;
+    stream << "ConnectionError { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "Exception = ";
     if( this->getException() != NULL ) {
-        stream << this->getException()->toString() << std::endl;
+        stream << this->getException()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of ConnectionId is Below:" << std::endl;
+    stream << ", ";
+    stream << "ConnectionId = ";
     if( this->getConnectionId() != NULL ) {
-        stream << this->getConnectionId()->toString() << std::endl;
+        stream << this->getConnectionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << BaseCommand::toString();
-    stream << "End Class = ConnectionError" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp Wed Dec 30 23:14:20 2009
@@ -111,15 +111,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 std::string ConnectionId::toString() const {
 
-    ostringstream stream;
-
-    stream << "Begin Class = ConnectionId" << std::endl;
-    stream << " Value of ConnectionId::ID_CONNECTIONID = 120" << std::endl;
-    stream << " Value of Value = " << this->getValue() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = ConnectionId" << std::endl;
-
-    return stream.str();
+    return this->value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp Wed Dec 30 23:14:20 2009
@@ -101,30 +101,44 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConnectionInfo" << std::endl;
-    stream << " Value of ConnectionInfo::ID_CONNECTIONINFO = 3" << std::endl;
-    stream << " Value of ConnectionId is Below:" << std::endl;
+    stream << "ConnectionInfo { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ConnectionId = ";
     if( this->getConnectionId() != NULL ) {
-        stream << this->getConnectionId()->toString() << std::endl;
+        stream << this->getConnectionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of ClientId = " << this->getClientId() << std::endl;
-    stream << " Value of Password = " << this->getPassword() << std::endl;
-    stream << " Value of UserName = " << this->getUserName() << std::endl;
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        stream << " Value of BrokerPath[" << ibrokerPath << "] is Below:" << std::endl;
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            stream << this->getBrokerPath()[ibrokerPath]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "ClientId = " << this->getClientId();
+    stream << ", ";
+    stream << "Password = " << this->getPassword();
+    stream << ", ";
+    stream << "UserName = " << this->getUserName();
+    stream << ", ";
+    stream << "BrokerPath = ";
+    if( this->getBrokerPath().size() > 0 ) {
+        stream << "[";
+        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
+            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+                stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of BrokerMasterConnector = " << this->isBrokerMasterConnector() << std::endl;
-    stream << " Value of Manageable = " << this->isManageable() << std::endl;
-    stream << " Value of ClientMaster = " << this->isClientMaster() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = ConnectionInfo" << std::endl;
+    stream << ", ";
+    stream << "BrokerMasterConnector = " << this->isBrokerMasterConnector();
+    stream << ", ";
+    stream << "Manageable = " << this->isManageable();
+    stream << ", ";
+    stream << "ClientMaster = " << this->isClientMaster();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp Wed Dec 30 23:14:20 2009
@@ -98,21 +98,27 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConsumerControl" << std::endl;
-    stream << " Value of ConsumerControl::ID_CONSUMERCONTROL = 17" << std::endl;
-    stream << " Value of Close = " << this->isClose() << std::endl;
-    stream << " Value of ConsumerId is Below:" << std::endl;
+    stream << "ConsumerControl { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "Close = " << this->isClose();
+    stream << ", ";
+    stream << "ConsumerId = ";
     if( this->getConsumerId() != NULL ) {
-        stream << this->getConsumerId()->toString() << std::endl;
+        stream << this->getConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Prefetch = " << this->getPrefetch() << std::endl;
-    stream << " Value of Flush = " << this->isFlush() << std::endl;
-    stream << " Value of Start = " << this->isStart() << std::endl;
-    stream << " Value of Stop = " << this->isStop() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = ConsumerControl" << std::endl;
+    stream << ", ";
+    stream << "Prefetch = " << this->getPrefetch();
+    stream << ", ";
+    stream << "Flush = " << this->isFlush();
+    stream << ", ";
+    stream << "Start = " << this->isStart();
+    stream << ", ";
+    stream << "Stop = " << this->isStop();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp Wed Dec 30 23:14:20 2009
@@ -20,6 +20,7 @@
 #include <activemq/state/CommandVisitor.h>
 #include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <sstream>
 
 using namespace std;
 using namespace activemq;
@@ -99,13 +100,9 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConsumerId" << std::endl;
-    stream << " Value of ConsumerId::ID_CONSUMERID = 122" << std::endl;
-    stream << " Value of ConnectionId = " << this->getConnectionId() << std::endl;
-    stream << " Value of SessionId = " << this->getSessionId() << std::endl;
-    stream << " Value of Value = " << this->getValue() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = ConsumerId" << std::endl;
+    stream << this->connectionId << ":"
+           << this->sessionId << ":"
+           << this->value;
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp Wed Dec 30 23:14:20 2009
@@ -118,57 +118,87 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ConsumerInfo" << std::endl;
-    stream << " Value of ConsumerInfo::ID_CONSUMERINFO = 5" << std::endl;
-    stream << " Value of ConsumerId is Below:" << std::endl;
+    stream << "ConsumerInfo { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ConsumerId = ";
     if( this->getConsumerId() != NULL ) {
-        stream << this->getConsumerId()->toString() << std::endl;
+        stream << this->getConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Browser = " << this->isBrowser() << std::endl;
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << ", ";
+    stream << "Browser = " << this->isBrowser();
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of PrefetchSize = " << this->getPrefetchSize() << std::endl;
-    stream << " Value of MaximumPendingMessageLimit = " << this->getMaximumPendingMessageLimit() << std::endl;
-    stream << " Value of DispatchAsync = " << this->isDispatchAsync() << std::endl;
-    stream << " Value of Selector = " << this->getSelector() << std::endl;
-    stream << " Value of SubscriptionName = " << this->getSubscriptionName() << std::endl;
-    stream << " Value of NoLocal = " << this->isNoLocal() << std::endl;
-    stream << " Value of Exclusive = " << this->isExclusive() << std::endl;
-    stream << " Value of Retroactive = " << this->isRetroactive() << std::endl;
-    stream << " Value of Priority = " << (int)this->getPriority() << std::endl;
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        stream << " Value of BrokerPath[" << ibrokerPath << "] is Below:" << std::endl;
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            stream << this->getBrokerPath()[ibrokerPath]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "PrefetchSize = " << this->getPrefetchSize();
+    stream << ", ";
+    stream << "MaximumPendingMessageLimit = " << this->getMaximumPendingMessageLimit();
+    stream << ", ";
+    stream << "DispatchAsync = " << this->isDispatchAsync();
+    stream << ", ";
+    stream << "Selector = " << this->getSelector();
+    stream << ", ";
+    stream << "SubscriptionName = " << this->getSubscriptionName();
+    stream << ", ";
+    stream << "NoLocal = " << this->isNoLocal();
+    stream << ", ";
+    stream << "Exclusive = " << this->isExclusive();
+    stream << ", ";
+    stream << "Retroactive = " << this->isRetroactive();
+    stream << ", ";
+    stream << "Priority = " << (int)this->getPriority();
+    stream << ", ";
+    stream << "BrokerPath = ";
+    if( this->getBrokerPath().size() > 0 ) {
+        stream << "[";
+        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
+            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+                stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of AdditionalPredicate is Below:" << std::endl;
+    stream << ", ";
+    stream << "AdditionalPredicate = ";
     if( this->getAdditionalPredicate() != NULL ) {
-        stream << this->getAdditionalPredicate()->toString() << std::endl;
+        stream << this->getAdditionalPredicate()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of NetworkSubscription = " << this->isNetworkSubscription() << std::endl;
-    stream << " Value of OptimizedAcknowledge = " << this->isOptimizedAcknowledge() << std::endl;
-    stream << " Value of NoRangeAcks = " << this->isNoRangeAcks() << std::endl;
-    for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
-        stream << " Value of NetworkConsumerPath[" << inetworkConsumerPath << "] is Below:" << std::endl;
-        if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
-            stream << this->getNetworkConsumerPath()[inetworkConsumerPath]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "NetworkSubscription = " << this->isNetworkSubscription();
+    stream << ", ";
+    stream << "OptimizedAcknowledge = " << this->isOptimizedAcknowledge();
+    stream << ", ";
+    stream << "NoRangeAcks = " << this->isNoRangeAcks();
+    stream << ", ";
+    stream << "NetworkConsumerPath = ";
+    if( this->getNetworkConsumerPath().size() > 0 ) {
+        stream << "[";
+        for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
+            if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+                stream << this->getNetworkConsumerPath()[inetworkConsumerPath]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << BaseCommand::toString();
-    stream << "End Class = ConsumerInfo" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp Wed Dec 30 23:14:20 2009
@@ -89,11 +89,12 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ControlCommand" << std::endl;
-    stream << " Value of ControlCommand::ID_CONTROLCOMMAND = 14" << std::endl;
-    stream << " Value of Command = " << this->getCommand() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = ControlCommand" << std::endl;
+    stream << "ControlCommand { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "Command = " << this->getCommand();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp Wed Dec 30 23:14:20 2009
@@ -88,18 +88,22 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = DataArrayResponse" << std::endl;
-    stream << " Value of DataArrayResponse::ID_DATAARRAYRESPONSE = 33" << std::endl;
-    for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
-        stream << " Value of Data[" << idata << "] is Below:" << std::endl;
-        if( this->getData()[idata] != NULL ) {
-            stream << this->getData()[idata]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << "DataArrayResponse { ";
+    stream << "Data = ";
+    if( this->getData().size() > 0 ) {
+        stream << "[";
+        for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
+            if( this->getData()[idata] != NULL ) {
+                stream << this->getData()[idata]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << Response::toString();
-    stream << "End Class = DataArrayResponse" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp Wed Dec 30 23:14:20 2009
@@ -88,16 +88,14 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = DataResponse" << std::endl;
-    stream << " Value of DataResponse::ID_DATARESPONSE = 32" << std::endl;
-    stream << " Value of Data is Below:" << std::endl;
+    stream << "DataResponse { ";
+    stream << "Data = ";
     if( this->getData() != NULL ) {
-        stream << this->getData()->toString() << std::endl;
+        stream << this->getData()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << Response::toString();
-    stream << "End Class = DataResponse" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp Wed Dec 30 23:14:20 2009
@@ -94,32 +94,43 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = DestinationInfo" << std::endl;
-    stream << " Value of DestinationInfo::ID_DESTINATIONINFO = 8" << std::endl;
-    stream << " Value of ConnectionId is Below:" << std::endl;
+    stream << "DestinationInfo { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ConnectionId = ";
     if( this->getConnectionId() != NULL ) {
-        stream << this->getConnectionId()->toString() << std::endl;
+        stream << this->getConnectionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of OperationType = " << (int)this->getOperationType() << std::endl;
-    stream << " Value of Timeout = " << this->getTimeout() << std::endl;
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        stream << " Value of BrokerPath[" << ibrokerPath << "] is Below:" << std::endl;
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            stream << this->getBrokerPath()[ibrokerPath]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "OperationType = " << (int)this->getOperationType();
+    stream << ", ";
+    stream << "Timeout = " << this->getTimeout();
+    stream << ", ";
+    stream << "BrokerPath = ";
+    if( this->getBrokerPath().size() > 0 ) {
+        stream << "[";
+        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
+            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+                stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << BaseCommand::toString();
-    stream << "End Class = DestinationInfo" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp Wed Dec 30 23:14:20 2009
@@ -91,12 +91,11 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = DiscoveryEvent" << std::endl;
-    stream << " Value of DiscoveryEvent::ID_DISCOVERYEVENT = 40" << std::endl;
-    stream << " Value of ServiceName = " << this->getServiceName() << std::endl;
-    stream << " Value of BrokerName = " << this->getBrokerName() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = DiscoveryEvent" << std::endl;
+    stream << "DiscoveryEvent { ";
+    stream << "ServiceName = " << this->getServiceName();
+    stream << ", ";
+    stream << "BrokerName = " << this->getBrokerName();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp Wed Dec 30 23:14:20 2009
@@ -88,16 +88,14 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = ExceptionResponse" << std::endl;
-    stream << " Value of ExceptionResponse::ID_EXCEPTIONRESPONSE = 31" << std::endl;
-    stream << " Value of Exception is Below:" << std::endl;
+    stream << "ExceptionResponse { ";
+    stream << "Exception = ";
     if( this->getException() != NULL ) {
-        stream << this->getException()->toString() << std::endl;
+        stream << this->getException()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << Response::toString();
-    stream << "End Class = ExceptionResponse" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp Wed Dec 30 23:14:20 2009
@@ -87,10 +87,10 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = FlushCommand" << std::endl;
-    stream << " Value of FlushCommand::ID_FLUSHCOMMAND = 15" << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = FlushCommand" << std::endl;
+    stream << "FlushCommand { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp Wed Dec 30 23:14:20 2009
@@ -89,11 +89,9 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = IntegerResponse" << std::endl;
-    stream << " Value of IntegerResponse::ID_INTEGERRESPONSE = 34" << std::endl;
-    stream << " Value of Result = " << this->getResult() << std::endl;
-    stream << Response::toString();
-    stream << "End Class = IntegerResponse" << std::endl;
+    stream << "IntegerResponse { ";
+    stream << "Result = " << this->getResult();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp Wed Dec 30 23:14:20 2009
@@ -89,22 +89,21 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = JournalQueueAck" << std::endl;
-    stream << " Value of JournalQueueAck::ID_JOURNALQUEUEACK = 52" << std::endl;
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << "JournalQueueAck { ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of MessageAck is Below:" << std::endl;
+    stream << ", ";
+    stream << "MessageAck = ";
     if( this->getMessageAck() != NULL ) {
-        stream << this->getMessageAck()->toString() << std::endl;
+        stream << this->getMessageAck()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << BaseDataStructure::toString();
-    stream << "End Class = JournalQueueAck" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp Wed Dec 30 23:14:20 2009
@@ -96,31 +96,34 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = JournalTopicAck" << std::endl;
-    stream << " Value of JournalTopicAck::ID_JOURNALTOPICACK = 50" << std::endl;
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << "JournalTopicAck { ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of MessageId is Below:" << std::endl;
+    stream << ", ";
+    stream << "MessageId = ";
     if( this->getMessageId() != NULL ) {
-        stream << this->getMessageId()->toString() << std::endl;
+        stream << this->getMessageId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of MessageSequenceId = " << this->getMessageSequenceId() << std::endl;
-    stream << " Value of SubscritionName = " << this->getSubscritionName() << std::endl;
-    stream << " Value of ClientId = " << this->getClientId() << std::endl;
-    stream << " Value of TransactionId is Below:" << std::endl;
+    stream << ", ";
+    stream << "MessageSequenceId = " << this->getMessageSequenceId();
+    stream << ", ";
+    stream << "SubscritionName = " << this->getSubscritionName();
+    stream << ", ";
+    stream << "ClientId = " << this->getClientId();
+    stream << ", ";
+    stream << "TransactionId = ";
     if( this->getTransactionId() != NULL ) {
-        stream << this->getTransactionId()->toString() << std::endl;
+        stream << this->getTransactionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << BaseDataStructure::toString();
-    stream << "End Class = JournalTopicAck" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp Wed Dec 30 23:14:20 2009
@@ -89,11 +89,9 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = JournalTrace" << std::endl;
-    stream << " Value of JournalTrace::ID_JOURNALTRACE = 53" << std::endl;
-    stream << " Value of Message = " << this->getMessage() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = JournalTrace" << std::endl;
+    stream << "JournalTrace { ";
+    stream << "Message = " << this->getMessage();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp Wed Dec 30 23:14:20 2009
@@ -92,18 +92,18 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = JournalTransaction" << std::endl;
-    stream << " Value of JournalTransaction::ID_JOURNALTRANSACTION = 54" << std::endl;
-    stream << " Value of TransactionId is Below:" << std::endl;
+    stream << "JournalTransaction { ";
+    stream << "TransactionId = ";
     if( this->getTransactionId() != NULL ) {
-        stream << this->getTransactionId()->toString() << std::endl;
+        stream << this->getTransactionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Type = " << (int)this->getType() << std::endl;
-    stream << " Value of WasPrepared = " << this->getWasPrepared() << std::endl;
-    stream << BaseDataStructure::toString();
-    stream << "End Class = JournalTransaction" << std::endl;
+    stream << ", ";
+    stream << "Type = " << (int)this->getType();
+    stream << ", ";
+    stream << "WasPrepared = " << this->getWasPrepared();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp Wed Dec 30 23:14:20 2009
@@ -87,10 +87,10 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = KeepAliveInfo" << std::endl;
-    stream << " Value of KeepAliveInfo::ID_KEEPALIVEINFO = 10" << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = KeepAliveInfo" << std::endl;
+    stream << "KeepAliveInfo { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp Wed Dec 30 23:14:20 2009
@@ -87,10 +87,8 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = LastPartialCommand" << std::endl;
-    stream << " Value of LastPartialCommand::ID_LASTPARTIALCOMMAND = 61" << std::endl;
-    stream << PartialCommand::toString();
-    stream << "End Class = LastPartialCommand" << std::endl;
+    stream << "LastPartialCommand { ";
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp Wed Dec 30 23:14:20 2009
@@ -96,17 +96,16 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = LocalTransactionId" << std::endl;
-    stream << " Value of LocalTransactionId::ID_LOCALTRANSACTIONID = 111" << std::endl;
-    stream << " Value of Value = " << this->getValue() << std::endl;
-    stream << " Value of ConnectionId is Below:" << std::endl;
+    stream << "LocalTransactionId { ";
+    stream << "Value = " << this->getValue();
+    stream << ", ";
+    stream << "ConnectionId = ";
     if( this->getConnectionId() != NULL ) {
-        stream << this->getConnectionId()->toString() << std::endl;
+        stream << this->getConnectionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << TransactionId::toString();
-    stream << "End Class = LocalTransactionId" << std::endl;
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp Wed Dec 30 23:14:20 2009
@@ -141,108 +141,155 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = Message" << std::endl;
-    stream << " Value of Message::ID_MESSAGE = 0" << std::endl;
-    stream << " Value of ProducerId is Below:" << std::endl;
+    stream << "Message { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ProducerId = ";
     if( this->getProducerId() != NULL ) {
-        stream << this->getProducerId()->toString() << std::endl;
+        stream << this->getProducerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of TransactionId is Below:" << std::endl;
+    stream << ", ";
+    stream << "TransactionId = ";
     if( this->getTransactionId() != NULL ) {
-        stream << this->getTransactionId()->toString() << std::endl;
+        stream << this->getTransactionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of OriginalDestination is Below:" << std::endl;
+    stream << ", ";
+    stream << "OriginalDestination = ";
     if( this->getOriginalDestination() != NULL ) {
-        stream << this->getOriginalDestination()->toString() << std::endl;
+        stream << this->getOriginalDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of MessageId is Below:" << std::endl;
+    stream << ", ";
+    stream << "MessageId = ";
     if( this->getMessageId() != NULL ) {
-        stream << this->getMessageId()->toString() << std::endl;
+        stream << this->getMessageId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of OriginalTransactionId is Below:" << std::endl;
+    stream << ", ";
+    stream << "OriginalTransactionId = ";
     if( this->getOriginalTransactionId() != NULL ) {
-        stream << this->getOriginalTransactionId()->toString() << std::endl;
+        stream << this->getOriginalTransactionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of GroupID = " << this->getGroupID() << std::endl;
-    stream << " Value of GroupSequence = " << this->getGroupSequence() << std::endl;
-    stream << " Value of CorrelationId = " << this->getCorrelationId() << std::endl;
-    stream << " Value of Persistent = " << this->isPersistent() << std::endl;
-    stream << " Value of Expiration = " << this->getExpiration() << std::endl;
-    stream << " Value of Priority = " << (int)this->getPriority() << std::endl;
-    stream << " Value of ReplyTo is Below:" << std::endl;
+    stream << ", ";
+    stream << "GroupID = " << this->getGroupID();
+    stream << ", ";
+    stream << "GroupSequence = " << this->getGroupSequence();
+    stream << ", ";
+    stream << "CorrelationId = " << this->getCorrelationId();
+    stream << ", ";
+    stream << "Persistent = " << this->isPersistent();
+    stream << ", ";
+    stream << "Expiration = " << this->getExpiration();
+    stream << ", ";
+    stream << "Priority = " << (int)this->getPriority();
+    stream << ", ";
+    stream << "ReplyTo = ";
     if( this->getReplyTo() != NULL ) {
-        stream << this->getReplyTo()->toString() << std::endl;
+        stream << this->getReplyTo()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Timestamp = " << this->getTimestamp() << std::endl;
-    stream << " Value of Type = " << this->getType() << std::endl;
-    for( size_t icontent = 0; icontent < this->getContent().size(); ++icontent ) {
-        stream << " Value of Content[" << icontent << "] = " << this->getContent()[icontent] << std::endl;
+    stream << ", ";
+    stream << "Timestamp = " << this->getTimestamp();
+    stream << ", ";
+    stream << "Type = " << this->getType();
+    stream << ", ";
+    stream << "Content = ";
+    if( this->getContent().size() > 0 ) {
+        stream << "[size=" << this->getContent().size() << "]";
+    } else {
+        stream << "NULL";
     }
-    for( size_t imarshalledProperties = 0; imarshalledProperties < this->getMarshalledProperties().size(); ++imarshalledProperties ) {
-        stream << " Value of MarshalledProperties[" << imarshalledProperties << "] = " << this->getMarshalledProperties()[imarshalledProperties] << std::endl;
+    stream << ", ";
+    stream << "MarshalledProperties = ";
+    if( this->getMarshalledProperties().size() > 0 ) {
+        stream << "[size=" << this->getMarshalledProperties().size() << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of DataStructure is Below:" << std::endl;
+    stream << ", ";
+    stream << "DataStructure = ";
     if( this->getDataStructure() != NULL ) {
-        stream << this->getDataStructure()->toString() << std::endl;
+        stream << this->getDataStructure()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of TargetConsumerId is Below:" << std::endl;
+    stream << ", ";
+    stream << "TargetConsumerId = ";
     if( this->getTargetConsumerId() != NULL ) {
-        stream << this->getTargetConsumerId()->toString() << std::endl;
+        stream << this->getTargetConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Compressed = " << this->isCompressed() << std::endl;
-    stream << " Value of RedeliveryCounter = " << this->getRedeliveryCounter() << std::endl;
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        stream << " Value of BrokerPath[" << ibrokerPath << "] is Below:" << std::endl;
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            stream << this->getBrokerPath()[ibrokerPath]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "Compressed = " << this->isCompressed();
+    stream << ", ";
+    stream << "RedeliveryCounter = " << this->getRedeliveryCounter();
+    stream << ", ";
+    stream << "BrokerPath = ";
+    if( this->getBrokerPath().size() > 0 ) {
+        stream << "[";
+        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
+            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+                stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of Arrival = " << this->getArrival() << std::endl;
-    stream << " Value of UserID = " << this->getUserID() << std::endl;
-    stream << " Value of RecievedByDFBridge = " << this->isRecievedByDFBridge() << std::endl;
-    stream << " Value of Droppable = " << this->isDroppable() << std::endl;
-    for( size_t icluster = 0; icluster < this->getCluster().size(); ++icluster ) {
-        stream << " Value of Cluster[" << icluster << "] is Below:" << std::endl;
-        if( this->getCluster()[icluster] != NULL ) {
-            stream << this->getCluster()[icluster]->toString() << std::endl;
-        } else {
-            stream << "   Object is NULL" << std::endl;
+    stream << ", ";
+    stream << "Arrival = " << this->getArrival();
+    stream << ", ";
+    stream << "UserID = " << this->getUserID();
+    stream << ", ";
+    stream << "RecievedByDFBridge = " << this->isRecievedByDFBridge();
+    stream << ", ";
+    stream << "Droppable = " << this->isDroppable();
+    stream << ", ";
+    stream << "Cluster = ";
+    if( this->getCluster().size() > 0 ) {
+        stream << "[";
+        for( size_t icluster = 0; icluster < this->getCluster().size(); ++icluster ) {
+            if( this->getCluster()[icluster] != NULL ) {
+                stream << this->getCluster()[icluster]->toString() << ", ";
+            } else {
+                stream << "NULL" << ", ";
+            }
         }
+        stream << "]";
+    } else {
+        stream << "NULL";
     }
-    stream << " Value of BrokerInTime = " << this->getBrokerInTime() << std::endl;
-    stream << " Value of BrokerOutTime = " << this->getBrokerOutTime() << std::endl;
+    stream << ", ";
+    stream << "BrokerInTime = " << this->getBrokerInTime();
+    stream << ", ";
+    stream << "BrokerOutTime = " << this->getBrokerOutTime();
+    stream << " }";
+
+    return stream.str();
     stream << " Value of ackHandler = " << ackHandler.get() << std::endl;
     stream << " Value of properties = " << this->properties.toString() << std::endl;
     stream << " Value of readOnlyBody = " << this->readOnlyBody << std::endl;
     stream << " Value of readOnlyProperties = " << this->readOnlyBody << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = Message" << std::endl;
-
-    return stream.str();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp Wed Dec 30 23:14:20 2009
@@ -96,42 +96,49 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = MessageAck" << std::endl;
-    stream << " Value of MessageAck::ID_MESSAGEACK = 22" << std::endl;
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << "MessageAck { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of TransactionId is Below:" << std::endl;
+    stream << ", ";
+    stream << "TransactionId = ";
     if( this->getTransactionId() != NULL ) {
-        stream << this->getTransactionId()->toString() << std::endl;
+        stream << this->getTransactionId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of ConsumerId is Below:" << std::endl;
+    stream << ", ";
+    stream << "ConsumerId = ";
     if( this->getConsumerId() != NULL ) {
-        stream << this->getConsumerId()->toString() << std::endl;
+        stream << this->getConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of AckType = " << (int)this->getAckType() << std::endl;
-    stream << " Value of FirstMessageId is Below:" << std::endl;
+    stream << ", ";
+    stream << "AckType = " << (int)this->getAckType();
+    stream << ", ";
+    stream << "FirstMessageId = ";
     if( this->getFirstMessageId() != NULL ) {
-        stream << this->getFirstMessageId()->toString() << std::endl;
+        stream << this->getFirstMessageId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of LastMessageId is Below:" << std::endl;
+    stream << ", ";
+    stream << "LastMessageId = ";
     if( this->getLastMessageId() != NULL ) {
-        stream << this->getLastMessageId()->toString() << std::endl;
+        stream << this->getLastMessageId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of MessageCount = " << this->getMessageCount() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = MessageAck" << std::endl;
+    stream << ", ";
+    stream << "MessageCount = " << this->getMessageCount();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp Wed Dec 30 23:14:20 2009
@@ -92,29 +92,33 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = MessageDispatch" << std::endl;
-    stream << " Value of MessageDispatch::ID_MESSAGEDISPATCH = 21" << std::endl;
-    stream << " Value of ConsumerId is Below:" << std::endl;
+    stream << "MessageDispatch { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ConsumerId = ";
     if( this->getConsumerId() != NULL ) {
-        stream << this->getConsumerId()->toString() << std::endl;
+        stream << this->getConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Message is Below:" << std::endl;
+    stream << ", ";
+    stream << "Message = ";
     if( this->getMessage() != NULL ) {
-        stream << this->getMessage()->toString() << std::endl;
+        stream << this->getMessage()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of RedeliveryCounter = " << this->getRedeliveryCounter() << std::endl;
-    stream << BaseCommand::toString();
-    stream << "End Class = MessageDispatch" << std::endl;
+    stream << ", ";
+    stream << "RedeliveryCounter = " << this->getRedeliveryCounter();
+    stream << " }";
 
     return stream.str();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp?rev=894734&r1=894733&r2=894734&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp Wed Dec 30 23:14:20 2009
@@ -92,29 +92,33 @@
 
     ostringstream stream;
 
-    stream << "Begin Class = MessageDispatchNotification" << std::endl;
-    stream << " Value of MessageDispatchNotification::ID_MESSAGEDISPATCHNOTIFICATION = 90" << std::endl;
-    stream << " Value of ConsumerId is Below:" << std::endl;
+    stream << "MessageDispatchNotification { "
+           << "commandId = " << this->getCommandId() << ", "
+           << "responseRequired = " << boolalpha << this->isResponseRequired();
+    stream << ", ";
+    stream << "ConsumerId = ";
     if( this->getConsumerId() != NULL ) {
-        stream << this->getConsumerId()->toString() << std::endl;
+        stream << this->getConsumerId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of Destination is Below:" << std::endl;
+    stream << ", ";
+    stream << "Destination = ";
     if( this->getDestination() != NULL ) {
-        stream << this->getDestination()->toString() << std::endl;
+        stream << this->getDestination()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << " Value of DeliverySequenceId = " << this->getDeliverySequenceId() << std::endl;
-    stream << " Value of MessageId is Below:" << std::endl;
+    stream << ", ";
+    stream << "DeliverySequenceId = " << this->getDeliverySequenceId();
+    stream << ", ";
+    stream << "MessageId = ";
     if( this->getMessageId() != NULL ) {
-        stream << this->getMessageId()->toString() << std::endl;
+        stream << this->getMessageId()->toString();
     } else {
-        stream << "   Object is NULL" << std::endl;
+        stream << "NULL";
     }
-    stream << BaseCommand::toString();
-    stream << "End Class = MessageDispatchNotification" << std::endl;
+    stream << " }";
 
     return stream.str();
 }



Mime
View raw message