activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593579 [1/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
Author: tabish
Date: Fri Nov  9 08:09:53 2007
New Revision: 593579

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

Modified:
    activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/FlushCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTraceMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessagePullMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/PartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ProducerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SessionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SessionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/XATransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/BrokerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/BrokerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ControlCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DataResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DestinationInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/IOTransportTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/TransportFactoryMapTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/filters/ResponseCorrelatorTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/PrimitiveMapTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h Fri Nov  9 08:09:53 2007
@@ -41,7 +41,7 @@
 		public:
 		
 		   virtual Connector* createConnector(
-		      const activemq::util::Properties& properties AMQCPP_UNUSED,
+		      const decaf::util::Properties& properties AMQCPP_UNUSED,
             activemq::transport::Transport*   transport AMQCPP_UNUSED) { return NULL; };
 		};
         

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/ConnectorFactoryMapTest.h Fri Nov  9 08:09:53 2007
@@ -104,7 +104,7 @@
 		public:
 		
 		   virtual Connector* createConnector(
-		      const activemq::util::Properties& properties AMQCPP_UNUSED,
+		      const decaf::util::Properties& properties AMQCPP_UNUSED,
             activemq::transport::Transport*   transport AMQCPP_UNUSED) { return NULL; };
 		};
 		

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp Fri Nov  9 08:09:53 2007
@@ -25,7 +25,9 @@
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::io;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp Fri Nov  9 08:09:53 2007
@@ -22,6 +22,8 @@
 #include <decaf/util/UUID.h>
 
 using namespace std;
+using namespace decaf;
+using namespace decaf::util;
 using namespace activemq;
 using namespace activemq::util;
 using namespace activemq::connector;

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -32,7 +32,8 @@
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::io;
+using namespace decaf::io;
+using namespace decaf::util;
 using namespace activemq::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
@@ -41,7 +42,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void BaseDataStreamMarshallerTest::setUp(){
-    
+
     dataStructure = new ComplexDataStructure();
     dataStructure->boolValue = true;
     dataStructure->setCachedChild( new SimpleDataStructure() );
@@ -67,7 +68,7 @@
         dataStructure = NULL;
     }
 }
-        
+
 ////////////////////////////////////////////////////////////////////////////////
 void BaseDataStreamMarshallerTest::testLooseMarshal()
 {
@@ -85,7 +86,7 @@
     complexMarshaller->looseMarshal( &openWireFormat, dataStructure, &looseOut );
 
     // Now read it back in and make sure it's all right.
-    ByteArrayInputStream bais( baos.getByteArray(), baos.getByteArraySize() );
+    ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
     DataInputStream looseIn( &bais );
 
     unsigned char dataType = looseIn.readByte();
@@ -136,7 +137,7 @@
     complexMarshaller->tightMarshal2( &openWireFormat, dataStructure, &dataOut, &bs );
 
     // Now read it back in and make sure it's all right.
-    ByteArrayInputStream bais( baos.getByteArray(), baos.getByteArraySize() );
+    ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
     DataInputStream dataIn( &bais );
 
     unsigned char dataType = dataIn.readByte();

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h Fri Nov  9 08:09:53 2007
@@ -106,8 +106,8 @@
 
             virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException )
+                                     decaf::io::DataInputStream* dataIn,
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException )
              {
                 BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
@@ -130,7 +130,7 @@
 
             virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                        commands::DataStructure* dataStructure,
-                                       utils::BooleanStream* bs ) throw( io::IOException )
+                                       utils::BooleanStream* bs ) throw( decaf::io::IOException )
             {
                 SimpleDataStructure* info =
                     dynamic_cast<SimpleDataStructure*>( dataStructure );
@@ -149,8 +149,8 @@
 
             virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                         commands::DataStructure* dataStructure,
-                                        io::DataOutputStream* dataOut,
-                                        utils::BooleanStream* bs ) throw( io::IOException )
+                                        decaf::io::DataOutputStream* dataOut,
+                                        utils::BooleanStream* bs ) throw( decaf::io::IOException )
             {
                 BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -174,7 +174,7 @@
 
             virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                          commands::DataStructure* dataStructure,
-                                         io::DataInputStream* dataIn ) throw( io::IOException )
+                                         decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException )
             {
                 BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
                 SimpleDataStructure* info =
@@ -196,7 +196,7 @@
 
             virtual void looseMarshal( OpenWireFormat* wireFormat,
                                        commands::DataStructure* dataStructure,
-                                       io::DataOutputStream* dataOut ) throw( io::IOException )
+                                       decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException )
             {
                 SimpleDataStructure* info =
                     dynamic_cast<SimpleDataStructure*>( dataStructure );
@@ -289,8 +289,8 @@
 
             virtual void tightUnmarshal( OpenWireFormat* wireFormat,
                                      commands::DataStructure* dataStructure,
-                                     io::DataInputStream* dataIn,
-                                     utils::BooleanStream* bs ) throw( io::IOException )
+                                     decaf::io::DataInputStream* dataIn,
+                                     utils::BooleanStream* bs ) throw( decaf::io::IOException )
              {
                 BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
 
@@ -304,7 +304,7 @@
 
             virtual int tightMarshal1( OpenWireFormat* wireFormat,
                                        commands::DataStructure* dataStructure,
-                                       utils::BooleanStream* bs ) throw( io::IOException )
+                                       utils::BooleanStream* bs ) throw( decaf::io::IOException )
             {
                 ComplexDataStructure* info =
                     dynamic_cast<ComplexDataStructure*>( dataStructure );
@@ -318,8 +318,8 @@
 
             virtual void tightMarshal2( OpenWireFormat* wireFormat,
                                         commands::DataStructure* dataStructure,
-                                        io::DataOutputStream* dataOut,
-                                        utils::BooleanStream* bs ) throw( io::IOException )
+                                        decaf::io::DataOutputStream* dataOut,
+                                        utils::BooleanStream* bs ) throw( decaf::io::IOException )
             {
                 BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
 
@@ -333,7 +333,7 @@
 
             virtual void looseUnmarshal( OpenWireFormat* wireFormat,
                                          commands::DataStructure* dataStructure,
-                                         io::DataInputStream* dataIn ) throw( io::IOException )
+                                         decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException )
             {
                 BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
                 ComplexDataStructure* info =
@@ -346,7 +346,7 @@
 
             virtual void looseMarshal( OpenWireFormat* wireFormat,
                                        commands::DataStructure* dataStructure,
-                                       io::DataOutputStream* dataOut ) throw( io::IOException )
+                                       decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException )
             {
                 ComplexDataStructure* info =
                     dynamic_cast<ComplexDataStructure*>( dataStructure );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -25,8 +25,8 @@
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::io;
-using namespace activemq::exceptions;
+using namespace decaf::io;
+using namespace decaf::lang::exceptions;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::marshal;
@@ -45,7 +45,7 @@
     float floatValue = 45.6545f;
     double doubleValue = 654564.654654;
     std::string stringValue = "The test string";
-    
+
     myMap.setString( "stringKey", stringValue );
     myMap.setBool( "boolKey", booleanValue );
     myMap.setByte( "byteKey", byteValue );
@@ -55,7 +55,7 @@
     myMap.setLong( "longKey", longValue );
     myMap.setFloat( "floatKey", floatValue );
     myMap.setDouble( "doubleKey", doubleValue );
-    
+
     std::vector<unsigned char> bytes;
     bytes.push_back( 65 );
     bytes.push_back( 66 );
@@ -63,15 +63,15 @@
     bytes.push_back( 68 );
     bytes.push_back( 69 );
     myMap.setByteArray( "bytesKey", bytes );
-    
+
     std::vector<unsigned char> marshaled;
-    
+
     // Turn it into some bytes
     PrimitiveMapMarshaller::marshal( &myMap, marshaled );
-    
+
     // Try and get it back from those bytes.
     PrimitiveMap* newMap = NULL;
-    
+
     try {
         newMap = PrimitiveMapMarshaller::unmarshal( marshaled );
     } catch(...) {
@@ -79,7 +79,7 @@
     }
 
     CPPUNIT_ASSERT( newMap != NULL );
-    
+
     CPPUNIT_ASSERT( myMap.getString( "stringKey" ) == stringValue );
     CPPUNIT_ASSERT( myMap.getBool( "boolKey" ) == booleanValue );
     CPPUNIT_ASSERT( myMap.getByte( "byteKey" ) == byteValue );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQBytesMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQMapMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQObjectMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQObjectMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQQueueMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQQueueMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQStreamMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQStreamMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQTempQueueMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTempQueueMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQTempTopicMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTempTopicMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQTextMessageMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ActiveMQTopicMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ActiveMQTopicMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::BrokerIdMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void BrokerIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::BrokerInfoMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void BrokerInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConnectionControlMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConnectionControlMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConnectionErrorMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConnectionErrorMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConnectionIdMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConnectionIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConnectionInfoMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConnectionInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConsumerControlMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConsumerControlMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConsumerIdMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConsumerIdMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ConsumerInfoMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ConsumerInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::ControlCommandMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void ControlCommandMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::DataArrayResponseMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void DataArrayResponseMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::DataResponseMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void DataResponseMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::DestinationInfoMarshallerTest );
 
-#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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void DestinationInfoMarshallerTest::test() {

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/ExceptionResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/FlushCommandMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/FlushCommandMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/FlushCommandMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/FlushCommandMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/IntegerResponseMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/JournalQueueAckMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/JournalTopicAckMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/JournalTraceMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTraceMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTraceMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTraceMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+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/v1/JournalTransactionMarshallerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp?rev=593579&r1=593578&r2=593579&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp Fri Nov  9 08:09:53 2007
@@ -22,12 +22,12 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::marshal::v1::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::v1;
+using namespace decaf::io;
+using namespace decaf::lang;
+using namespace decaf::util;
 
 ///////////////////////////////////////////////////////////////////////////////
 void JournalTransactionMarshallerTest::test() {



Mime
View raw message