You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/06/21 22:32:48 UTC

svn commit: r956683 [2/4] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: examples/ examples/advisories/ examples/consumers/ examples/topics/chat/ main/activemq/cmsutil/ main/activemq/commands/ main/activemq/core/ main/activemq/util/ main/cms/ main...

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h Mon Jun 21 20:32:45 2010
@@ -69,9 +69,10 @@ namespace cmsutil {
          *
          * @param connection
          *         the object to be managed
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        void addConnection( cms::Connection* connection )
-            throw ( cms::CMSException );
+        void addConnection( cms::Connection* connection );
 
         /**
          * Adds a session so that its life will be managed by
@@ -79,9 +80,10 @@ namespace cmsutil {
          *
          * @param session
          *         the object to be managed
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        void addSession( cms::Session* session )
-            throw ( cms::CMSException );
+        void addSession( cms::Session* session );
 
         /**
          * Adds a destination so that its life will be managed by
@@ -89,9 +91,10 @@ namespace cmsutil {
          *
          * @param dest
          *         the object to be managed
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        void addDestination( cms::Destination* dest )
-            throw ( cms::CMSException );
+        void addDestination( cms::Destination* dest );
 
         /**
          * Adds a message producer so that its life will be managed by
@@ -99,9 +102,10 @@ namespace cmsutil {
          *
          * @param producer
          *         the object to be managed
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        void addMessageProducer( cms::MessageProducer* producer )
-            throw ( cms::CMSException );
+        void addMessageProducer( cms::MessageProducer* producer );
 
         /**
          * Adds a message consumer so that its life will be managed by
@@ -109,15 +113,17 @@ namespace cmsutil {
          *
          * @param consumer
          *         the object to be managed
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        void addMessageConsumer( cms::MessageConsumer* consumer )
-            throw ( cms::CMSException );
+        void addMessageConsumer( cms::MessageConsumer* consumer );
 
         /**
          * Closes and destroys the contained CMS resources.
+         *
          * @throws cms::CMSException thrown if an error occurs.
          */
-        void destroy() throw ( cms::CMSException );
+        void destroy();
 
         /**
          * Releases all of the contained resources so that this

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionCallback.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionCallback.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionCallback.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionCallback.h Mon Jun 21 20:32:45 2010
@@ -39,9 +39,10 @@ namespace cmsutil {
          *
          * @param session
          *          the CMS <code>Session</code>
-         * @throws cms::CMSException if thrown by CMS API methods
+         *
+         * @throws CMSException if thrown by CMS API methods
          */
-        virtual void doInCms( cms::Session* session ) throw ( cms::CMSException ) = 0;
+        virtual void doInCms( cms::Session* session ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp Mon Jun 21 20:32:45 2010
@@ -58,7 +58,7 @@ SessionPool::~SessionPool() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-PooledSession* SessionPool::takeSession() throw ( cms::CMSException ){
+PooledSession* SessionPool::takeSession() {
 
     synchronized(&mutex) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h Mon Jun 21 20:32:45 2010
@@ -83,9 +83,9 @@ namespace cmsutil {
          *
          * @return the pooled session object
          *
-         * @throws cms::CMSException if an error occurred
+         * @throws CMSException if an error occurred
          */
-        virtual PooledSession* takeSession() throw ( cms::CMSException );
+        virtual PooledSession* takeSession();
 
         /**
          * Returns a session to the pool.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.h Mon Jun 21 20:32:45 2010
@@ -55,7 +55,7 @@ namespace commands {
     public:
 
         ActiveMQBlobMessage();
-        virtual ~ActiveMQBlobMessage() {}
+        virtual ~ActiveMQBlobMessage() throw() {}
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp Mon Jun 21 20:32:45 2010
@@ -93,7 +93,7 @@ ActiveMQBytesMessage::ActiveMQBytesMessa
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQBytesMessage::~ActiveMQBytesMessage() {
+ActiveMQBytesMessage::~ActiveMQBytesMessage() throw() {
     this->reset();
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h Mon Jun 21 20:32:45 2010
@@ -74,7 +74,7 @@ namespace commands{
 
         ActiveMQBytesMessage();
 
-        virtual ~ActiveMQBytesMessage();
+        virtual ~ActiveMQBytesMessage() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h Mon Jun 21 20:32:45 2010
@@ -102,7 +102,7 @@ namespace commands{
 
         ActiveMQDestination();
         ActiveMQDestination( const std::string& physicalName );
-        virtual ~ActiveMQDestination() {}
+        virtual ~ActiveMQDestination() throw() {}
 
         /**
          * Clone this object and return a new instance that the

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp Mon Jun 21 20:32:45 2010
@@ -49,7 +49,7 @@ ActiveMQMapMessage::ActiveMQMapMessage()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQMapMessage::~ActiveMQMapMessage() {
+ActiveMQMapMessage::~ActiveMQMapMessage() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.h Mon Jun 21 20:32:45 2010
@@ -55,7 +55,7 @@ namespace commands{
     public:
 
         ActiveMQMapMessage();
-        virtual ~ActiveMQMapMessage();
+        virtual ~ActiveMQMapMessage() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.h Mon Jun 21 20:32:45 2010
@@ -45,7 +45,7 @@ namespace commands{
     public:
 
         ActiveMQMessage();
-        virtual ~ActiveMQMessage() {}
+        virtual ~ActiveMQMessage() throw() {}
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h Mon Jun 21 20:32:45 2010
@@ -51,7 +51,7 @@ namespace commands {
                     this, &this->getMessageProperties() ) );
         }
 
-        virtual ~ActiveMQMessageTemplate() {}
+        virtual ~ActiveMQMessageTemplate() throw() {}
 
     public:  // cms::Message related methods
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.h Mon Jun 21 20:32:45 2010
@@ -46,7 +46,7 @@ namespace commands{
     public:
 
         ActiveMQObjectMessage();
-        virtual ~ActiveMQObjectMessage() {}
+        virtual ~ActiveMQObjectMessage() throw() {}
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h Mon Jun 21 20:32:45 2010
@@ -50,7 +50,7 @@ namespace commands{
 
         ActiveMQQueue();
         ActiveMQQueue( const std::string& name );
-        virtual ~ActiveMQQueue() {}
+        virtual ~ActiveMQQueue() throw() {}
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp Mon Jun 21 20:32:45 2010
@@ -64,7 +64,7 @@ ActiveMQStreamMessage::ActiveMQStreamMes
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQStreamMessage::~ActiveMQStreamMessage() {
+ActiveMQStreamMessage::~ActiveMQStreamMessage() throw() {
     this->reset();
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h Mon Jun 21 20:32:45 2010
@@ -63,7 +63,7 @@ namespace commands{
     public:
 
         ActiveMQStreamMessage();
-        virtual ~ActiveMQStreamMessage();
+        virtual ~ActiveMQStreamMessage() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp Mon Jun 21 20:32:45 2010
@@ -36,7 +36,7 @@ ActiveMQTempDestination::ActiveMQTempDes
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQTempDestination::~ActiveMQTempDestination() {
+ActiveMQTempDestination::~ActiveMQTempDestination() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h Mon Jun 21 20:32:45 2010
@@ -59,7 +59,7 @@ namespace commands{
 
         ActiveMQTempDestination();
         ActiveMQTempDestination( const std::string& name );
-        virtual ~ActiveMQTempDestination();
+        virtual ~ActiveMQTempDestination() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp Mon Jun 21 20:32:45 2010
@@ -33,7 +33,7 @@ ActiveMQTempQueue::ActiveMQTempQueue( co
 {}
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQTempQueue::~ActiveMQTempQueue() {
+ActiveMQTempQueue::~ActiveMQTempQueue() throw() {
     try {
         this->close();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h Mon Jun 21 20:32:45 2010
@@ -48,7 +48,7 @@ namespace commands{
 
         ActiveMQTempQueue();
         ActiveMQTempQueue( const std::string& name );
-        virtual ~ActiveMQTempQueue();
+        virtual ~ActiveMQTempQueue() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp Mon Jun 21 20:32:45 2010
@@ -32,7 +32,7 @@ ActiveMQTempTopic::ActiveMQTempTopic( co
 {}
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQTempTopic::~ActiveMQTempTopic() {
+ActiveMQTempTopic::~ActiveMQTempTopic() throw() {
     try {
         this->close();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h Mon Jun 21 20:32:45 2010
@@ -48,7 +48,7 @@ namespace commands{
 
         ActiveMQTempTopic();
         ActiveMQTempTopic( const std::string& name );
-        virtual ~ActiveMQTempTopic();
+        virtual ~ActiveMQTempTopic() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp Mon Jun 21 20:32:45 2010
@@ -45,7 +45,7 @@ ActiveMQTextMessage::ActiveMQTextMessage
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQTextMessage::~ActiveMQTextMessage() {
+ActiveMQTextMessage::~ActiveMQTextMessage() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.h Mon Jun 21 20:32:45 2010
@@ -49,7 +49,7 @@ namespace commands{
     public:
 
         ActiveMQTextMessage();
-        virtual ~ActiveMQTextMessage();
+        virtual ~ActiveMQTextMessage() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp Mon Jun 21 20:32:45 2010
@@ -32,7 +32,7 @@ ActiveMQTopic::ActiveMQTopic( const std:
 {}
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQTopic::~ActiveMQTopic() {
+ActiveMQTopic::~ActiveMQTopic() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h Mon Jun 21 20:32:45 2010
@@ -50,7 +50,7 @@ namespace commands{
 
         ActiveMQTopic();
         ActiveMQTopic( const std::string& name );
-        virtual ~ActiveMQTopic();
+        virtual ~ActiveMQTopic() throw();
 
         virtual unsigned char getDataStructureType() const;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp Mon Jun 21 20:32:45 2010
@@ -175,7 +175,7 @@ ActiveMQConnection::ActiveMQConnection( 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQConnection::~ActiveMQConnection() {
+ActiveMQConnection::~ActiveMQConnection() throw() {
     try {
         this->close();
         delete this->config;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h Mon Jun 21 20:32:45 2010
@@ -137,7 +137,7 @@ namespace core{
         ActiveMQConnection( const Pointer<transport::Transport>& transport,
                             const Pointer<decaf::util::Properties>& properties );
 
-        virtual ~ActiveMQConnection();
+        virtual ~ActiveMQConnection() throw();
 
         /**
          * Removes the session resources for the given session

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp Mon Jun 21 20:32:45 2010
@@ -153,8 +153,7 @@ namespace core{
 }}
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::ConnectionFactory* cms::ConnectionFactory::createCMSConnectionFactory( const std::string& brokerURI )
-    throw ( cms::CMSException ) {
+cms::ConnectionFactory* cms::ConnectionFactory::createCMSConnectionFactory( const std::string& brokerURI ) {
 
     return new ActiveMQConnectionFactory( brokerURI );
 }
@@ -174,7 +173,7 @@ ActiveMQConnectionFactory::ActiveMQConne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQConnectionFactory::~ActiveMQConnectionFactory() {
+ActiveMQConnectionFactory::~ActiveMQConnectionFactory() throw() {
     try{
         delete this->settings;
     }
@@ -183,27 +182,21 @@ ActiveMQConnectionFactory::~ActiveMQConn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Connection* ActiveMQConnectionFactory::createConnection()
-    throw ( cms::CMSException ) {
-
+cms::Connection* ActiveMQConnectionFactory::createConnection() {
     return createConnection( settings->brokerURL, settings->username, settings->password, settings->clientId );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Connection* ActiveMQConnectionFactory::createConnection(
-    const std::string& username,
-    const std::string& password )
-        throw ( cms::CMSException ) {
+cms::Connection* ActiveMQConnectionFactory::createConnection( const std::string& username,
+                                                              const std::string& password ) {
 
     return createConnection( settings->brokerURL, username, password, settings->clientId );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Connection* ActiveMQConnectionFactory::createConnection(
-    const std::string& username,
-    const std::string& password,
-    const std::string& clientId )
-        throw ( cms::CMSException ) {
+cms::Connection* ActiveMQConnectionFactory::createConnection( const std::string& username,
+                                                              const std::string& password,
+                                                              const std::string& clientId ) {
 
     return createConnection( settings->brokerURL, username, password, clientId );
 }
@@ -212,8 +205,7 @@ cms::Connection* ActiveMQConnectionFacto
 cms::Connection* ActiveMQConnectionFactory::doCreateConnection( const std::string& url,
                                                                 const std::string& username,
                                                                 const std::string& password,
-                                                                const std::string& clientId )
-    throw ( cms::CMSException ) {
+                                                                const std::string& clientId ) {
 
     Pointer<Transport> transport;
     auto_ptr<ActiveMQConnection> connection;
@@ -287,8 +279,7 @@ cms::Connection* ActiveMQConnectionFacto
     const std::string& url,
     const std::string& username,
     const std::string& password,
-    const std::string& clientId )
-       throw ( cms::CMSException ) {
+    const std::string& clientId ) {
 
     ActiveMQConnectionFactory factory;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h Mon Jun 21 20:32:45 2010
@@ -55,7 +55,7 @@ namespace core{
                                    const std::string& username = "",
                                    const std::string& password = "" );
 
-        virtual ~ActiveMQConnectionFactory();
+        virtual ~ActiveMQConnectionFactory() throw();
 
         /**
          * Creates a connection with the default user identity. The
@@ -65,8 +65,7 @@ namespace core{
          * @returns a Connection Pointer
          * @throws CMSException
          */
-        virtual cms::Connection* createConnection()
-            throw ( cms::CMSException );
+        virtual cms::Connection* createConnection();
 
         /**
          * Creates a connection with the specified user identity. The
@@ -82,8 +81,7 @@ namespace core{
          * @throws CMSException
          */
         virtual cms::Connection* createConnection( const std::string& username,
-                                                   const std::string& password )
-            throw ( cms::CMSException );
+                                                   const std::string& password );
 
         /**
          * Creates a connection with the specified user identity. The
@@ -102,8 +100,7 @@ namespace core{
          */
         virtual cms::Connection* createConnection( const std::string& username,
                                                    const std::string& password,
-                                                   const std::string& clientId )
-            throw ( cms::CMSException );
+                                                   const std::string& clientId );
 
     public:   // Configuration Options
 
@@ -323,16 +320,14 @@ namespace core{
         static cms::Connection* createConnection( const std::string& url,
                                                   const std::string& username,
                                                   const std::string& password,
-                                                  const std::string& clientId = "" )
-            throw ( cms::CMSException );
+                                                  const std::string& clientId = "" );
 
     private:
 
         cms::Connection* doCreateConnection( const std::string& url,
                                              const std::string& username,
                                              const std::string& password,
-                                             const std::string& clientId )
-            throw ( cms::CMSException );
+                                             const std::string& clientId );
 
         void configureConnection( ActiveMQConnection* connection );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp Mon Jun 21 20:32:45 2010
@@ -26,7 +26,7 @@ ActiveMQConnectionMetaData::ActiveMQConn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQConnectionMetaData::~ActiveMQConnectionMetaData() {
+ActiveMQConnectionMetaData::~ActiveMQConnectionMetaData() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h Mon Jun 21 20:32:45 2010
@@ -40,7 +40,7 @@ namespace core {
     public:
 
         ActiveMQConnectionMetaData();
-        virtual ~ActiveMQConnectionMetaData();
+        virtual ~ActiveMQConnectionMetaData() throw();
 
     public:  // cms::ConnectionMetaData
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp Mon Jun 21 20:32:45 2010
@@ -253,7 +253,7 @@ ActiveMQConsumer::ActiveMQConsumer( Acti
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQConsumer::~ActiveMQConsumer() {
+ActiveMQConsumer::~ActiveMQConsumer() throw() {
 
     try {
         close();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h Mon Jun 21 20:32:45 2010
@@ -158,7 +158,7 @@ namespace core{
                           bool dispatchAsync,
                           cms::MessageListener* listener );
 
-        virtual ~ActiveMQConsumer();
+        virtual ~ActiveMQConsumer() throw();
 
     public:  // Interface Implementation
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp Mon Jun 21 20:32:45 2010
@@ -82,7 +82,7 @@ ActiveMQProducer::ActiveMQProducer( Acti
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQProducer::~ActiveMQProducer() {
+ActiveMQProducer::~ActiveMQProducer() throw() {
     try {
         close();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h Mon Jun 21 20:32:45 2010
@@ -98,7 +98,7 @@ namespace core{
                           const Pointer<commands::ActiveMQDestination>& destination,
                           long long sendTimeout );
 
-        virtual ~ActiveMQProducer();
+        virtual ~ActiveMQProducer() throw();
 
         /**
          * Closes the Consumer.  This will return all allocated resources

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.cpp Mon Jun 21 20:32:45 2010
@@ -118,7 +118,7 @@ ActiveMQQueueBrowser::ActiveMQQueueBrows
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQQueueBrowser::~ActiveMQQueueBrowser() {
+ActiveMQQueueBrowser::~ActiveMQQueueBrowser() throw() {
     try{
         this->close();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.h Mon Jun 21 20:32:45 2010
@@ -73,7 +73,7 @@ namespace core {
                               const std::string& selector,
                               bool dispatchAsync );
 
-        virtual ~ActiveMQQueueBrowser();
+        virtual ~ActiveMQQueueBrowser() throw();
 
     public:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Mon Jun 21 20:32:45 2010
@@ -94,7 +94,7 @@ ActiveMQSession::ActiveMQSession( const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQSession::~ActiveMQSession() {
+ActiveMQSession::~ActiveMQSession() throw() {
     try{
         // Destroy this session's resources
         close();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h Mon Jun 21 20:32:45 2010
@@ -141,7 +141,7 @@ namespace core{
                          const decaf::util::Properties& properties,
                          ActiveMQConnection* connection );
 
-        virtual ~ActiveMQSession();
+        virtual ~ActiveMQSession() throw();
 
         /**
          * Redispatches the given set of unconsumed messages to the consumers.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.cpp Mon Jun 21 20:32:45 2010
@@ -27,7 +27,7 @@ ActiveMQProperties::ActiveMQProperties()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ActiveMQProperties::~ActiveMQProperties() {
+ActiveMQProperties::~ActiveMQProperties() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.h Mon Jun 21 20:32:45 2010
@@ -43,7 +43,7 @@ namespace util{
 
         ActiveMQProperties();
 
-        virtual ~ActiveMQProperties();
+        virtual ~ActiveMQProperties() throw();
 
         virtual decaf::util::Properties& getProperties() {
             return this->properties;
@@ -57,99 +57,52 @@ namespace util{
             this->properties = props;
         }
 
-        /**
-         * Returns true if the properties object is empty
-         * @return true if empty
-         */
+        virtual int size() const {
+            return properties.size();
+        }
+
         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 );
+        virtual std::string remove( const std::string& name ){
+            return properties.remove( name );
+        }
+
+        virtual std::vector<std::string> propertyNames() const {
+            return properties.propertyNames();
         }
 
-        /**
-         * 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 );
 
-        /**
-         * Clones this object.
-         * @returns a replica of this object.
-         */
         virtual CMSProperties* clone() const;
 
-        /**
-         * 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();
         }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h Mon Jun 21 20:32:45 2010
@@ -66,7 +66,7 @@ namespace cms{
     class CMS_API BytesMessage : public Message{
     public:
 
-        virtual ~BytesMessage(){}
+        virtual ~BytesMessage() throw() {}
 
         /**
          * sets the bytes given to the message body.
@@ -79,8 +79,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws MessageNotWriteableException - if in Read Only Mode.
          */
-        virtual void setBodyBytes( const unsigned char* buffer, int numBytes )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setBodyBytes( const unsigned char* buffer, int numBytes ) = 0;
 
         /**
          * Gets the bytes that are contained in this message and returns them in a newly
@@ -94,8 +93,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws MessageNotReadableException - If the message is in Write Only Mode.
          */
-        virtual unsigned char* getBodyBytes() const
-            throw( cms::MessageNotReadableException, cms::CMSException ) = 0;
+        virtual unsigned char* getBodyBytes() const = 0;
 
         /**
          * Returns the number of bytes contained in the body of this message.
@@ -105,8 +103,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws MessageNotReadableException - If the message is in Write Only Mode.
          */
-        virtual int getBodyLength() const
-            throw( cms::MessageNotReadableException, cms::CMSException ) = 0;
+        virtual int getBodyLength() const = 0;
 
         /**
          * Puts the message body in read-only mode and repositions the stream
@@ -115,7 +112,7 @@ namespace cms{
          * @throws CMSException - If the provider fails to perform the reset operation.
          * @throws MessageFormatException - If the Message has an invalid format.
          */
-        virtual void reset() throw ( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual void reset() = 0;
 
         /**
          * Reads a Boolean from the Bytes message stream
@@ -126,9 +123,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual bool readBoolean() const throw ( cms::MessageEOFException,
-                                                 cms::MessageNotReadableException,
-                                                 cms::CMSException ) = 0;
+        virtual bool readBoolean() const = 0;
 
         /**
          * Writes a boolean to the bytes message stream as a 1-byte value.
@@ -142,8 +137,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeBoolean( bool value ) throw ( cms::MessageNotWriteableException,
-                                                        cms::CMSException ) = 0;
+        virtual void writeBoolean( bool value ) = 0;
 
         /**
          * Reads a Byte from the Bytes message stream
@@ -155,9 +149,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual unsigned char readByte() const throw ( cms::MessageEOFException,
-                                                       cms::MessageNotReadableException,
-                                                       cms::CMSException ) = 0;
+        virtual unsigned char readByte() const = 0;
 
         /**
          * Writes a byte to the bytes message stream as a 1-byte value
@@ -169,8 +161,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeByte( unsigned char value ) throw ( cms::MessageNotWriteableException,
-                                                              cms::CMSException ) = 0;
+        virtual void writeByte( unsigned char value ) = 0;
 
         /**
          * Reads a byte array from the bytes message stream.
@@ -196,10 +187,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readBytes( std::vector<unsigned char>& value ) const
-            throw ( cms::MessageEOFException,
-                    cms::MessageNotReadableException,
-                    cms::CMSException ) = 0;
+        virtual int readBytes( std::vector<unsigned char>& value ) const = 0;
 
         /**
          * Writes a byte array to the bytes message stream using the vector
@@ -212,9 +200,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeBytes( const std::vector<unsigned char>& value )
-            throw ( cms::MessageNotWriteableException,
-                    cms::CMSException ) = 0;
+        virtual void writeBytes( const std::vector<unsigned char>& value ) = 0;
 
         /**
          * Reads a portion of the bytes message stream.
@@ -247,10 +233,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readBytes( unsigned char* buffer, int length ) const
-            throw ( cms::MessageEOFException,
-                    cms::MessageNotReadableException,
-                    cms::CMSException ) = 0;
+        virtual int readBytes( unsigned char* buffer, int length ) const = 0;
 
         /**
          * Writes a portion of a byte array to the bytes message stream.
@@ -267,8 +250,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeBytes( const unsigned char* value, int offset, int length )
-            throw ( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void writeBytes( const unsigned char* value, int offset, int length ) = 0;
 
         /**
          * Reads a Char from the Bytes message stream
@@ -280,9 +262,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual char readChar() const throw ( cms::MessageEOFException,
-                                              cms::MessageNotReadableException,
-                                              cms::CMSException ) = 0;
+        virtual char readChar() const = 0;
 
         /**
          * Writes a char to the bytes message stream as a 1-byte value
@@ -294,8 +274,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeChar( char value ) throw ( cms::MessageNotWriteableException,
-                                                     cms::CMSException ) = 0;
+        virtual void writeChar( char value ) = 0;
 
         /**
          * Reads a 32 bit float from the Bytes message stream
@@ -307,9 +286,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual float readFloat() const throw ( cms::MessageEOFException,
-                                                cms::MessageNotReadableException,
-                                                cms::CMSException ) = 0;
+        virtual float readFloat() const = 0;
 
         /**
          * Writes a float to the bytes message stream as a 4 byte value
@@ -320,8 +297,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeFloat( float value ) throw ( cms::MessageNotWriteableException,
-                                                       cms::CMSException ) = 0;
+        virtual void writeFloat( float value ) = 0;
 
         /**
          * Reads a 64 bit double from the Bytes message stream
@@ -333,9 +309,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual double readDouble() const throw ( cms::MessageEOFException,
-                                                  cms::MessageNotReadableException,
-                                                  cms::CMSException ) = 0;
+        virtual double readDouble() const = 0;
 
         /**
          * Writes a double to the bytes message stream as a 8 byte value
@@ -346,8 +320,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeDouble( double value ) throw ( cms::MessageNotWriteableException,
-                                                         cms::CMSException ) = 0;
+        virtual void writeDouble( double value ) = 0;
 
         /**
          * Reads a 16 bit signed short from the Bytes message stream
@@ -359,9 +332,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual short readShort() const throw ( cms::MessageEOFException,
-                                                cms::MessageNotReadableException,
-                                                cms::CMSException ) = 0;
+        virtual short readShort() const = 0;
 
         /**
          * Writes a signed short to the bytes message stream as a 2 byte value
@@ -373,8 +344,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeShort( short value ) throw ( cms::MessageNotWriteableException,
-                                                       cms::CMSException ) = 0;
+        virtual void writeShort( short value ) = 0;
 
         /**
          * Reads a 16 bit unsigned short from the Bytes message stream
@@ -386,9 +356,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual unsigned short readUnsignedShort() const throw ( cms::MessageEOFException,
-                                                                 cms::MessageNotReadableException,
-                                                                 cms::CMSException ) = 0;
+        virtual unsigned short readUnsignedShort() const = 0;
 
         /**
          * Writes a unsigned short to the bytes message stream as a 2 byte value
@@ -400,8 +368,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeUnsignedShort( unsigned short value )
-            throw ( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void writeUnsignedShort( unsigned short value ) = 0;
 
         /**
          * Reads a 32 bit signed integer from the Bytes message stream
@@ -413,9 +380,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readInt() const throw ( cms::MessageEOFException,
-                                            cms::MessageNotReadableException,
-                                            cms::CMSException ) = 0;
+        virtual int readInt() const = 0;
 
         /**
          * Writes a signed int to the bytes message stream as a 4 byte value
@@ -427,8 +392,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeInt( int value ) throw ( cms::MessageNotWriteableException,
-                                                   cms::CMSException ) = 0;
+        virtual void writeInt( int value ) = 0;
 
         /**
          * Reads a 64 bit long from the Bytes message stream
@@ -440,9 +404,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual long long readLong() const throw ( cms::MessageEOFException,
-                                                   cms::MessageNotReadableException,
-                                                   cms::CMSException ) = 0;
+        virtual long long readLong() const = 0;
 
         /**
          * Writes a long long to the bytes message stream as a 8 byte value
@@ -454,8 +416,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeLong( long long value ) throw ( cms::MessageNotWriteableException,
-                                                          cms::CMSException ) = 0;
+        virtual void writeLong( long long value ) = 0;
 
         /**
          * Reads an ASCII String from the Bytes message stream
@@ -467,9 +428,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::string readString() const throw ( cms::MessageEOFException,
-                                                       cms::MessageNotReadableException,
-                                                       cms::CMSException ) = 0;
+        virtual std::string readString() const = 0;
 
         /**
          * Writes an ASCII String to the Bytes message stream
@@ -481,8 +440,7 @@ namespace cms{
          *                        some internal error.
          * @throws MessageNotWriteableException - if the message is in read-only mode.
          */
-        virtual void writeString( const std::string& value )
-            throw ( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void writeString( const std::string& value ) = 0;
 
         /**
          * Reads an UTF String from the BytesMessage stream
@@ -494,9 +452,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::string readUTF() const throw ( cms::MessageEOFException,
-                                                    cms::MessageNotReadableException,
-                                                    cms::CMSException ) = 0;
+        virtual std::string readUTF() const = 0;
 
         /**
          * Writes an UTF String to the BytesMessage stream
@@ -509,8 +465,7 @@ namespace cms{
          * @throws MessageEOFException - if unexpected end of bytes stream has been reached.
          * @throws MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual void writeUTF( const std::string& value )
-            throw ( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void writeUTF( const std::string& value ) = 0;
 
         /**
          * Clones this message.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSProperties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSProperties.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSProperties.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSProperties.h Mon Jun 21 20:32:45 2010
@@ -34,7 +34,15 @@ namespace cms{
     class CMS_API CMSProperties {
     public:
 
-        virtual ~CMSProperties(){}
+        virtual ~CMSProperties() throw() {}
+
+        /**
+         * Returns the current count of all the Properties that are currently stored in
+         * the Properties object.
+         *
+         * @return the number of properties currently stored.
+         */
+        virtual int size() const = 0;
 
         /**
          * Returns true if the properties object is empty
@@ -63,9 +71,8 @@ namespace cms{
          * @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 = 0;
 
         /**
          * Sets the value for a given property.  If the property already
@@ -76,9 +83,8 @@ namespace cms{
          * @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 ) = 0;
 
         /**
          * Check to see if the Property exists in the set
@@ -90,12 +96,24 @@ namespace cms{
         virtual bool hasProperty( const std::string& name ) const = 0;
 
         /**
-         * Removes the property with the given name.
+         * Removes the property with the given name.  If the property existed in the
+         * collection then it is removed and returned, otherwise an empty string is
+         * returned.
          *
          * @param name
-         *      the name of the property to be removed.s
+         *      the name of the property to be removed.
+         *
+         * @returns the value that was removed from the Properties, or empty string.
+         */
+        virtual std::string remove( const std::string& name ) = 0;
+
+        /**
+         * Returns a vector containing all the names of the properties currently stored
+         * in the Properties object.
+         *
+         * @returns an STL std::vector<std::string> with all the currently stored property names.
          */
-        virtual void remove( const std::string& name ) = 0;
+        virtual std::vector<std::string> propertyNames() const = 0;
 
         /**
          * Method that serializes the contents of the property map to

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Closeable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Closeable.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Closeable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Closeable.h Mon Jun 21 20:32:45 2010
@@ -36,7 +36,7 @@ namespace cms{
 
     public:
 
-        virtual ~Closeable() {}
+        virtual ~Closeable() throw() {}
 
         /**
          * Closes this object and deallocates the appropriate resources.
@@ -44,7 +44,7 @@ namespace cms{
          *
          * @throws CMSException - If an error occurs while the resource is being closed.
          */
-        virtual void close() throw( CMSException ) = 0;
+        virtual void close() = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h Mon Jun 21 20:32:45 2010
@@ -72,16 +72,15 @@ namespace cms{
     {
     public:
 
-        virtual ~Connection() {}
+        virtual ~Connection() throw() {}
 
         /**
-         * Closes this connection as well as any Sessions
-         * created from it (and those Sessions' consumers and
-         * producers).
+         * Closes this connection as well as any Sessions created from it
+         * (and those Sessions' consumers and producers).
          *
          * @throws CMSException
          */
-        virtual void close() throw( CMSException ) = 0;
+        virtual void close() = 0;
 
         /**
          * Gets the metadata for this connection.
@@ -94,14 +93,14 @@ namespace cms{
          * @see ConnectionMetaData
          * @since 2.0
          */
-        virtual const ConnectionMetaData* getMetaData() const throw( CMSException ) = 0;
+        virtual const ConnectionMetaData* getMetaData() const = 0;
 
         /**
          * Creates an AUTO_ACKNOWLEDGE Session.
          *
          * @throws CMSException
          */
-        virtual Session* createSession() throw ( CMSException ) = 0;
+        virtual Session* createSession() = 0;
 
         /**
          * Creates a new Session to work for this Connection using the
@@ -109,10 +108,10 @@ namespace cms{
          *
          * @param ackMode
          *        the Acknowledgment Mode to use.
+         *
          * @throws CMSException
          */
-        virtual Session* createSession( Session::AcknowledgeMode ackMode )
-            throw ( CMSException ) = 0;
+        virtual Session* createSession( Session::AcknowledgeMode ackMode ) = 0;
 
         /**
          * Get the Client Id for this session, the client Id is provider specific and is either

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionFactory.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionFactory.h Mon Jun 21 20:32:45 2010
@@ -38,7 +38,7 @@ namespace cms{
     class CMS_API ConnectionFactory {
     public:
 
-        virtual ~ConnectionFactory() {}
+        virtual ~ConnectionFactory() throw() {}
 
         /**
          * Creates a connection with the default user identity. The
@@ -51,7 +51,7 @@ namespace cms{
          *
          * @throws CMSException if an internal error occurs while creating the Connection.
          */
-        virtual Connection* createConnection() throw ( CMSException ) = 0;
+        virtual Connection* createConnection() = 0;
 
         /**
          * Creates a connection with the default specified identity. The
@@ -72,8 +72,7 @@ namespace cms{
          * @throws CMSException if an internal error occurs while creating the Connection.
          */
         virtual cms::Connection* createConnection( const std::string& username,
-                                                   const std::string& password )
-            throw ( cms::CMSException ) = 0;
+                                                   const std::string& password ) = 0;
 
         /**
          * Creates a connection with the specified user identity. The
@@ -98,8 +97,7 @@ namespace cms{
          */
         virtual cms::Connection* createConnection( const std::string& username,
                                                    const std::string& password,
-                                                   const std::string& clientId )
-            throw ( cms::CMSException ) = 0;
+                                                   const std::string& clientId ) = 0;
 
     public:
 
@@ -118,8 +116,7 @@ namespace cms{
          *
          * @throws CMSException if an internal error occurs while creating the ConnectionFactory.
          */
-        static ConnectionFactory* createCMSConnectionFactory( const std::string& brokerURI )
-            throw ( cms::CMSException );
+        static ConnectionFactory* createCMSConnectionFactory( const std::string& brokerURI );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionMetaData.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionMetaData.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionMetaData.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionMetaData.h Mon Jun 21 20:32:45 2010
@@ -31,7 +31,7 @@ namespace cms{
     class CMS_API ConnectionMetaData {
     public:
 
-        virtual ~ConnectionMetaData() {}
+        virtual ~ConnectionMetaData() throw() {}
 
         /**
          * Gets the CMS API version.
@@ -41,7 +41,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual std::string getCMSVersion() const throw( cms::CMSException ) = 0;
+        virtual std::string getCMSVersion() const = 0;
 
         /**
          * Gets the CMS major version number.
@@ -51,7 +51,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual int getCMSMajorVersion() const throw( cms::CMSException ) = 0;
+        virtual int getCMSMajorVersion() const = 0;
 
         /**
          * Gets the CMS minor version number.
@@ -61,7 +61,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual int getCMSMinorVersion() const throw( cms::CMSException ) = 0;
+        virtual int getCMSMinorVersion() const = 0;
 
         /**
          * Gets the CMS provider name.
@@ -71,7 +71,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual std::string getCMSProviderName() const throw( cms::CMSException ) = 0;
+        virtual std::string getCMSProviderName() const = 0;
 
         /**
          * Gets the CMS provider version.
@@ -81,7 +81,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual std::string getProviderVersion() const throw( cms::CMSException ) = 0;
+        virtual std::string getProviderVersion() const = 0;
 
         /**
          * Gets the CMS provider major version number.
@@ -91,7 +91,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual int getProviderMajorVersion() const throw( cms::CMSException ) = 0;
+        virtual int getProviderMajorVersion() const = 0;
 
         /**
          * Gets the CMS provider minor version number.
@@ -101,7 +101,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual int getProviderMinorVersion() const throw( cms::CMSException ) = 0;
+        virtual int getProviderMinorVersion() const = 0;
 
         /**
          * Gets an Vector of the CMSX property names.
@@ -111,7 +111,7 @@ namespace cms{
          * @throw CMSException
          *        If the CMS Provider fails to retrieve the metadata due to some internal error.
          */
-        virtual std::vector<std::string> getCMSXPropertyNames() const throw( cms::CMSException ) = 0;
+        virtual std::vector<std::string> getCMSXPropertyNames() const = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h Mon Jun 21 20:32:45 2010
@@ -48,7 +48,7 @@ namespace cms{
 
     public:
 
-        virtual ~Destination(){}
+        virtual ~Destination() throw() {}
 
         /**
          * Retrieve the Destination Type for this Destination

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MapMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MapMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MapMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MapMessage.h Mon Jun 21 20:32:45 2010
@@ -71,7 +71,7 @@ namespace cms{
     class CMS_API MapMessage : public Message {
     public:
 
-        virtual ~MapMessage() {}
+        virtual ~MapMessage() throw() {}
 
         /**
          * Returns an Enumeration of all the names in the MapMessage
@@ -82,7 +82,7 @@ namespace cms{
          *
          * @throws CMSException - if the operation fails due to an internal error.
          */
-        virtual std::vector< std::string > getMapNames() const throw( CMSException ) = 0;
+        virtual std::vector< std::string > getMapNames() const = 0;
 
         /**
          * Indicates whether an item exists in this MapMessage object.
@@ -93,7 +93,7 @@ namespace cms{
          *
          * @throws CMSException - if the operation fails due to an internal error.
          */
-        virtual bool itemExists( const std::string& name ) const throw( CMSException ) = 0;
+        virtual bool itemExists( const std::string& name ) const = 0;
 
         /**
          * Returns the Boolean value of the Specified name
@@ -102,10 +102,9 @@ namespace cms{
          *      Name of the value to fetch from the map
          *
          * @throws CMSException - if the operation fails due to an internal error.
-         * @throws MessageFormatExceptio - if this type conversion is invalid.
+         * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual bool getBoolean( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual bool getBoolean( const std::string& name ) const = 0;
 
         /**
          * Sets a boolean value with the specified name into the Map.
@@ -118,8 +117,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWritableException - if the Message is in Read-only Mode.
          */
-        virtual void setBoolean( const std::string& name, bool value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setBoolean( const std::string& name, bool value ) = 0;
 
         /**
          * Returns the Byte value of the Specified name
@@ -130,8 +128,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual unsigned char getByte( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual unsigned char getByte( const std::string& name ) const = 0;
 
         /**
          * Sets a Byte value with the specified name into the Map.
@@ -144,8 +141,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setByte( const std::string& name, unsigned char value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setByte( const std::string& name, unsigned char value ) = 0;
 
         /**
          * Returns the Bytes value of the Specified name
@@ -156,8 +152,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual std::vector<unsigned char> getBytes( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual std::vector<unsigned char> getBytes( const std::string& name ) const = 0;
 
         /**
          * Sets a Bytes value with the specified name into the Map.
@@ -171,8 +166,7 @@ namespace cms{
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
         virtual void setBytes( const std::string& name,
-                               const std::vector<unsigned char>& value )
-                                    throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+                               const std::vector<unsigned char>& value ) = 0;
 
         /**
          * Returns the Char value of the Specified name
@@ -183,8 +177,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual char getChar( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual char getChar( const std::string& name ) const = 0;
 
         /**
          * Sets a Char value with the specified name into the Map.
@@ -197,8 +190,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setChar( const std::string& name, char value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setChar( const std::string& name, char value ) = 0;
 
         /**
          * Returns the Double value of the Specified name
@@ -209,8 +201,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual double getDouble( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual double getDouble( const std::string& name ) const = 0;
 
         /**
          * Sets a Double value with the specified name into the Map.
@@ -223,8 +214,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setDouble( const std::string& name, double value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setDouble( const std::string& name, double value ) = 0;
 
         /**
          * Returns the Float value of the Specified name
@@ -235,8 +225,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual float getFloat( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual float getFloat( const std::string& name ) const = 0;
 
         /**
          * Sets a Float value with the specified name into the Map.
@@ -249,8 +238,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setFloat( const std::string& name, float value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setFloat( const std::string& name, float value ) = 0;
 
         /**
          * Returns the Int value of the Specified name
@@ -261,8 +249,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual int getInt( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual int getInt( const std::string& name ) const = 0;
 
         /**
          * Sets a Int value with the specified name into the Map.
@@ -275,8 +262,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setInt( const std::string& name, int value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setInt( const std::string& name, int value ) = 0;
 
         /**
          * Returns the Long value of the Specified name
@@ -287,8 +273,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual long long getLong( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual long long getLong( const std::string& name ) const = 0;
 
         /**
          * Sets a Long value with the specified name into the Map.
@@ -301,8 +286,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setLong( const std::string& name, long long value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setLong( const std::string& name, long long value ) = 0;
 
         /**
          * Returns the Short value of the Specified name
@@ -313,8 +297,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual short getShort( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual short getShort( const std::string& name ) const = 0;
 
         /**
          * Sets a Short value with the specified name into the Map.
@@ -327,8 +310,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setShort( const std::string& name, short value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setShort( const std::string& name, short value ) = 0;
 
         /**
          * Returns the String value of the Specified name
@@ -339,8 +321,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual std::string getString( const std::string& name ) const
-            throw( cms::MessageFormatException, cms::CMSException ) = 0;
+        virtual std::string getString( const std::string& name ) const = 0;
 
         /**
          * Sets a String value with the specified name into the Map.
@@ -353,8 +334,7 @@ namespace cms{
          * @throws CMSException - if the operation fails due to an internal error.
          * @throws MessageNotWriteableException - if the Message is in Read-only Mode.
          */
-        virtual void setString( const std::string& name, const std::string& value )
-            throw( cms::MessageNotWriteableException, cms::CMSException ) = 0;
+        virtual void setString( const std::string& name, const std::string& value ) = 0;
 
     };