activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593579 [3/4] - in /activemq/activemq-cpp/trunk/src/test/activemq: connector/ connector/openwire/ connector/openwire/commands/ connector/openwire/marshal/ connector/openwire/marshal/v1/ connector/openwire/marshal/v2/ connector/openwire/util...
Date Fri, 09 Nov 2007 16:09:59 GMT
Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::DiscoveryEventMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void DiscoveryEventMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ExceptionResponseMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ExceptionResponseMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::FlushCommandMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void FlushCommandMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::IntegerResponseMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void IntegerResponseMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::JournalQueueAckMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void JournalQueueAckMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::JournalTopicAckMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void JournalTopicAckMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::JournalTraceMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void JournalTraceMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::JournalTransactionMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void JournalTransactionMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::KeepAliveInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void KeepAliveInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::LastPartialCommandMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void LastPartialCommandMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::LocalTransactionIdMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void LocalTransactionIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::MessageAckMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessageAckMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::MessageDispatchMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessageDispatchMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::MessageDispatchNotificationMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessageDispatchNotificationMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::MessageIdMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessageIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::MessagePullMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void MessagePullMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::NetworkBridgeFilterMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void NetworkBridgeFilterMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::PartialCommandMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void PartialCommandMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ProducerIdMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ProducerIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ProducerInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ProducerInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::RemoveInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void RemoveInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::RemoveSubscriptionInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void RemoveSubscriptionInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ReplayCommandMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ReplayCommandMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ResponseMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ResponseMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::SessionIdMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void SessionIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::SessionInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void SessionInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::ShutdownInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ShutdownInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::SubscriptionInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void SubscriptionInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::TransactionInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void TransactionInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::WireFormatInfoMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void WireFormatInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v2::XATransactionIdMarshallerTest );
 
-#include <decaf/io/DataInputStream.h>
-#include <decaf/io/DataOutputStream.h>
-#include <decaf/io/IOException.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/ByteArrayInputStream.h>
 #include <decaf/util/Properties.h>
@@ -39,7 +39,6 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
@@ -48,6 +47,9 @@
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void XATransactionIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp Fri Nov  9 08:09:53 2007
@@ -25,8 +25,9 @@
 #include <decaf/io/DataOutputStream.h>
 #include <decaf/io/DataInputStream.h>
 
+using namespace decaf;
+using namespace decaf::io;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::utils;
@@ -47,16 +48,16 @@
     b1Stream.writeBoolean( false );
     b1Stream.writeBoolean( true );
     b1Stream.writeBoolean( true );
-    
+
     b1Stream.marshal( &daoStream );
-    
+
     BooleanStream b2Stream;
-    io::ByteArrayInputStream baiStream( baoStream.getByteArray(),
-                                        baoStream.getByteArraySize() );
-    io::DataInputStream daiStream( &baiStream );
+    decaf::io::ByteArrayInputStream baiStream( baoStream.toByteArray(),
+                                               baoStream.size() );
+    decaf::io::DataInputStream daiStream( &baiStream );
 
     b2Stream.unmarshal( &daiStream );
-    
+
     CPPUNIT_ASSERT( b2Stream.readBoolean() == false );
     CPPUNIT_ASSERT( b2Stream.readBoolean() == true );
     CPPUNIT_ASSERT( b2Stream.readBoolean() == false );
@@ -83,10 +84,10 @@
     }
 
     b1Stream.marshal( &daoStream );
-    
+
     BooleanStream b2Stream;
-    io::ByteArrayInputStream baiStream( baoStream.getByteArray(),
-                                        baoStream.getByteArraySize() );
+    io::ByteArrayInputStream baiStream( baoStream.toByteArray(),
+                                        baoStream.size() );
     io::DataInputStream daiStream( &baiStream );
 
     b2Stream.unmarshal( &daiStream );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp Fri Nov  9 08:09:53 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #include "OpenwireStringSupportTest.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::utils::OpenwireStringSupportTest );
@@ -27,8 +27,9 @@
 #include <decaf/io/DataOutputStream.h>
 
 using namespace std;
+using namespace decaf;
+using namespace decaf::io;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::utils;
@@ -38,18 +39,18 @@
 {
     ByteArrayInputStream bytesIn;
     ByteArrayOutputStream bytesOut;
-    
+
     DataInputStream dataIn( &bytesIn );
     DataOutputStream dataOut( &bytesOut );
 
     string testStr = "This is a test string for Openwire";
 
     OpenwireStringSupport::writeString( dataOut, &testStr );
-    
+
     // Move the output back to the input.
-    bytesIn.setByteArray( bytesOut.getByteArray(), bytesOut.getByteArraySize() );
+    bytesIn.setByteArray( bytesOut.toByteArray(), bytesOut.size() );
 
     string resultStr = OpenwireStringSupport::readString( dataIn );
-    
+
     CPPUNIT_ASSERT( testStr == resultStr );
 }

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h Fri Nov  9 08:09:53 2007
@@ -40,40 +40,40 @@
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
-    	StompCommandReaderTest() {}
-    	virtual ~StompCommandReaderTest() {}
+
+        StompCommandReaderTest() {}
+        virtual ~StompCommandReaderTest() {}
 
         void test( void )
         {
-            io::ByteArrayInputStream biStream;
+            decaf::io::ByteArrayInputStream biStream;
 
             StompCommandReader reader( &biStream );
 
-            const char* connectedStr = 
+            const char* connectedStr =
                 "CONNECTED\nsession:test\n\n\0\n";
-            const char* textStr = 
+            const char* textStr =
                 "MESSAGE\n"
                 "destination:/topic/a\n"
                 "message-id:123\n"
                 "sampleProperty:testvalue\n\n"
                 "testMessage\0\n";
-            const char* bytesStr = 
+            const char* bytesStr =
                 "MESSAGE\n"                    // 8
                 "destination:/topic/a\n"       // 21
                 "message-id:123\n"             // 15
                 "content-length:9\n"           // 17
                 "sampleProperty:testvalue\n\n" // 26
                 "123456789\0\n";               // 11
-            
-            biStream.setByteArray( 
+
+            biStream.setByteArray(
                 (const unsigned char*)connectedStr, 27 );
 
             transport::Command* command = reader.readCommand();
 
             CPPUNIT_ASSERT( command != NULL );
-            
-            commands::ConnectedCommand* connected = 
+
+            commands::ConnectedCommand* connected =
                 dynamic_cast< commands::ConnectedCommand* >( command );
 
             CPPUNIT_ASSERT( connected != NULL );
@@ -82,16 +82,16 @@
             std::string sessionId = connected->getSessionId();
             CPPUNIT_ASSERT( sessionId == "test" );
 
-            biStream.setByteArray( 
+            biStream.setByteArray(
                 (const unsigned char*)textStr, 83 );
 
             delete command;
-            
+
             command = reader.readCommand();
 
             CPPUNIT_ASSERT( command != NULL );
-            
-            commands::TextMessageCommand* textMessage = 
+
+            commands::TextMessageCommand* textMessage =
                 dynamic_cast< commands::TextMessageCommand* >( command );
 
             CPPUNIT_ASSERT( textMessage != NULL );
@@ -100,7 +100,7 @@
             std::string text = textMessage->getText();
             CPPUNIT_ASSERT( text == "testMessage" );
 
-            biStream.setByteArray( 
+            biStream.setByteArray(
                 (const unsigned char*)bytesStr, 98 );
 
             delete command;
@@ -108,21 +108,21 @@
             command = reader.readCommand();
 
             CPPUNIT_ASSERT( command != NULL );
-            
-            commands::BytesMessageCommand* bytesMessage = 
+
+            commands::BytesMessageCommand* bytesMessage =
                 dynamic_cast< commands::BytesMessageCommand* >( command );
 
             CPPUNIT_ASSERT( bytesMessage != NULL );
 
             CPPUNIT_ASSERT( bytesMessage->getBodyBytes() != NULL );
-            std::string bytesText( 
-                (const char*)bytesMessage->getBodyBytes(), 
+            std::string bytesText(
+                (const char*)bytesMessage->getBodyBytes(),
                 (int)bytesMessage->getBodyLength() );
             CPPUNIT_ASSERT( bytesText == "123456789" );
 
             delete command;
         }
-        
+
     };
 
 }}}

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h Fri Nov  9 08:09:53 2007
@@ -52,14 +52,14 @@
             virtual const StompFrame& marshal(void)
                 throw (marshal::MarshalException)
             {
-                const StompFrame& frame = 
+                const StompFrame& frame =
                     commands::BytesMessageCommand::marshal();
 
                 // Before we send out the frame tag it with the content length
                 // as this is a bytes message and we can't ensure we have only
                 // a trailing NULL.
                 const_cast< StompFrame* >( &frame )->setCommand(
-                    commands::CommandConstants::toString( 
+                    commands::CommandConstants::toString(
                         commands::CommandConstants::MESSAGE ) );
 
                 return frame;
@@ -73,14 +73,14 @@
             virtual const StompFrame& marshal(void)
                 throw (marshal::MarshalException)
             {
-                const StompFrame& frame = 
+                const StompFrame& frame =
                     commands::TextMessageCommand::marshal();
 
                 // Before we send out the frame tag it with the content length
                 // as this is a bytes message and we can't ensure we have only
                 // a trailing NULL.
                 const_cast< StompFrame* >( &frame )->setCommand(
-                    commands::CommandConstants::toString( 
+                    commands::CommandConstants::toString(
                         commands::CommandConstants::MESSAGE ) );
 
                 return frame;
@@ -89,17 +89,17 @@
         };
 
     public:
-    
-    	StompCommandWriterTest() {}
-    	virtual ~StompCommandWriterTest() {}
-    
+
+        StompCommandWriterTest() {}
+        virtual ~StompCommandWriterTest() {}
+
         void test( void )
         {
-            io::ByteArrayOutputStream boStream;
+            decaf::io::ByteArrayOutputStream boStream;
 
             StompCommandWriter writer( &boStream );
 
-            const char* result = 
+            const char* result =
                 "CONNECTED\nsession:test\n\n\0\n"   // 26 = 26
                 "SEND\n"                            // 5
                 "destination:/topic/a\n"            // 21
@@ -116,7 +116,7 @@
             commands::ConnectedCommand connectedCommand;
             commands::TextMessageCommand textCommand;
             commands::BytesMessageCommand bytesCommand;
-            
+
             // Sync to expected output
             connectedCommand.setSessionId( "test" );
 
@@ -124,7 +124,7 @@
             StompTopic topic1("a");
             textCommand.setCMSDestination( &topic1 );
             textCommand.setCMSMessageID( "123" );
-            textCommand.getProperties().setProperty( 
+            textCommand.getProperties().setProperty(
                 "sampleProperty", "testvalue" );
             textCommand.setText( "testMessage" );
 
@@ -132,23 +132,23 @@
             StompTopic topic2("a");
             bytesCommand.setCMSDestination( &topic2 );
             bytesCommand.setCMSMessageID( "123" );
-            bytesCommand.getProperties().setProperty( 
+            bytesCommand.getProperties().setProperty(
                 "sampleProperty", "testvalue" );
-            bytesCommand.setBodyBytes( 
+            bytesCommand.setBodyBytes(
                 (const unsigned char*)"123456789", 9 );
 
             writer.writeCommand( &connectedCommand );
             writer.writeCommand( &textCommand );
             writer.writeCommand( &bytesCommand );
 
-            const unsigned char* alloc = boStream.getByteArray();
+            const unsigned char* alloc = boStream.toByteArray();
 
             //for( int i = 0; i < 201; ++i )
             //{
             //    std::cout << result[i] << " == " << alloc[i] << std::endl;
             //}
 
-            CPPUNIT_ASSERT( boStream.getByteArraySize() == 201 );
+            CPPUNIT_ASSERT( boStream.size() == 201 );
 
             for( int i = 0; i < 201; ++i )
             {
@@ -156,18 +156,18 @@
             }
 
             // Use STL Compare
-            CPPUNIT_ASSERT( 
-                memcmp( &result[0], boStream.getByteArray(), 200 ) == 0 );
+            CPPUNIT_ASSERT(
+                memcmp( &result[0], boStream.toByteArray(), 200 ) == 0 );
         }
 
         void testWriteAndReads() {
-            
-            io::ByteArrayOutputStream boStream;
-            io::ByteArrayInputStream biStream;
+
+            decaf::io::ByteArrayOutputStream boStream;
+            decaf::io::ByteArrayInputStream biStream;
 
             StompCommandWriter writer( &boStream );
             StompCommandReader reader( &biStream );
-            
+
             MyTextMessageCommand textCommand;
             MyBytesMessageCommand bytesCommand;
 
@@ -181,19 +181,19 @@
 
             const int testInt1 = 45678;
             const int testInt2 = 42;
-            
+
             const std::string testStr1 = "Test String 1";
             const std::string testStr2 = "Test String 2";
-            
+
             const bool testBool1 = true;
             const bool testBool2 = false;
 
             bytesCommand.writeInt( testInt1 );
             bytesCommand.writeInt( testInt2 );
-            
+
             bytesCommand.writeString( testStr1 );
             bytesCommand.writeUTF( testStr2 );
-            
+
             bytesCommand.writeBoolean( testBool1 );
             bytesCommand.writeBoolean( testBool2 );
 
@@ -201,11 +201,11 @@
             writer.writeCommand( &bytesCommand );
 
             // Copy output Command to the Input Stream
-            biStream.setByteArray( boStream.getByteArray(), 
-                                   boStream.getByteArraySize() );
+            biStream.setByteArray( boStream.toByteArray(),
+                                   boStream.size() );
 
-            commands::TextMessageCommand* textMessage = 
-                dynamic_cast< commands::TextMessageCommand* >( 
+            commands::TextMessageCommand* textMessage =
+                dynamic_cast< commands::TextMessageCommand* >(
                     reader.readCommand() );
 
             CPPUNIT_ASSERT( textMessage != NULL );
@@ -213,8 +213,8 @@
             std::string text = textMessage->getText();
             CPPUNIT_ASSERT( text == "This is a TextMessage" );
 
-            commands::BytesMessageCommand* bytesMessage = 
-                dynamic_cast< commands::BytesMessageCommand* >( 
+            commands::BytesMessageCommand* bytesMessage =
+                dynamic_cast< commands::BytesMessageCommand* >(
                     reader.readCommand() );
 
             CPPUNIT_ASSERT( bytesMessage != NULL );
@@ -229,9 +229,9 @@
             delete bytesMessage;
             delete textMessage;
         }
-        
+
     };
-    
+
 }}}
 
 #endif /*_ACTIVEMQ_CONNECTOR_STOMP_STOMPCOMMANDWRITERTEST_H_*/

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp Fri Nov  9 08:09:53 2007
@@ -277,7 +277,7 @@
 
     this->connectionId = "testConnectionId";
 
-    activemq::util::Properties properties;
+    decaf::util::Properties properties;
 
     // Default to Stomp
     properties.setProperty( "wireFormat", "stomp" );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp Fri Nov  9 08:09:53 2007
@@ -327,7 +327,7 @@
 
     this->connectionId = "testConnectionId";
 
-    activemq::util::Properties properties;
+    decaf::util::Properties properties;
 
     // Default to Stomp
     properties.setProperty( "wireFormat", "stomp" );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h Fri Nov  9 08:09:53 2007
@@ -85,7 +85,7 @@
                 subscribe = dynamic_cast< commands::SubscribeCommand* >( command );
                 if( subscribe )
                 {
-                    const util::Properties& properties =
+                    const decaf::util::Properties& properties =
                         subscribe->getProperties();
 
                     for( size_t ix = 0; ix < expected.size(); ++ix )

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Fri Nov  9 08:09:53 2007
@@ -209,8 +209,8 @@
                 (std::string)CommandConstants::topicPrefix + "mytopic" );
 
             // write a bunch of values to the frame's body.
-            io::ByteArrayOutputStream os( frame->getBody() );
-            io::DataOutputStream dos(&os);
+            decaf::io::ByteArrayOutputStream os( frame->getBody() );
+            decaf::io::DataOutputStream dos(&os);
             dos.writeBoolean( true );
             dos.writeByte( 1 );
             dos.writeChar( 'a' );
@@ -230,67 +230,67 @@
             try{
                 cmd.setBodyBytes( (unsigned char*)"test", 5 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeBoolean( true );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeByte( 2 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeBytes( std::vector<unsigned char>() );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeBytes( (unsigned char*)"test", 0, 5 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeChar( 'a' );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeFloat( 1.0f );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeDouble( 1.0 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeUnsignedShort( 3 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeShort( 4 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeInt( 5 );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeLong( 6LL );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.writeString( "test" );
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             // Now, verify that all the reads work properly
 
@@ -315,58 +315,58 @@
             try{
                 cmd.readBoolean();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readByte();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 std::vector<unsigned char> buf;
                 cmd.readBytes(buf);
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readChar();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readFloat();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readDouble();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readUnsignedShort();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readShort();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readInt();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readLong();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             try{
                 cmd.readString();
                 CPPUNIT_ASSERT( false );
-            } catch( exceptions::IllegalStateException& e ){}
+            } catch( decaf::lang::exceptions::IllegalStateException& e ){}
 
             // Now, verify that all the writes work properly
 

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,13 +22,13 @@
 #include <decaf/util/concurrent/Concurrent.h>
 #include <decaf/util/concurrent/Mutex.h>
 #include <decaf/lang/Thread.h>
+#include <decaf/util/Properties.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/transport/MockTransport.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConnectionData.h>
 #include <activemq/connector/stomp/StompConnector.h>
 #include <activemq/connector/openwire/OpenWireConnector.h>
-#include <decaf/util/Properties.h>
 #include <activemq/transport/MockTransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
 #include <activemq/connector/stomp/StompConsumerInfo.h>
@@ -41,6 +41,8 @@
 
 using namespace activemq;
 using namespace activemq::core;
+using namespace decaf;
+using namespace decaf::util;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQConnectionTest::test1WithStomp()
@@ -52,8 +54,8 @@
         MyCommandListener cmdListener;
         MyDispatcher msgListener;
         std::string connectionId = "testConnectionId";
-        util::Properties* properties =
-            new util::Properties();
+        decaf::util::Properties* properties =
+            new decaf::util::Properties();
         transport::Transport* transport = NULL;
 
         // Default to Stomp
@@ -190,8 +192,8 @@
         MyCommandListener cmdListener;
         MyDispatcher msgListener;
         std::string connectionId = "testConnectionId";
-        util::Properties* properties =
-            new util::Properties();
+        decaf::util::Properties* properties =
+            new decaf::util::Properties();
         transport::Transport* transport = NULL;
 
         // Default to Stomp
@@ -247,8 +249,8 @@
         MyCommandListener cmdListener;
         MyDispatcher msgListener;
         std::string connectionId = "testConnectionId";
-        util::Properties* properties =
-            new util::Properties();
+        decaf::util::Properties* properties =
+            new decaf::util::Properties();
         transport::Transport* transport = NULL;
 
         // Default to Stomp

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp Fri Nov  9 08:09:53 2007
@@ -32,7 +32,7 @@
 #include <activemq/connector/stomp/StompTopic.h>
 #include <activemq/connector/stomp/commands/TextMessageCommand.h>
 #include <decaf/net/Socket.h>
-#include <activemq/network/ServerSocket.h>
+#include <decaf/net/ServerSocket.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnectionData.h>
 #include <activemq/core/ActiveMQSession.h>
@@ -441,7 +441,7 @@
 
     injectTextMessage( "This is a Test 1" ,
                        *topic1,
-                       activemq::util::Date::getCurrentTimeMilliseconds(),
+                       decaf::util::Date::getCurrentTimeMilliseconds(),
                        50 );
 
     synchronized( &msgListener1.mutex )
@@ -456,7 +456,7 @@
 
     injectTextMessage( "This is a Test 2" ,
                        *topic2,
-                       activemq::util::Date::getCurrentTimeMilliseconds() - 100,
+                       decaf::util::Date::getCurrentTimeMilliseconds() - 100,
                        1 );
 
     synchronized( &msgListener2.mutex )



Mime
View raw message