activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r541358 - in /activemq/activemq-cpp/trunk: src/main/ src/main/activemq/connector/openwire/ src/main/activemq/connector/openwire/commands/ src/main/activemq/connector/stomp/ src/main/activemq/core/ src/main/activemq/io/ src/main/activemq/log...
Date Thu, 24 May 2007 17:06:12 GMT
Author: nmittler
Date: Thu May 24 10:06:06 2007
New Revision: 541358

URL: http://svn.apache.org/viewvc?view=rev&rev=541358
Log:
AMQCPP-115 - creating CMSProperties to remove the dependency of CMS on activemq code

Added:
    activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h   (with props)
    activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h   (with props)
Removed:
    activemq/activemq-cpp/trunk/src/main/activemq/util/SimpleProperties.h
Modified:
    activemq/activemq-cpp/trunk/src/main/Makefile.am
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/logger/LogManager.h
    activemq/activemq-cpp/trunk/src/main/activemq/network/ServerSocket.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h
    activemq/activemq-cpp/trunk/src/main/cms/Destination.h
    activemq/activemq-cpp/trunk/src/main/cms/Message.h
    activemq/activemq-cpp/trunk/src/main/decaf/util/logging/LogManager.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.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/network/SocketFactoryTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/Makefile.am?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Thu May 24 10:06:06 2007
@@ -271,9 +271,9 @@
     activemq/util/Character.h \
     activemq/util/Integer.h \
     activemq/util/Guid.h \
+    activemq/util/ActiveMQProperties.h \
     activemq/util/Properties.h \
     activemq/util/Long.h \
-    activemq/util/SimpleProperties.h \
     activemq/util/Boolean.h \
     activemq/util/StringTokenizer.h \
     activemq/util/Queue.h \
@@ -293,6 +293,7 @@
     cms/Topic.h \
     cms/BytesMessage.h \
     cms/CMSException.h \
+    cms/CMSProperties.h \
     cms/Session.h \
     cms/Startable.h \
     cms/Closeable.h \

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp Thu May 24 10:06:06 2007
@@ -475,7 +475,7 @@
 
     // Get any options specified in the destination and apply them to the
     // ConsumerInfo object.
-    const Properties& options = amqDestination->getOptions();
+    const ActiveMQProperties& options = amqDestination->getOptions();
 
     std::string noLocalStr =
         core::ActiveMQConstants::toString(
@@ -736,7 +736,7 @@
             // ProducerInfo object.
             producerInfo->setDestination( dynamic_cast<commands::ActiveMQDestination*>(
                 amqDestination->cloneDataStructure()) );
-            const Properties& options = amqDestination->getOptions();
+            const ActiveMQProperties& options = amqDestination->getOptions();
             producerInfo->setDispatchAsync( Boolean::parseBoolean(
                 options.getProperty( "producer.dispatchAsync", "false" )) );
         }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h Thu May 24 10:06:06 2007
@@ -46,7 +46,7 @@
 #include <activemq/transport/CommandListener.h>
 #include <activemq/transport/TransportExceptionListener.h>
 #include <activemq/concurrent/Mutex.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/core/ActiveMQConstants.h>
 
 #include <activemq/connector/openwire/OpenWireCommandReader.h>
@@ -186,7 +186,7 @@
         /**
          * Properties for the connector.
          */
-        util::SimpleProperties properties;
+        util::Properties properties;
 
         /**
          * Mapping of consumer IDs to their respective

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h Thu May 24 10:06:06 2007
@@ -22,7 +22,7 @@
 #include <activemq/connector/openwire/commands/WireFormatInfo.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/exceptions/IllegalStateException.h>
 
 namespace activemq{
@@ -272,7 +272,7 @@
     private:
 
         // This object config data
-        activemq::util::SimpleProperties properties;
+        activemq::util::Properties properties;
 
         // Prefered WireFormatInfo
         commands::WireFormatInfo* preferedWireFormatInfo;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp Thu May 24 10:06:06 2007
@@ -71,7 +71,7 @@
 
         std::string optstring = physicalName.substr( pos + 1 );
         this->physicalName = physicalName.substr( 0, pos );
-        URISupport::parseQuery( optstring, &options );
+        URISupport::parseQuery( optstring, &options.getProperties() );
     }
 
     this->advisory = physicalName.find_first_of( ADVISORY_PREFIX ) == 0;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h Thu May 24 10:06:06 2007
@@ -24,7 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/BaseDataStructure.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/ActiveMQProperties.h>
 #include <cms/Destination.h>
 
 #include <vector>
@@ -88,7 +88,7 @@
         std::string orderedTarget;
 
         std::string physicalName;
-        util::SimpleProperties options;
+        util::ActiveMQProperties options;
 
     public:
 
@@ -295,7 +295,7 @@
         /**
          * @returns a reference (const) to the options properties for this Dest.
          */
-        const activemq::util::Properties& getOptions() const {
+        const activemq::util::ActiveMQProperties& getOptions() const {
             return options;
         }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h Thu May 24 10:06:06 2007
@@ -146,7 +146,7 @@
          * but necessary due to C++ restrictions.
          * @return const reference to a properties object.
          */
-        virtual const activemq::util::Properties& getProperties(void) const {
+        virtual const cms::CMSProperties& getCMSProperties() const {
             return this->getOptions();
         }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h Thu May 24 10:06:06 2007
@@ -148,7 +148,7 @@
          * but necessary due to C++ restrictions.
          * @return const reference to a properties object.
          */
-        virtual const activemq::util::Properties& getProperties(void) const {
+        virtual const cms::CMSProperties& getCMSProperties() const {
             return this->getOptions();
         }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h Thu May 24 10:06:06 2007
@@ -145,7 +145,7 @@
          * but necessary due to C++ restrictions.
          * @return const reference to a properties object.
          */
-        virtual const activemq::util::Properties& getProperties(void) const {
+        virtual const cms::CMSProperties& getCMSProperties() const {
             return this->getOptions();
         }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h Thu May 24 10:06:06 2007
@@ -146,7 +146,7 @@
          * but necessary due to C++ restrictions.
          * @return const reference to a properties object.
          */
-        virtual const activemq::util::Properties& getProperties(void) const {
+        virtual const cms::CMSProperties& getCMSProperties() const {
             return this->getOptions();
         }
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h Thu May 24 10:06:06 2007
@@ -125,7 +125,7 @@
         /**
          * Properties for the connector.
          */
-        util::SimpleProperties properties;
+        util::Properties properties;
 
     private:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h Thu May 24 10:06:06 2007
@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/ActiveMQProperties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/exceptions/IllegalArgumentException.h>
 
@@ -41,7 +41,7 @@
     private:
 
         // Params that are optional on the destination
-        util::SimpleProperties properties;
+        util::ActiveMQProperties properties;
 
         // Destination type
         cms::Destination::DestinationType destType;
@@ -133,7 +133,7 @@
          * TEST.QUEUE?consumer.dispatchAsync=false&consumer.prefetchSize=10
          * @returns const reference to a properties object
          */
-        virtual const util::Properties& getProperties() const {
+        virtual const cms::CMSProperties& getCMSProperties() const {
             return properties;
         }
 
@@ -142,7 +142,7 @@
          * objects Properties object.  Existing values are erased.
          * @param properties the Properties to copy to this object.
          */
-        virtual void setProperties( const util::Properties& properties ){
+        virtual void setCMSProperties( const cms::CMSProperties& properties ){
             this->properties.copy( &properties );
         }
 
@@ -196,7 +196,7 @@
                 this->name = destination.getName();
                 this->destType = destination.getDestinationType();
 
-                this->properties.copy( &destination.getProperties() );
+                this->properties.copy( &destination.getCMSProperties() );
             }
             AMQ_CATCHALL_THROW( exceptions::ActiveMQException )
         }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h Thu May 24 10:06:06 2007
@@ -21,7 +21,7 @@
 #include <string>
 #include <string.h>
 #include <map>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 
 namespace activemq{
 namespace connector{
@@ -135,7 +135,7 @@
         std::string command;
 
         // Properties of the Stomp Message
-        util::SimpleProperties properties;
+        util::Properties properties;
 
         // Byte data of Body.
         std::vector<unsigned char> body;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp Thu May 24 10:06:06 2007
@@ -377,7 +377,7 @@
     try
     {
         // Get the properties of this destination
-        const Properties& destProperties = dest->getProperties();
+        const cms::CMSProperties& destProperties = dest->getCMSProperties();
 
         if( destProperties.isEmpty() )
         {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp Thu May 24 10:06:06 2007
@@ -17,7 +17,7 @@
 #include "ActiveMQConnectionFactory.h"
 
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/transport/TransportBuilder.h>
 #include <activemq/exceptions/NullPointerException.h>
@@ -89,7 +89,7 @@
        throw ( cms::CMSException )
 {
     // Declared here so that they can be deleted in the catch block
-    SimpleProperties* properties = NULL;
+    Properties* properties = NULL;
     Transport* transport = NULL;
     Connector* connector = NULL;
     ActiveMQConnectionData* connectionData = NULL;
@@ -99,7 +99,7 @@
 
     try
     {
-        properties = new SimpleProperties;
+        properties = new Properties;
 
         // if no Client Id specified, create one
         if( clientIdLocal == "" )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h Thu May 24 10:06:06 2007
@@ -19,11 +19,10 @@
 
 #include <cms/ConnectionFactory.h>
 #include <cms/Connection.h>
+#include <activemq/util/Properties.h>
 
 namespace activemq{
 namespace core{
-
-    class util::Properties;
 
     class ActiveMQConnectionFactory : public cms::ConnectionFactory
     {

Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h Thu May 24 10:06:06 2007
@@ -25,6 +25,7 @@
 #include <activemq/util/Map.h>
 #include <activemq/util/Set.h>
 #include <activemq/util/Queue.h>
+#include <activemq/util/Properties.h>
 
 namespace activemq{
 namespace core{

Modified: activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp Thu May 24 10:06:06 2007
@@ -62,8 +62,9 @@
         try {
             read = inputStream->read( &buffer[offset], length );
         } catch( io::EOFException& ex ){
-            if( read == 0 ) 
-                return -1;
+            if( read == 0 ) {
+                return 0;
+            }
         }
 
         if( read == 0 ){

Modified: activemq/activemq-cpp/trunk/src/main/activemq/logger/LogManager.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/logger/LogManager.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/logger/LogManager.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/logger/LogManager.h Thu May 24 10:06:06 2007
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/concurrent/Mutex.h>
 
 namespace activemq{
@@ -133,7 +133,7 @@
         std::list<PropertyChangeListener*> listeners;
 
         // Properties of the Log Manager
-        util::SimpleProperties properties;
+        util::Properties properties;
 
     public:
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/network/ServerSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/network/ServerSocket.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/network/ServerSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/network/ServerSocket.cpp Thu May 24 10:06:06 2007
@@ -199,7 +199,7 @@
         int temp_len = sizeof( sockaddr_in );
     #endif
 
-    SocketHandle ss_socket_handle = NULL;
+    SocketHandle ss_socket_handle = (SocketHandle)0;
     
     // Loop to ignore any signal interruptions that occur during the operation.  
     do {

Added: 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?view=auto&rev=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h (added)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h Thu May 24 10:06:06 2007
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+#ifndef _ACTIVEMQ_UTIL_ACTIVEMQPROPERTIES_H_
+#define _ACTIVEMQ_UTIL_ACTIVEMQPROPERTIES_H_
+
+#include <map>
+#include <string>
+#include <sstream>
+#include <cms/CMSProperties.h>
+#include <activemq/util/Properties.h>
+
+namespace activemq{
+namespace util{
+
+    /**
+     * Implementation of the CMSProperties interface that
+     * delegates to a decaf::util::Properties object.
+     */
+    class ActiveMQProperties : public cms::CMSProperties {
+    private:
+
+        Properties properties;
+
+    public:
+
+        virtual ~ActiveMQProperties(){}
+
+        virtual Properties& getProperties() {
+            return properties;
+        }
+        
+        virtual const Properties& getProperties() const {
+            return properties;
+        }
+        
+        virtual void setProperties( Properties& props ) {
+            properties.copy( &props );
+        }
+        
+        /**
+         * Returns true if the properties object is empty
+         * @return true if empty
+         */
+        virtual bool isEmpty() const {
+            return properties.isEmpty();
+        }
+
+        /**
+         * Looks up the value for the given property.
+         * @param name The name of the property to be looked up.
+         * @return the value of the property with the given name, if it
+         * exists.  If it does not exist, returns NULL.
+         */
+        virtual const char* getProperty( const std::string& name ) const{
+            return properties.getProperty(name);
+        }
+
+        /**
+         * Looks up the value for the given property.
+         * @param name the name of the property to be looked up.
+         * @param defaultValue The value to be returned if the given
+         * property does not exist.
+         * @return The value of the property specified by <code>name</code>, if it
+         * exists, otherwise the <code>defaultValue</code>.
+         */
+        virtual std::string getProperty( const std::string& name,
+                                         const std::string& defaultValue ) const {
+            return properties.getProperty(name,defaultValue);
+        }
+
+        /**
+         * Sets the value for a given property.  If the property already
+         * exists, overwrites the value.
+         * @param name The name of the value to be written.
+         * @param value The value to be written.
+         */
+        virtual void setProperty( const std::string& name,
+                                  const std::string& value ){
+            properties.setProperty(name,value);
+        }
+
+        /**
+         * Check to see if the Property exists in the set
+         * @param name - property name to check for in this properties set.
+         * @return true if property exists, false otherwise.
+         */
+        virtual bool hasProperty( const std::string& name ) const
+        {
+            return properties.hasProperty(name);
+        }
+
+        /**
+         * Removes the property with the given name.
+         * @param name the name of the property to remove.
+         */
+        virtual void remove( const std::string& name ){
+            properties.remove( name );
+        }
+
+        /**
+         * Method that serializes the contents of the property map to
+         * an arryay.
+         * @return list of pairs where the first is the name and the second
+         * is the value.
+         */
+        virtual std::vector< std::pair< std::string, std::string > > toArray() const{
+            return properties.toArray();
+        }
+
+        /**
+         * Copies the contents of the given properties object to this one.
+         * @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 );
+            }
+        }
+
+        /**
+         * Clones this object.
+         * @returns a replica of this object.
+         */
+        virtual CMSProperties* clone() const{
+
+            ActiveMQProperties* props = new ActiveMQProperties();
+
+            props->properties.copy(&properties);
+
+            return props;
+        }
+
+        /**
+         * Clears all properties from the map.
+         */
+        virtual void clear(){
+            properties.clear();
+        }
+
+        /**
+         * Formats the contents of the Properties Object into a string
+         * that can be logged, etc.
+         * @returns string value of this object.
+         */
+        virtual std::string toString() const {
+            return properties.toString();
+        }
+
+    };
+
+}}
+
+#endif /*_ACTIVEMQ_UTIL_ACTIVEMQPROPERTIES_H_*/

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h Thu May 24 10:06:06 2007
@@ -14,21 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef ACTIVEMQ_UTIL_PROPERTIES_H_
-#define ACTIVEMQ_UTIL_PROPERTIES_H_
+ 
+#ifndef _ACTIVEMQ_UTIL_PROPERTIES_H_
+#define _ACTIVEMQ_UTIL_PROPERTIES_H_
 
 #include <map>
-#include <string>
 #include <vector>
+#include <string>
+#include <sstream>
 
 namespace activemq{
 namespace util{
 
     /**
-     * Interface for a Java-like properties object.  This is essentially
-     * a map of key-value string pairs.
+     * Java-like properties class for mapping string names to string values.
      */
     class Properties{
+    private:
+
+        std::map< std::string, std::string > properties;
+
     public:
 
         virtual ~Properties(){}
@@ -37,7 +42,9 @@
          * Returns true if the properties object is empty
          * @return true if empty
          */
-        virtual bool isEmpty() const = 0;
+        virtual bool isEmpty() const {
+            return properties.empty();
+        }
 
         /**
          * Looks up the value for the given property.
@@ -45,7 +52,16 @@
          * @return the value of the property with the given name, if it
          * exists.  If it does not exist, returns NULL.
          */
-        virtual const char* getProperty( const std::string& name ) const = 0;
+        virtual const char* getProperty( const std::string& name ) const{
+
+            std::map< std::string, std::string >::const_iterator iter =
+            properties.find( name );
+            if( iter == properties.end() ){
+                return NULL;
+            }
+
+            return iter->second.c_str();
+        }
 
         /**
          * Looks up the value for the given property.
@@ -55,9 +71,17 @@
          * @return The value of the property specified by <code>name</code>, if it
          * exists, otherwise the <code>defaultValue</code>.
          */
-        virtual std::string getProperty(
-            const std::string& name,
-            const std::string& defaultValue ) const = 0;
+        virtual std::string getProperty( const std::string& name,
+                                         const std::string& defaultValue ) const {
+
+            std::map< std::string, std::string >::const_iterator iter =
+            properties.find( name );
+            if( iter == properties.end() ){
+                return defaultValue;
+            }
+
+            return iter->second;
+        }
 
         /**
          * Sets the value for a given property.  If the property already
@@ -65,22 +89,33 @@
          * @param name The name of the value to be written.
          * @param value The value to be written.
          */
-        virtual void setProperty(
-            const std::string& name,
-            const std::string& value ) = 0;
+        virtual void setProperty( const std::string& name,
+                                  const std::string& value ){
+            properties[name] = value;
+        }
 
         /**
          * Check to see if the Property exists in the set
-         * @param name the name of the property to check
+         * @param name - property name to check for in this properties set.
          * @return true if property exists, false otherwise.
          */
-        virtual bool hasProperty( const std::string& name ) const = 0;
+        virtual bool hasProperty( const std::string& name ) const
+        {
+            if(properties.find(name) != properties.end())
+            {
+                return true;
+            }
+
+            return false;
+        }
 
         /**
          * Removes the property with the given name.
-         * @param name the name of the property to be removed.s
+         * @param name the name of the property to remove.
          */
-        virtual void remove( const std::string& name ) = 0;
+        virtual void remove( const std::string& name ){
+            properties.erase( name );
+        }
 
         /**
          * Method that serializes the contents of the property map to
@@ -88,34 +123,81 @@
          * @return list of pairs where the first is the name and the second
          * is the value.
          */
-        virtual std::vector< std::pair< std::string, std::string > > toArray() const = 0;
+        virtual std::vector< std::pair< std::string, std::string > > toArray() const{
+
+            // Create a vector big enough to hold all the elements in the map.
+            std::vector< std::pair<std::string, std::string> > vec( properties.size() );
+
+            // Get an iterator at the beginning of the map.
+            std::map< std::string, std::string >::const_iterator iter = properties.begin();
+
+            // Copy all of the elements from the map to the vector.
+            for( int ix=0; iter != properties.end(); ++iter, ++ix ){
+                vec[ix] = *iter;
+            }
+
+            return vec;
+        }
 
         /**
          * Copies the contents of the given properties object to this one.
          * @param source The source properties object.
          */
-        virtual void copy( const Properties* source ) = 0;
+        virtual void copy( const Properties* source ){
+
+            clear();
+
+            std::vector< std::pair< std::string, std::string > > vec =
+                source->toArray();
+            for( unsigned int ix=0; ix<vec.size(); ++ix ){
+                properties[vec[ix].first] = vec[ix].second;
+            }
+        }
 
         /**
          * Clones this object.
          * @returns a replica of this object.
          */
-        virtual Properties* clone() const = 0;
+        virtual Properties* clone() const{
+
+            Properties* props = new Properties();
+
+            props->properties = properties;
+
+            return props;
+        }
 
         /**
          * Clears all properties from the map.
          */
-        virtual void clear() = 0;
+        virtual void clear(){
+            properties.clear();
+        }
 
         /**
          * Formats the contents of the Properties Object into a string
          * that can be logged, etc.
          * @returns string value of this object.
          */
-        virtual std::string toString() const = 0;
+        virtual std::string toString() const {
+
+            std::ostringstream stream;
+            std::map< std::string, std::string >::const_iterator iter;
+
+            stream << "Begin Class activemq::util::Properties:" << std::endl;
+
+            for( iter = properties.begin(); iter != properties.end(); ++iter ){
+                stream << " properties[" << iter->first << "] = "
+                       << iter->second << std::endl;
+            }
+
+            stream << "End Class activemq::util::Properties:" << std::endl;
+
+            return stream.str();
+        }
 
-   };
+    };
 
 }}
 
-#endif /*ACTIVEMQ_UTIL_PROPERTIES_H_*/
+#endif /*_ACTIVEMQ_UTIL_PROPERTIES_H_*/

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp Thu May 24 10:06:06 2007
@@ -25,12 +25,12 @@
 using namespace activemq::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-SimpleProperties URISupport::parseQuery( std::string query )
+Properties URISupport::parseQuery( std::string query )
     throw ( IllegalArgumentException )
 {
     try {
         
-        SimpleProperties options;        
+        Properties options;        
         URISupport::parseQuery( query, &options );
         return options;
     }

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h Thu May 24 10:06:06 2007
@@ -18,7 +18,7 @@
 #ifndef _ACTIVEMQ_UTIL_URISUPPORT_H_
 #define _ACTIVEMQ_UTIL_URISUPPORT_H_
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/exceptions/IllegalArgumentException.h>
 
 namespace activemq{
@@ -35,9 +35,9 @@
          * Properties object containing the parameter names as keys, and
          * the parameter values and values of the Properties.
          * @param query. the query string to parse.
-         * @returns SimpleProperties object with the parsed output.
+         * @returns Properties object with the parsed output.
          */
-        static SimpleProperties parseQuery( std::string query )
+        static Properties parseQuery( std::string query )
             throw ( exceptions::IllegalArgumentException );
          
         /**

Added: activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h?view=auto&rev=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h (added)
+++ activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h Thu May 24 10:06:06 2007
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef _CMS_CMSPROPERTIES_H_
+#define _CMS_CMSPROPERTIES_H_
+
+#include <map>
+#include <string>
+#include <vector>
+
+namespace cms{
+
+    /**
+     * Interface for a Java-like properties object.  This is essentially
+     * a map of key-value string pairs.
+     */
+    class CMSProperties {
+    public:
+
+        virtual ~CMSProperties(){}
+
+        /**
+         * Returns true if the properties object is empty
+         * @return true if empty
+         */
+        virtual bool isEmpty() const = 0;
+
+        /**
+         * Looks up the value for the given property.
+         * @param name The name of the property to be looked up.
+         * @return the value of the property with the given name, if it
+         * exists.  If it does not exist, returns NULL.
+         */
+        virtual const char* getProperty( const std::string& name ) const = 0;
+
+        /**
+         * Looks up the value for the given property.
+         * @param name the name of the property to be looked up.
+         * @param defaultValue The value to be returned if the given
+         * property does not exist.
+         * @return The value of the property specified by <code>name</code>, if it
+         * exists, otherwise the <code>defaultValue</code>.
+         */
+        virtual std::string getProperty(
+            const std::string& name,
+            const std::string& defaultValue ) const = 0;
+
+        /**
+         * Sets the value for a given property.  If the property already
+         * exists, overwrites the value.
+         * @param name The name of the value to be written.
+         * @param value The value to be written.
+         */
+        virtual void setProperty(
+            const std::string& name,
+            const std::string& value ) = 0;
+
+        /**
+         * Check to see if the Property exists in the set
+         * @param name the name of the property to check
+         * @return true if property exists, false otherwise.
+         */
+        virtual bool hasProperty( const std::string& name ) const = 0;
+
+        /**
+         * Removes the property with the given name.
+         * @param name the name of the property to be removed.s
+         */
+        virtual void remove( const std::string& name ) = 0;
+
+        /**
+         * Method that serializes the contents of the property map to
+         * an arryay.
+         * @return list of pairs where the first is the name and the second
+         * is the value.
+         */
+        virtual std::vector< std::pair< std::string, std::string > > toArray() const = 0;
+
+        /**
+         * Copies the contents of the given properties object to this one.
+         * @param source The source properties object.
+         */
+        virtual void copy( const CMSProperties* source ) = 0;
+
+        /**
+         * Clones this object.
+         * @returns a replica of this object.
+         */
+        virtual CMSProperties* clone() const = 0;
+
+        /**
+         * Clears all properties from the map.
+         */
+        virtual void clear() = 0;
+
+        /**
+         * Formats the contents of the Properties Object into a string
+         * that can be logged, etc.
+         * @returns string value of this object.
+         */
+        virtual std::string toString() const = 0;
+
+   };
+
+}
+
+#endif /*_CMS_CMSPROPERTIES_H_*/

Propchange: activemq/activemq-cpp/trunk/src/main/cms/CMSProperties.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/activemq-cpp/trunk/src/main/cms/Destination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/cms/Destination.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/cms/Destination.h (original)
+++ activemq/activemq-cpp/trunk/src/main/cms/Destination.h Thu May 24 10:06:06 2007
@@ -18,7 +18,7 @@
 #ifndef _CMS_DESTINATION_H_
 #define _CMS_DESTINATION_H_
 
-#include <activemq/util/Properties.h>
+#include <cms/CMSProperties.h>
 
 #include <string>
 
@@ -80,7 +80,7 @@
          * but necessary due to C++ restrictions.  
          * @return const reference to a properties object.
          */
-        virtual const activemq::util::Properties& getProperties() const = 0;
+        virtual const CMSProperties& getCMSProperties() const = 0;
         
     };
 }

Modified: activemq/activemq-cpp/trunk/src/main/cms/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/cms/Message.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/cms/Message.h (original)
+++ activemq/activemq-cpp/trunk/src/main/cms/Message.h Thu May 24 10:06:06 2007
@@ -18,8 +18,6 @@
 #ifndef _CMS_MESSAGE_H_
 #define _CMS_MESSAGE_H_
 
-#include <activemq/util/Properties.h>
-
 #include <cms/Destination.h>
 #include <cms/CMSException.h>
 #include <cms/DeliveryMode.h>

Modified: activemq/activemq-cpp/trunk/src/main/decaf/util/logging/LogManager.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/util/logging/LogManager.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/util/logging/LogManager.h (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/util/logging/LogManager.h Thu May 24 10:06:06 2007
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/concurrent/Mutex.h>
 
 namespace decaf{
@@ -134,7 +134,7 @@
         std::list<PropertyChangeListener*> listeners;
 
         // Properties of the Log Manager
-        util::SimpleProperties properties;
+        util::Properties properties;
 
     public:
 

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -21,10 +21,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -21,10 +21,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -24,10 +24,10 @@
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -25,10 +25,10 @@
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -20,10 +20,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -20,10 +20,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -22,10 +22,10 @@
 #include <activemq/concurrent/Thread.h>
 #include <activemq/concurrent/Mutex.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -20,10 +20,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -21,10 +21,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -21,10 +21,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -24,10 +24,10 @@
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -25,10 +25,10 @@
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -20,10 +20,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 May 24 10:06:06 2007
@@ -20,10 +20,10 @@
 
 #include <activemq/concurrent/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
 #include <activemq/util/Guid.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
 #include <activemq/network/SocketFactory.h>

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp Thu May 24 10:06:06 2007
@@ -19,7 +19,7 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::openwire::OpenWireFormatTest );
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 
 using namespace std;
@@ -33,6 +33,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormatTest::test()
 {
-    SimpleProperties properties;
+    Properties properties;
     //OpenWireFormat myWireFormat( properties );
 }

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?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- 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 Thu May 24 10:06:06 2007
@@ -23,7 +23,7 @@
 #include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
 #include <activemq/connector/openwire/OpenWireFormatFactory.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/io/ByteArrayOutputStream.h>
 #include <activemq/io/DataOutputStream.h>
 #include <activemq/io/ByteArrayInputStream.h>
@@ -44,7 +44,7 @@
 {   
     SimpleDataStructureMarshaller* simpleMarshaller = new SimpleDataStructureMarshaller();
     ComplexDataStructureMarshaller* complexMarshaller = new ComplexDataStructureMarshaller();
-    SimpleProperties props;    
+    Properties props;    
     OpenWireFormat openWireFormat(props);
     openWireFormat.addMarshaller( simpleMarshaller );
     openWireFormat.addMarshaller( complexMarshaller );
@@ -81,7 +81,7 @@
 {   
     SimpleDataStructureMarshaller* simpleMarshaller = new SimpleDataStructureMarshaller();
     ComplexDataStructureMarshaller* complexMarshaller = new ComplexDataStructureMarshaller();
-    SimpleProperties props;    
+    Properties props;    
     OpenWireFormat openWireFormat(props);
     openWireFormat.addMarshaller( simpleMarshaller );
     openWireFormat.addMarshaller( complexMarshaller );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h Thu May 24 10:06:06 2007
@@ -103,7 +103,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -142,7 +142,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -206,7 +206,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -258,7 +258,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -344,7 +344,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
             StompConnector* connector =
                 new StompConnector( &transport, properties );
             connector->start();
@@ -389,7 +389,7 @@
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
             MyExceptionListener exListener;
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h Thu May 24 10:06:06 2007
@@ -112,7 +112,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -148,7 +148,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -209,7 +209,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -281,7 +281,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.
@@ -329,7 +329,7 @@
             std::string connectionId = "testConnectionId";
             StompResponseBuilder responseBuilder("testConnectionId");
             transport::DummyTransport transport( &responseBuilder );
-            util::SimpleProperties properties;
+            util::Properties properties;
 
             // Using a pointer for the connector so we ensure the proper destruction
             // order of objects - connector before the transport.

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp Thu May 24 10:06:06 2007
@@ -27,7 +27,7 @@
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConnectionData.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/transport/DummyTransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
 #include <activemq/transport/TransportFactoryMapRegistrar.h>
@@ -55,8 +55,8 @@
         MyCommandListener cmdListener;
         MyDispatcher msgListener;
         std::string connectionId = "testConnectionId";
-        util::SimpleProperties* properties =
-            new util::SimpleProperties();
+        util::Properties* properties =
+            new util::Properties();
         transport::Transport* transport = NULL;
 
         transport::TransportFactory* factory =

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp Thu May 24 10:06:06 2007
@@ -38,7 +38,7 @@
 #include <activemq/core/ActiveMQSession.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/util/Date.h>
 #include <activemq/connector/ConsumerMessageListener.h>
 

Modified: activemq/activemq-cpp/trunk/src/test/activemq/network/SocketFactoryTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/network/SocketFactoryTest.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/network/SocketFactoryTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/network/SocketFactoryTest.cpp Thu May 24 10:06:06 2007
@@ -19,7 +19,7 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::network::SocketFactoryTest );
 
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 #include <activemq/network/SocketFactory.h>
 #include <activemq/network/TcpSocket.h>
 
@@ -36,7 +36,7 @@
 
         concurrent::Thread::sleep( 500 );
 
-        util::SimpleProperties properties;
+        util::Properties properties;
 
         std::ostringstream ostream;
 
@@ -94,7 +94,7 @@
 
         concurrent::Thread::sleep( 40 );
 
-        util::SimpleProperties properties;
+        util::Properties properties;
 
         std::ostringstream ostream;
 

Modified: activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp Thu May 24 10:06:06 2007
@@ -20,7 +20,7 @@
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::URISupportTest );
 
 #include <activemq/util/URISupport.h>
-#include <activemq/util/SimpleProperties.h>
+#include <activemq/util/Properties.h>
 
 using namespace std;
 using namespace activemq;
@@ -31,7 +31,7 @@
 {
     string test = "?option1=test1&option2=test2";
     
-    SimpleProperties map = URISupport::parseQuery( test );
+    Properties map = URISupport::parseQuery( test );
 
     CPPUNIT_ASSERT( map.hasProperty( "option1" ) == true );
     CPPUNIT_ASSERT( map.hasProperty( "option2" ) == true );

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj?view=diff&rev=541358&r1=541357&r2=541358
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Thu May 24 10:06:06 2007
@@ -333,7 +333,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\main\activemq\util\SimpleProperties.h"
+					RelativePath="..\src\main\activemq\util\Properties.h"
 					>
 				</File>
 				<File



Mime
View raw message