activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593309 [5/8] - in /activemq/activemq-cpp/trunk/src: examples/ examples/consumers/ examples/producers/ main/ main/activemq/concurrent/ main/activemq/connector/ main/activemq/connector/openwire/ main/activemq/connector/openwire/marshal/ main...
Date Thu, 08 Nov 2007 21:02:22 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.cpp Thu Nov  8 13:02:02 2007
@@ -17,7 +17,7 @@
 
 #include "TcpTransport.h"
 
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/IOTransport.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
@@ -27,11 +27,13 @@
 using namespace activemq::io;
 using namespace activemq::transport;
 using namespace activemq::transport::filters;
-using namespace activemq::network;
 using namespace activemq::exceptions;
+using namespace decaf::net;
+using namespace decaf::io;
+using namespace decaf::lang;
 
 ////////////////////////////////////////////////////////////////////////////////
-TcpTransport::TcpTransport( const activemq::util::Properties& properties,
+TcpTransport::TcpTransport( const decaf::util::Properties& properties,
                             Transport* next,
                             const bool own )
 :

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.h Thu Nov  8 13:02:02 2007
@@ -19,12 +19,12 @@
 #define _ACTIVEMQ_TRANSPORT_FILTERS_TCPTRANSPORT_H_
 
 #include <activemq/transport/TransportFilter.h>
-#include <activemq/network/Socket.h>
-#include <activemq/util/Properties.h>
+#include <decaf/net/Socket.h>
+#include <decaf/util/Properties.h>
 #include <activemq/io/LoggingInputStream.h>
 #include <activemq/io/LoggingOutputStream.h>
-#include <activemq/io/BufferedInputStream.h>
-#include <activemq/io/BufferedOutputStream.h>
+#include <decaf/io/BufferedInputStream.h>
+#include <decaf/io/BufferedOutputStream.h>
 
 namespace activemq{
 namespace transport{
@@ -43,13 +43,13 @@
         /**
          * Socket that this Transport Communicates with
          */
-        network::Socket* socket;
+        decaf::net::Socket* socket;
 
         io::LoggingInputStream* loggingInputStream;
         io::LoggingOutputStream* loggingOutputStream;
 
-        io::BufferedInputStream* bufferedInputStream;
-        io::BufferedOutputStream* bufferedOutputStream;
+        decaf::io::BufferedInputStream* bufferedInputStream;
+        decaf::io::BufferedOutputStream* bufferedOutputStream;
 
     public:
 
@@ -59,7 +59,7 @@
          * @param next the next transport in the chain
          * @param own indicates if this transport owns the next.
          */
-        TcpTransport( const activemq::util::Properties& properties,
+        TcpTransport( const decaf::util::Properties& properties,
                       Transport* next,
                       const bool own = true );
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.cpp Thu Nov  8 13:02:02 2007
@@ -36,7 +36,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 Transport* TcpTransportFactory::createTransport(
-    const activemq::util::Properties& properties,
+    const decaf::util::Properties& properties,
     Transport* next,
     bool own ) throw ( ActiveMQException ) {
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.h Thu Nov  8 13:02:02 2007
@@ -44,7 +44,7 @@
          * @throws ActiveMQException if an error occurs.
          */
         virtual Transport* createTransport(
-            const activemq::util::Properties& properties,
+            const decaf::util::Properties& properties,
             Transport* next,
             bool own ) throw ( exceptions::ActiveMQException );
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h Thu Nov  8 13:02:02 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #ifndef _ACTIVEMQ_UTIL_ACTIVEMQPROPERTIES_H_
 #define _ACTIVEMQ_UTIL_ACTIVEMQPROPERTIES_H_
 
@@ -22,7 +22,7 @@
 #include <string>
 #include <sstream>
 #include <cms/CMSProperties.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 
 namespace activemq{
 namespace util{
@@ -34,24 +34,24 @@
     class ActiveMQProperties : public cms::CMSProperties {
     private:
 
-        Properties properties;
+        decaf::util::Properties properties;
 
     public:
 
         virtual ~ActiveMQProperties(){}
 
-        virtual Properties& getProperties() {
+        virtual decaf::util::Properties& getProperties() {
             return properties;
         }
-        
-        virtual const Properties& getProperties() const {
+
+        virtual const decaf::util::Properties& getProperties() const {
             return properties;
         }
-        
-        virtual void setProperties( Properties& props ) {
+
+        virtual void setProperties( decaf::util::Properties& props ) {
             properties.copy( &props );
         }
-        
+
         /**
          * Returns true if the properties object is empty
          * @return true if empty
@@ -127,12 +127,12 @@
          * @param source The source properties object.
          */
         virtual void copy( const CMSProperties* source ){
-            
+
             properties.clear();
 
             std::vector< std::pair< std::string, std::string > > vec =
                 source->toArray();
-                
+
             for( unsigned int ix=0; ix<vec.size(); ++ix ){
                 properties.setProperty(vec[ix].first, vec[ix].second );
             }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.cpp Thu Nov  8 13:02:02 2007
@@ -16,11 +16,11 @@
  */
 
 #include "LongSequenceGenerator.h"
-#include <activemq/concurrent/Concurrent.h>
+#include <decaf/util/concurrent/Concurrent.h>
 
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 ////////////////////////////////////////////////////////////////////////////////
 LongSequenceGenerator::LongSequenceGenerator() {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.h Thu Nov  8 13:02:02 2007
@@ -19,7 +19,7 @@
 #define _ACTIVEMQ_UTIL_LONGSEQUENCEGENERATOR_H_
 
 #include <activemq/util/Config.h>
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
 
 namespace activemq{
 namespace util{
@@ -33,7 +33,7 @@
     private:
 
         long long lastSequenceId;
-        activemq::concurrent::Mutex mutex;
+        decaf::util::concurrent::Mutex mutex;
 
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.cpp Thu Nov  8 13:02:02 2007
@@ -19,8 +19,10 @@
 
 #include <sstream>
 
+using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::exceptions;
+using namespace decaf::lang::exceptions;
+using namespace decaf::util;
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -239,7 +241,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 std::vector<unsigned char> PrimitiveMap::getByteArray( const std::string& key ) const
-    throw( activemq::exceptions::NoSuchElementException ) {
+    throw( decaf::lang::exceptions::NoSuchElementException ) {
 
     ValueNode node = valueNodeMap.getValue( key );
     return node.getByteArray();
@@ -274,7 +276,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 PrimitiveMap::ValueNode PrimitiveMap::getValue( const std::string& key ) const
-    throw ( activemq::exceptions::NoSuchElementException ) {
+    throw ( decaf::lang::exceptions::NoSuchElementException ) {
 
     return valueNodeMap.getValue( key );
 }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.h Thu Nov  8 13:02:02 2007
@@ -19,7 +19,9 @@
 #define ACTIVEMQ_UTIL_PRIMITIVEMAP_H_
 
 #include <string>
-#include <activemq/util/Map.h>
+#include <vector>
+#include <decaf/util/Map.h>
+#include <decaf/lang/exceptions/NoSuchElementException.h>
 
 namespace activemq{
 namespace util{
@@ -27,8 +29,7 @@
     /**
      * Map of named primitives.
      */
-    class PrimitiveMap
-    {
+    class PrimitiveMap {
     public:
 
         /**
@@ -175,9 +176,9 @@
                 value.boolValue = lvalue;
             }
 
-            bool getBool() const throw(activemq::exceptions::NoSuchElementException){
+            bool getBool() const throw( decaf::lang::exceptions::NoSuchElementException ){
                 if( valueType != BOOLEAN_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not BOOLEAN_TYPE" );
                 }
 
@@ -190,9 +191,9 @@
                 value.byteValue = lvalue;
             }
 
-            unsigned char getByte() const throw(activemq::exceptions::NoSuchElementException){
+            unsigned char getByte() const throw( decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != BYTE_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not BYTE_TYPE" );
                 }
 
@@ -205,9 +206,9 @@
                 value.charValue = lvalue;
             }
 
-            char getChar() const throw(activemq::exceptions::NoSuchElementException){
+            char getChar() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != CHAR_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not CHAR_TYPE" );
                 }
 
@@ -220,9 +221,9 @@
                 value.shortValue = lvalue;
             }
 
-            short getShort() const throw(activemq::exceptions::NoSuchElementException){
+            short getShort() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != SHORT_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not SHORT_TYPE" );
                 }
 
@@ -235,9 +236,9 @@
                 value.intValue = lvalue;
             }
 
-            int getInt() const throw(activemq::exceptions::NoSuchElementException){
+            int getInt() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != INTEGER_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not INTEGER_TYPE" );
                 }
 
@@ -250,9 +251,9 @@
                 value.longValue = lvalue;
             }
 
-            long long getLong() const throw(activemq::exceptions::NoSuchElementException){
+            long long getLong() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != LONG_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not LONG_TYPE" );
                 }
 
@@ -265,9 +266,9 @@
                 value.doubleValue = lvalue;
             }
 
-            double getDouble() const throw(activemq::exceptions::NoSuchElementException){
+            double getDouble() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != DOUBLE_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not DOUBLE_TYPE" );
                 }
 
@@ -280,9 +281,9 @@
                 value.floatValue = lvalue;
             }
 
-            float getFloat() const throw(activemq::exceptions::NoSuchElementException){
+            float getFloat() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != FLOAT_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not FLOAT_TYPE" );
                 }
 
@@ -295,9 +296,9 @@
                 value.stringValue = new std::string( lvalue );
             }
 
-            std::string getString() const throw(activemq::exceptions::NoSuchElementException){
+            std::string getString() const throw(decaf::lang::exceptions::NoSuchElementException){
                 if( valueType != STRING_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    throw decaf::lang::exceptions::NoSuchElementException( __FILE__,
                         __LINE__, "Value is not STRING_TYPE" );
                 }
 
@@ -314,10 +315,10 @@
                 value.byteArrayValue = new std::vector<unsigned char>( lvalue );
             }
 
-            std::vector<unsigned char> getByteArray() const throw( activemq::exceptions::NoSuchElementException ) {
+            std::vector<unsigned char> getByteArray() const throw( decaf::lang::exceptions::NoSuchElementException ) {
 
                 if( valueType != BYTE_ARRAY_TYPE ){
-                    throw activemq::exceptions::NoSuchElementException(
+                    throw decaf::lang::exceptions::NoSuchElementException(
                         __FILE__,
                         __LINE__,
                         "Value is not BYTE_ARRAY_TYPE" );
@@ -367,7 +368,7 @@
 
     private:
 
-        activemq::util::Map<std::string, ValueNode> valueNodeMap;
+        decaf::util::Map<std::string, ValueNode> valueNodeMap;
 
     public:
 
@@ -425,43 +426,43 @@
         virtual bool isEmpty() const;
 
         virtual bool getBool( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setBool( const std::string& key, bool value );
 
         virtual unsigned char getByte( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setByte( const std::string& key, unsigned char value );
 
         virtual char getChar( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setChar( const std::string& key, char value );
 
         virtual short getShort( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setShort( const std::string& key, short value );
 
         virtual int getInt( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setInt( const std::string& key, int value );
 
         virtual long long getLong( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setLong( const std::string& key, long long value );
 
         virtual double getDouble( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setDouble( const std::string& key, double value );
 
         virtual float getFloat( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setFloat( const std::string& key, float value );
 
         virtual std::string getString( const std::string& key ) const
-            throw(activemq::exceptions::NoSuchElementException);
+            throw(decaf::lang::exceptions::NoSuchElementException);
         virtual void setString( const std::string& key, const std::string& value );
 
         virtual std::vector<unsigned char> getByteArray( const std::string& key ) const
-            throw( activemq::exceptions::NoSuchElementException );
+            throw( decaf::lang::exceptions::NoSuchElementException );
         virtual void setByteArray( const std::string& key, const std::vector<unsigned char>& value );
 
         /**
@@ -488,7 +489,7 @@
          * @throws NoSuchElementException
          */
         ValueNode getValue( const std::string& key ) const
-            throw( activemq::exceptions::NoSuchElementException );
+            throw( decaf::lang::exceptions::NoSuchElementException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp Thu Nov  8 13:02:02 2007
@@ -16,21 +16,24 @@
  */
 
 #include "URISupport.h"
-#include "StringTokenizer.h"
 
-#include <activemq/exceptions/IllegalArgumentException.h>
+#include <activemq/exceptions/ExceptionDefines.h>
+
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/exceptions/IllegalArgumentException.h>
 
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::exceptions;
+using namespace decaf::util;
+using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 Properties URISupport::parseQuery( std::string query )
     throw ( IllegalArgumentException )
 {
     try {
-        
-        Properties options;        
+
+        Properties options;
         URISupport::parseQuery( query, &options );
         return options;
     }
@@ -41,11 +44,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void URISupport::parseQuery( std::string query,
-                             util::Properties* properties )
-    throw ( exceptions::IllegalArgumentException ) {
+                             Properties* properties )
+    throw ( IllegalArgumentException ) {
 
     try {
-        
+
         if( properties == NULL ) {
             throw IllegalArgumentException(
                 __FILE__,
@@ -58,38 +61,38 @@
         if( pos != std::string::npos ) {
             query = query.substr(pos+1);
         }
-        
+
         // split the query into parameters
         StringTokenizer tokenizer( query, "&" );
         std::vector<std::string> options;
         tokenizer.toArray( options );
-    
+
         std::vector<std::string>::const_iterator iter = options.begin();
-        
+
         for( ; iter != options.end(); ++iter ) {
-    
+
             tokenizer.reset( *iter, "=" );
-            
+
             std::string key = "";
             std::string value = "";
-    
+
             if( tokenizer.countTokens() != 2 ) {
                 throw IllegalArgumentException(
                     __FILE__,
                     __LINE__,
                     "URISupport::parseQuery - Invalid URI Option." );
             }
-            
+
             // Get the Key
             if( tokenizer.hasMoreTokens() != false ) {
                 key = tokenizer.nextToken();
             }
-    
+
             // Get the Value
             if( tokenizer.hasMoreTokens() != false ) {
                 value = tokenizer.nextToken();
             }
-            
+
             // Store them.
             properties->setProperty( key, value );
         }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h Thu Nov  8 13:02:02 2007
@@ -18,8 +18,8 @@
 #ifndef _ACTIVEMQ_UTIL_URISUPPORT_H_
 #define _ACTIVEMQ_UTIL_URISUPPORT_H_
 
-#include <activemq/util/Properties.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
+#include <decaf/util/Properties.h>
+#include <decaf/lang/exceptions/IllegalArgumentException.h>
 
 namespace activemq{
 namespace util{
@@ -27,9 +27,9 @@
     class URISupport
     {
     public:
-    
+
         virtual ~URISupport();
-        
+
         /**
          * Parse the Query portion of a URI String and return a Simple
          * Properties object containing the parameter names as keys, and
@@ -37,9 +37,9 @@
          * @param query. the query string to parse.
          * @returns Properties object with the parsed output.
          */
-        static Properties parseQuery( std::string query )
-            throw ( exceptions::IllegalArgumentException );
-         
+        static decaf::util::Properties parseQuery( std::string query )
+            throw ( decaf::lang::exceptions::IllegalArgumentException );
+
         /**
          * Parse the Query portion of a URI String and return a Simple
          * Properties object containing the parameter names as keys, and
@@ -48,8 +48,8 @@
          * @param properties - object pointer to get the parsed output.
          */
         static void parseQuery( std::string query,
-                                util::Properties* properties )
-            throw ( exceptions::IllegalArgumentException );
+                                decaf::util::Properties* properties )
+            throw ( decaf::lang::exceptions::IllegalArgumentException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormat.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormat.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormat.h Thu Nov  8 13:02:02 2007
@@ -18,9 +18,9 @@
 #ifndef _ACTIVEMQ_WIREFORMAT_WIREFORMAT_H_
 #define _ACTIVEMQ_WIREFORMAT_WIREFORMAT_H_
 
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
 
 #include <activemq/transport/Command.h>
 
@@ -33,41 +33,41 @@
      *
      * @version $Revision: 1.1 $
      */
-    class WireFormat
-    {
+    class WireFormat {
     public:
 
         virtual ~WireFormat() {}
-    
+
         /**
          * Stream based marshaling
          * @param command - The Command to Marshal
          * @param out - the output stream to write the command to.
-         * @throws IOException 
+         * @throws IOException
          */
-        virtual void marshal( transport::Command* command, io::DataOutputStream* out ) 
-            throw ( io::IOException ) = 0;
+        virtual void marshal( transport::Command* command, decaf::io::DataOutputStream* out )
+            throw ( decaf::io::IOException ) = 0;
 
         /**
-         * Packet based un-marshaling 
+         * Packet based un-marshaling
          * @param in - the input stream to read the command from.
          * @returns the newly marshaled Command, caller owns the pointer
-         * @throws IOException 
+         * @throws IOException
          */
-        virtual transport::Command* unmarshal( io::DataInputStream* in ) throw ( io::IOException ) = 0;
-        
+        virtual transport::Command* unmarshal( decaf::io::DataInputStream* in )
+            throw ( decaf::io::IOException ) = 0;
+
         /**
          * Set the Version
          * @param the version of the wire format
          */
         virtual void setVersion( int version ) = 0;
-        
+
         /**
          * Get the Version
          * @return the version of the wire format
          */
         virtual int getVersion() const = 0;
-    
+
     };
 
 }}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormatFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormatFactory.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormatFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormatFactory.h Thu Nov  8 13:02:02 2007
@@ -19,17 +19,17 @@
 #define _ACTIVEMQ_WIREFORMAT_WIREFORMATFACTORY_H_
 
 #include <activemq/wireformat/WireFormat.h>
-#include <activemq/util/Properties.h>
-#include <activemq/exceptions/IllegalStateException.h>
+#include <decaf/util/Properties.h>
+#include <decaf/lang/exceptions/IllegalStateException.h>
 
 namespace activemq{
 namespace wireformat{
 
     /**
      * The WireFormatFactory is the interface that all WireFormatFactory
-     * classes must extend.  The Factory creates a WireFormat Object based on 
-     * the properties that are set in the passed <code>Properties</code> 
-     * object.  
+     * classes must extend.  The Factory creates a WireFormat Object based on
+     * the properties that are set in the passed <code>Properties</code>
+     * object.
      */
     class WireFormatFactory
     {
@@ -37,13 +37,13 @@
 
         virtual ~WireFormatFactory() {}
 
-        /**    
+        /**
          * Creates a new WireFormat Object passing it a set of
          * properties from which it can obtain any optional settings
          * @param properties - the Properties for this WireFormat
          */
-        virtual WireFormat* createWireFormat( const util::Properties& properties ) 
-            throw ( exceptions::IllegalStateException ) = 0; 
+        virtual WireFormat* createWireFormat( const decaf::util::Properties& properties )
+            throw ( decaf::lang::exceptions::IllegalStateException ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PrimitiveMapBenchmark.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PrimitiveMapBenchmark.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PrimitiveMapBenchmark.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PrimitiveMapBenchmark.cpp Thu Nov  8 13:02:02 2007
@@ -18,7 +18,7 @@
 #include "PrimitiveMapBenchmark.h"
 
 #include <string>
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 
 using namespace std;
 using namespace activemq;

Modified: activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/BenchmarkBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/BenchmarkBase.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/BenchmarkBase.h (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/BenchmarkBase.h Thu Nov  8 13:02:02 2007
@@ -20,14 +20,14 @@
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <activemq/concurrent/Runnable.h>
+#include <decaf/lang/Runnable.h>
 #include <benchmark/PerformanceTimer.h>
 #include <string>
 
 namespace benchmark{
 
     template < class NAME, class TARGET, int ITERATIONS = 100 >
-    class BenchmarkBase : public activemq::concurrent::Runnable,
+    class BenchmarkBase : public decaf::lang::Runnable,
                           public CppUnit::TestFixture
     {
         CPPUNIT_TEST_SUITE( NAME );

Modified: activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/PerformanceTimer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/PerformanceTimer.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/PerformanceTimer.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/PerformanceTimer.cpp Thu Nov  8 13:02:02 2007
@@ -17,7 +17,7 @@
 
 #include "PerformanceTimer.h"
 
-#include <activemq/util/Date.h>
+#include <decaf/util/Date.h>
 
 using namespace std;
 using namespace benchmark;

Modified: activemq/activemq-cpp/trunk/src/test-benchmarks/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-benchmarks/testRegistry.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-benchmarks/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-benchmarks/testRegistry.cpp Thu Nov  8 13:02:02 2007
@@ -25,10 +25,3 @@
 #include <activemq/io/DataOutputStreamBenchmark.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveMapBenchmark );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PropertiesBenchmark );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::QueueBenchmark );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::SetBenchmark );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::MapBenchmark );
-
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::io::DataInputStreamBenchmark );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::io::DataOutputStreamBenchmark );

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp Thu Nov  8 13:02:02 2007
@@ -23,8 +23,8 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/concurrent/Thread.h>
-#include <activemq/util/Guid.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/util/UUID.h>
 
 #include <cms/Connection.h>
 #include <cms/Session.h>
@@ -37,7 +37,7 @@
 using namespace activemq::core;
 using namespace activemq::util;
 using namespace activemq::exceptions;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.h Thu Nov  8 13:02:02 2007
@@ -18,7 +18,7 @@
 #ifndef _INTEGRATION_TESTSUPPORT_H_
 #define _INTEGRATION_TESTSUPPORT_H_
 
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
 
 #include <cms/ConnectionFactory.h>
 #include <cms/Connection.h>
@@ -40,7 +40,7 @@
         virtual void initialize();
         virtual void close();
 
-        virtual activemq::concurrent::Mutex& getMutex() {
+        virtual decaf::util::concurrent::Mutex& getMutex() {
             return mutex;
         }
 
@@ -92,7 +92,7 @@
         cms::Session* session;
 
         unsigned int numReceived;
-        activemq::concurrent::Mutex mutex;
+        decaf::util::concurrent::Mutex mutex;
         cms::Session::AcknowledgeMode ackMode;
 
     };

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,24 +19,24 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -65,9 +65,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::openwire;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,23 +19,23 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::openwire;
@@ -98,7 +98,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer =
             session->createDurableConsumer( topic, subName, "" );
         consumer->setMessageListener( &testSupport );

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp Thu Nov  8 13:02:02 2007
@@ -22,23 +22,23 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -68,9 +68,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace std;
 using namespace integration;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.h Thu Nov  8 13:02:02 2007
@@ -28,7 +28,7 @@
 #include <cms/Session.h>
 #include <cms/MessageProducer.h>
 
-#include <activemq/concurrent/Runnable.h>
+#include <decaf/lang/Runnable.h>
 
 namespace integration{
 namespace connector{
@@ -55,7 +55,7 @@
         
     public:
     
-        class Producer : public activemq::concurrent::Runnable {
+        class Producer : public decaf::lang::Runnable {
         private:
         
             cms::Connection* connection;
@@ -84,7 +84,7 @@
             void cleanup();
         };
 
-        class Consumer : public cms::MessageListener, public activemq::concurrent::Runnable {
+        class Consumer : public cms::MessageListener, public decaf::lang::Runnable {
         
         private:
         

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp Thu Nov  8 13:02:02 2007
@@ -23,23 +23,23 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 #include <activemq/util/Config.h>
 
 #include <cms/Connection.h>
@@ -70,9 +70,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace std;
 using namespace integration;
@@ -126,7 +126,7 @@
     try
     {
         // Create CMS Object for Comms
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer =
             session->createConsumer( topic );
         consumer->setMessageListener( this );

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.h Thu Nov  8 13:02:02 2007
@@ -21,7 +21,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
 
 #include <cms/MessageListener.h>
 #include <cms/ExceptionListener.h>
@@ -60,7 +60,7 @@
 
         unsigned int numReceived;
         unsigned int msgCount;
-        activemq::concurrent::Mutex mutex;
+        decaf::util::concurrent::Mutex mutex;
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp Thu Nov  8 13:02:02 2007
@@ -18,24 +18,24 @@
 #include "OpenwireSimpleTest.h"
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::openwire;
@@ -203,7 +203,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer =  session->createConsumer( topic );
         consumer->setMessageListener( &testSupport );
         cms::MessageProducer* producer = session->createProducer( NULL );
@@ -252,7 +252,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer = session->createConsumer( topic );
         cms::MessageProducer* producer = session->createProducer( topic );
 
@@ -306,7 +306,7 @@
         cms::Session* session1 = connection1->createSession();
         cms::Session* session2 = connection2->createSession();
 
-        cms::Topic* topic = session1->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session1->createTopic(UUID::randomUUID().toString());
 
 
         cms::MessageConsumer* consumer1 = session1->createConsumer( topic );
@@ -373,7 +373,7 @@
         cms::Session* session1 = connection->createSession();
         cms::Session* session2 = connection->createSession();
 
-        cms::Topic* topic = session1->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session1->createTopic(UUID::randomUUID().toString());
 
         cms::MessageConsumer* consumer1 = session1->createConsumer( topic );
         cms::MessageConsumer* consumer2 = session2->createConsumer( topic );
@@ -435,7 +435,7 @@
 
         cms::Session* session = connection->createSession();
 
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
 
         cms::MessageConsumer* consumer = session->createConsumer( topic );
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp Thu Nov  8 13:02:02 2007
@@ -18,25 +18,25 @@
 #include "OpenwireSlowListenerTest.h"
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
-#include <activemq/util/Date.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
+#include <decaf/util/Date.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -65,9 +65,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::openwire;
@@ -103,7 +103,7 @@
                 IntegrationCommon::getInstance().getOpenwireURL() );
         cms::Connection* connection = connectionFactory->createConnection();
         cms::Session* session = connection->createSession( cms::Session::AUTO_ACKNOWLEDGE );
-        cms::Destination* destination = session->createTopic(Guid::createGUIDString());
+        cms::Destination* destination = session->createTopic(UUID::randomUUID().toString());
         cms::MessageProducer* producer = session->createProducer( destination );
 
         const unsigned int numConsumers = 5;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,24 +19,24 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/util/concurrent/Mutex.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector;
@@ -100,7 +100,7 @@
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
 
-        cms::Destination* requestTopic = session->createTopic( Guid::createGUIDString() );
+        cms::Destination* requestTopic = session->createTopic( UUID::randomUUID().toString() );
         cms::Destination* responseTopic = session->createTemporaryTopic();
 
         Consumer* requestConsumer = new Consumer( testSupport.getConnection(),

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.h Thu Nov  8 13:02:02 2007
@@ -18,7 +18,7 @@
 #ifndef _INTEGRATION_CONNECTOR_OPENWIRE_OPENWIRETEMPDESTINATIONTEST_H_
 #define _INTEGRATION_CONNECTOR_OPENWIRE_OPENWIRETEMPDESTINATIONTEST_H_
 
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -49,7 +49,7 @@
     protected:
 
         class Consumer : public cms::MessageListener,
-                         public activemq::concurrent::Runnable {
+                         public decaf::lang::Runnable {
 
         private:
 
@@ -58,8 +58,8 @@
             cms::Destination* destination;
             cms::MessageConsumer* consumer;
             unsigned int numReceived;
-            activemq::concurrent::Mutex mutex;
-            activemq::concurrent::Mutex onMsgMutex;
+            decaf::util::concurrent::Mutex mutex;
+            decaf::util::concurrent::Mutex onMsgMutex;
 
         public:
 
@@ -69,7 +69,7 @@
 
             virtual ~Consumer();
 
-            virtual activemq::concurrent::Mutex& getOnMsgMutex() {
+            virtual decaf::util::concurrent::Mutex& getOnMsgMutex() {
                 return this->onMsgMutex;
             }
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp Thu Nov  8 13:02:02 2007
@@ -18,23 +18,23 @@
 #include "OpenwireTransactionTest.h"
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -63,9 +63,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::openwire;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,23 +19,23 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::stomp;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,23 +19,23 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::stomp;
@@ -98,7 +98,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer =
             session->createDurableConsumer( topic, subName, "" );
         consumer->setMessageListener( &testSupport );

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp Thu Nov  8 13:02:02 2007
@@ -22,23 +22,23 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -68,9 +68,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace std;
 using namespace integration;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.h Thu Nov  8 13:02:02 2007
@@ -28,7 +28,7 @@
 #include <cms/Session.h>
 #include <cms/MessageProducer.h>
 
-#include <activemq/concurrent/Runnable.h>
+#include <decaf/lang/Runnable.h>
 
 namespace integration{
 namespace connector{
@@ -51,7 +51,7 @@
         
     public:
     
-        class Producer : public activemq::concurrent::Runnable {
+        class Producer : public decaf::lang::Runnable {
         private:
         
             cms::Connection* connection;
@@ -80,7 +80,7 @@
             void cleanup();
         };
 
-        class Consumer : public cms::MessageListener, public activemq::concurrent::Runnable {
+        class Consumer : public cms::MessageListener, public decaf::lang::Runnable {
         
         private:
         

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp Thu Nov  8 13:02:02 2007
@@ -23,23 +23,23 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 #include <activemq/util/Config.h>
 
 #include <cms/Connection.h>
@@ -70,9 +70,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace std;
 using namespace integration;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.h Thu Nov  8 13:02:02 2007
@@ -21,7 +21,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/concurrent/Mutex.h>
+#include <decaf/util/concurrent/Mutex.h>
 
 #include <cms/MessageListener.h>
 #include <cms/ExceptionListener.h>
@@ -60,7 +60,7 @@
 
         unsigned int numReceived;
         unsigned int msgCount;
-        activemq::concurrent::Mutex mutex;
+        decaf::util::concurrent::Mutex mutex;
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp Thu Nov  8 13:02:02 2007
@@ -18,24 +18,24 @@
 #include "SimpleTest.h"
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -64,9 +64,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::stomp;
@@ -203,7 +203,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer =  session->createConsumer( topic );
         consumer->setMessageListener( &testSupport );
         cms::MessageProducer* producer = session->createProducer( NULL );
@@ -252,7 +252,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer = session->createConsumer( topic );
         cms::MessageProducer* producer = session->createProducer( topic );
 
@@ -295,7 +295,7 @@
 
         // Create CMS Object for Comms
         cms::Session* session = testSupport.getSession();
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
         cms::MessageConsumer* consumer = session->createConsumer( topic );
         cms::MessageProducer* producer = session->createProducer( topic );
 
@@ -350,7 +350,7 @@
         cms::Session* session1 = connection1->createSession();
         cms::Session* session2 = connection2->createSession();
 
-        cms::Topic* topic = session1->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session1->createTopic(UUID::randomUUID().toString());
 
 
         cms::MessageConsumer* consumer1 = session1->createConsumer( topic );
@@ -416,7 +416,7 @@
         cms::Session* session1 = connection->createSession();
         cms::Session* session2 = connection->createSession();
 
-        cms::Topic* topic = session1->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session1->createTopic(UUID::randomUUID().toString());
 
         cms::MessageConsumer* consumer1 = session1->createConsumer( topic );
         cms::MessageConsumer* consumer2 = session2->createConsumer( topic );
@@ -478,7 +478,7 @@
 
         cms::Session* session = connection->createSession();
 
-        cms::Topic* topic = session->createTopic(Guid::createGUIDString());
+        cms::Topic* topic = session->createTopic(UUID::randomUUID().toString());
 
         cms::MessageConsumer* consumer = session->createConsumer( topic );
 

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp Thu Nov  8 13:02:02 2007
@@ -19,24 +19,24 @@
 
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -65,9 +65,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::stomp;

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp Thu Nov  8 13:02:02 2007
@@ -18,23 +18,23 @@
 #include "TransactionTest.h"
 #include <integration/IntegrationCommon.h>
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Properties.h>
-#include <activemq/util/StringTokenizer.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <activemq/network/SocketFactory.h>
+#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <activemq/network/Socket.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/StringTokenizer.h>
-#include <activemq/util/Boolean.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/lang/Boolean.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -63,9 +63,9 @@
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::exceptions;
-using namespace activemq::network;
+using namespace decaf::net;
 using namespace activemq::transport;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 
 using namespace integration;
 using namespace integration::connector::stomp;

Modified: activemq/activemq-cpp/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/Makefile.am?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Thu Nov  8 13:02:02 2007
@@ -16,10 +16,6 @@
 # ---------------------------------------------------------------------------
 
 cc_sources = \
-  activemq/concurrent/MutexTest.cpp \
-  activemq/concurrent/ThreadPoolTest.cpp \
-  activemq/concurrent/ThreadTest.cpp \
-  activemq/concurrent/CountDownLatchTest.cpp \
   activemq/connector/ConnectorFactoryMapRegistrarTest.cpp \
   activemq/connector/ConnectorFactoryMapTest.cpp \
   activemq/connector/stomp/commands/AbortCommandTest.cpp \
@@ -65,33 +61,13 @@
   activemq/core/ActiveMQConnectionTest.cpp \
   activemq/core/ActiveMQSessionTest.cpp \
   activemq/exceptions/ActiveMQExceptionTest.cpp \
-  activemq/io/BufferedInputStreamTest.cpp \
-  activemq/io/BufferedOutputStreamTest.cpp \
-  activemq/io/ByteArrayInputStreamTest.cpp \
-  activemq/io/ByteArrayOutputStreamTest.cpp \
-  activemq/io/DataInputStreamTest.cpp \
-  activemq/io/DataOutputStreamTest.cpp \
-  activemq/logger/LoggerTest.cpp \
-  activemq/network/SocketFactoryTest.cpp \
-  activemq/network/SocketTest.cpp \
   activemq/transport/IOTransportTest.cpp \
   activemq/transport/filters/ResponseCorrelatorTest.cpp \
   activemq/transport/TransportFactoryMapRegistrarTest.cpp \
   activemq/transport/TransportFactoryMapTest.cpp \
-  activemq/util/BooleanTest.cpp \
-  activemq/util/DateTest.cpp \
-  activemq/util/Endian.cpp \
-  activemq/util/GuidTest.cpp \
-  activemq/util/IntegerTest.cpp \
-  activemq/util/LongTest.cpp \
-  activemq/util/MapTest.cpp \
-  activemq/util/SetTest.cpp \
   activemq/util/PrimitiveMapTest.cpp \
-  activemq/util/QueueTest.cpp \
-  activemq/util/StringTokenizerTest.cpp \
   activemq/util/URISupportTest.cpp \
   activemq/util/LongSequenceGeneratorTest.cpp \
-  activemq/util/RandomTest.cpp \
   main.cpp
 
 h_sources = 

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=593309&r1=593308&r2=593309&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 Thu Nov  8 13:02:02 2007
@@ -19,7 +19,7 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::OpenWireFormatTest );
 
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp Thu Nov  8 13:02:02 2007
@@ -19,7 +19,7 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::commands::ActiveMQBytesMessageTest );
 
-#include <activemq/util/Guid.h>
+#include <decaf/util/UUID.h>
 #include <activemq/connector/openwire/commands/ActiveMQBytesMessage.h>
 
 using namespace std;



Mime
View raw message