activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r956683 [1/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...
Date Mon, 21 Jun 2010 20:32:48 GMT
Author: tabish
Date: Mon Jun 21 20:32:45 2010
New Revision: 956683

URL: http://svn.apache.org/viewvc?rev=956683&view=rev
Log:
Updates to the CMS API.

Removes all throw specifiers except the nothrow specifier for destructors, this allows all CMSExceptoin types to be thrown without being downcast into CMSExceptions.
Adds propertyNmaes and size method to the CMSProperties interface.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DestinationResolver.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/MessageCreator.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ProducerCallback.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionCallback.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBlobMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQQueueBrowser.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/ActiveMQProperties.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSProperties.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Closeable.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ConnectionMetaData.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Destination.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MapMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageEnumeration.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageListener.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/ObjectMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Queue.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/QueueBrowser.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Startable.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Stoppable.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryTopic.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TextMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Topic.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/CmsTemplateTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/SlowListenerTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireClientAckTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireTempDestinationTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsAccessorTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsDestinationAccessorTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsTemplateTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnection.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnectionFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessageCreator.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.cpp Mon Jun 21 20:32:45 2010
@@ -56,7 +56,7 @@ AdvisoryConsumer::AdvisoryConsumer( cms:
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-AdvisoryConsumer::~AdvisoryConsumer() {
+AdvisoryConsumer::~AdvisoryConsumer() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ void AdvisoryConsumer::close() throw( cm
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void AdvisoryConsumer::onMessage( const cms::Message* message ) {
+void AdvisoryConsumer::onMessage( const cms::Message* message ) throw() {
 
     if( message->getCMSType() == "Advisory" ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryConsumer.h Mon Jun 21 20:32:45 2010
@@ -50,7 +50,7 @@ namespace advisories {
     public:
 
         AdvisoryConsumer( cms::Session* session );
-        virtual ~AdvisoryConsumer();
+        virtual ~AdvisoryConsumer() throw();
 
         /**
          * Close down Consumer resources.
@@ -60,7 +60,7 @@ namespace advisories {
         /**
          * Async Message callback.
          */
-        virtual void onMessage( const cms::Message* message );
+        virtual void onMessage( const cms::Message* message ) throw();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.cpp Mon Jun 21 20:32:45 2010
@@ -54,7 +54,7 @@ AdvisoryProducer::AdvisoryProducer( cms:
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-AdvisoryProducer::~AdvisoryProducer() {
+AdvisoryProducer::~AdvisoryProducer() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ void AdvisoryProducer::run() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void AdvisoryProducer::onMessage( const cms::Message* message ) {
+void AdvisoryProducer::onMessage( const cms::Message* message ) throw() {
 
     if( message->getCMSType() == "Advisory" ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/AdvisoryProducer.h Mon Jun 21 20:32:45 2010
@@ -56,7 +56,7 @@ namespace advisories {
     public:
 
         AdvisoryProducer( cms::Session* session );
-        virtual ~AdvisoryProducer();
+        virtual ~AdvisoryProducer() throw();
 
         /**
          * Shut down the processing that occurs in the Run method.
@@ -71,7 +71,7 @@ namespace advisories {
         /**
          * Async Message callback.
          */
-        virtual void onMessage( const cms::Message* message );
+        virtual void onMessage( const cms::Message* message ) throw();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp Mon Jun 21 20:32:45 2010
@@ -55,11 +55,11 @@ TempDestinationAdvisoryConsumer::TempDes
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-TempDestinationAdvisoryConsumer::~TempDestinationAdvisoryConsumer() {
+TempDestinationAdvisoryConsumer::~TempDestinationAdvisoryConsumer() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) {
+void TempDestinationAdvisoryConsumer::onMessage( const cms::Message* message ) throw() {
 
     if( message->getCMSType() == "Advisory" ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h Mon Jun 21 20:32:45 2010
@@ -51,12 +51,12 @@ namespace advisories {
     public:
 
         TempDestinationAdvisoryConsumer( cms::Session* session );
-        virtual ~TempDestinationAdvisoryConsumer();
+        virtual ~TempDestinationAdvisoryConsumer() throw();
 
         /**
          * Async Message callback.
          */
-        virtual void onMessage( const cms::Message* message );
+        virtual void onMessage( const cms::Message* message ) throw();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/consumers/SimpleAsyncConsumer.cpp Mon Jun 21 20:32:45 2010
@@ -77,7 +77,7 @@ public:
         this->clientAck = clientAck;
     }
 
-    virtual ~SimpleAsyncConsumer(){
+    virtual ~SimpleAsyncConsumer() throw() {
         this->cleanup();
     }
 
@@ -130,7 +130,7 @@ public:
     }
 
     // Called from the consumer since this class is a registered MessageListener.
-    virtual void onMessage( const Message* message ){
+    virtual void onMessage( const Message* message ) throw() {
 
         static int count = 0;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp Mon Jun 21 20:32:45 2010
@@ -200,7 +200,7 @@ public:
         this->sessionTransacted = sessionTransacted;
         this->brokerURI = brokerURI;
     }
-    virtual ~HelloWorldConsumer(){
+    virtual ~HelloWorldConsumer() throw() {
         cleanup();
     }
 
@@ -263,7 +263,7 @@ public:
     }
 
     // Called from the consumer since this class is a registered MessageListener.
-    virtual void onMessage( const Message* message ){
+    virtual void onMessage( const Message* message ) throw() {
 
         static int count = 0;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.cpp Mon Jun 21 20:32:45 2010
@@ -47,7 +47,7 @@ Chat::Chat() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Chat::~Chat() {
+Chat::~Chat() throw() {
 
     try {
 
@@ -164,7 +164,7 @@ void Chat::run() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Chat::onMessage( const cms::Message* message ) {
+void Chat::onMessage( const cms::Message* message ) throw() {
 
     // Cast the message as a TextMessage if possible.
     try {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/topics/chat/Chat.h Mon Jun 21 20:32:45 2010
@@ -57,9 +57,9 @@ namespace chat{
     public:
 
         Chat();
-        virtual ~Chat();
+        virtual ~Chat() throw();
 
-        virtual void onMessage( const cms::Message* message );
+        virtual void onMessage( const cms::Message* message ) throw();
         virtual void onException( const cms::CMSException& ex );
 
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h Mon Jun 21 20:32:45 2010
@@ -42,39 +42,37 @@ namespace cmsutil {
         CachedConsumer( cms::MessageConsumer* consumer ) : consumer( consumer ) {
         }
 
-        virtual ~CachedConsumer() {}
+        virtual ~CachedConsumer() throw() {}
 
         /**
          * Does nothing - the real producer resource will be closed
          * by the lifecycle manager.
          */
-        virtual void close() throw( cms::CMSException ){
+        virtual void close() {
             // Do nothing.
         }
 
-        virtual cms::Message* receive() throw ( cms::CMSException ) {
+        virtual cms::Message* receive() {
             return consumer->receive();
         }
 
-        virtual cms::Message* receive( int millisecs ) throw ( cms::CMSException ) {
+        virtual cms::Message* receive( int millisecs ) {
             return consumer->receive(millisecs);
         }
 
-        virtual cms::Message* receiveNoWait() throw ( cms::CMSException ) {
+        virtual cms::Message* receiveNoWait() {
             return consumer->receiveNoWait();
         }
 
-        virtual void setMessageListener( cms::MessageListener* listener ) throw ( cms::CMSException ) {
+        virtual void setMessageListener( cms::MessageListener* listener ) {
             consumer->setMessageListener( listener );
         }
 
-        virtual cms::MessageListener* getMessageListener() const throw ( cms::CMSException ) {
+        virtual cms::MessageListener* getMessageListener() const {
             return consumer->getMessageListener();
         }
 
-        virtual std::string getMessageSelector() const
-            throw ( cms::CMSException ) {
-
+        virtual std::string getMessageSelector() const {
             return consumer->getMessageSelector();
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h Mon Jun 21 20:32:45 2010
@@ -42,79 +42,77 @@ namespace cmsutil {
         CachedProducer( cms::MessageProducer* producer ) : producer( producer ) {
         }
 
-        virtual ~CachedProducer() {}
+        virtual ~CachedProducer() throw() {}
 
         /**
          * Does nothing - the real producer resource will be closed
          * by the lifecycle manager.
          */
-        virtual void close() throw( cms::CMSException ){
+        virtual void close() {
             // Do nothing.
         }
 
-        virtual void send( cms::Message* message ) throw ( cms::CMSException ){
+        virtual void send( cms::Message* message ) {
             producer->send( message );
         }
 
         virtual void send( cms::Message* message, int deliveryMode,
-                           int priority, long long timeToLive )
-            throw ( cms::CMSException ){
+                           int priority, long long timeToLive ) {
 
             producer->send( message, deliveryMode, priority, timeToLive );
         }
 
 
         virtual void send( const cms::Destination* destination,
-                           cms::Message* message ) throw ( cms::CMSException ){
+                           cms::Message* message ) {
 
             producer->send( destination, message );
         }
 
         virtual void send( const cms::Destination* destination,
                            cms::Message* message, int deliveryMode,
-                           int priority, long long timeToLive )
-            throw ( cms::CMSException ){
+                           int priority, long long timeToLive ) {
 
             producer->send( destination, message, deliveryMode, priority, timeToLive );
         }
 
-        virtual void setDeliveryMode( int mode ) throw ( cms::CMSException ) {
+        virtual void setDeliveryMode( int mode ) {
             producer->setDeliveryMode( mode );
         }
 
-        virtual int getDeliveryMode() const throw ( cms::CMSException ) {
+        virtual int getDeliveryMode() const {
             return producer->getDeliveryMode();
         }
 
-        virtual void setDisableMessageID( bool value ) throw ( cms::CMSException ) {
+        virtual void setDisableMessageID( bool value ) {
             producer->setDisableMessageID( value );
         }
 
-        virtual bool getDisableMessageID() const throw ( cms::CMSException ) {
+        virtual bool getDisableMessageID() const {
             return producer->getDisableMessageID();
         }
 
-        virtual void setDisableMessageTimeStamp( bool value ) throw ( cms::CMSException ) {
+        virtual void setDisableMessageTimeStamp( bool value ) {
             producer->setDisableMessageTimeStamp( value );
         }
 
-        virtual bool getDisableMessageTimeStamp() const throw ( cms::CMSException ) {
+        virtual bool getDisableMessageTimeStamp() const {
             return producer->getDisableMessageTimeStamp();
         }
 
-        virtual void setPriority( int priority ) throw ( cms::CMSException ) {
+        virtual void setPriority( int priority ) {
             producer->setPriority( priority );
         }
 
-        virtual int getPriority() const throw ( cms::CMSException ) {
+        virtual int getPriority() const {
             return producer->getPriority();
         }
 
-        virtual void setTimeToLive( long long time ) throw ( cms::CMSException ) {
+        virtual void setTimeToLive( long long time ) {
             producer->setTimeToLive( time );
         }
 
-        virtual long long getTimeToLive() const throw ( cms::CMSException ) {
+        virtual long long getTimeToLive() const {
             return producer->getTimeToLive();
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp Mon Jun 21 20:32:45 2010
@@ -35,8 +35,11 @@ CmsAccessor::~CmsAccessor() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Connection* CmsAccessor::createConnection()
-    throw ( cms::CMSException,IllegalStateException ) {
+void CmsAccessor::init() {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+cms::Connection* CmsAccessor::createConnection() {
 
     try {
 
@@ -55,8 +58,7 @@ cms::Connection* CmsAccessor::createConn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Session* CmsAccessor::createSession( cms::Connection* con )
-    throw ( cms::CMSException,IllegalStateException ) {
+cms::Session* CmsAccessor::createSession( cms::Connection* con ) {
 
     try {
 
@@ -79,7 +81,7 @@ cms::Session* CmsAccessor::createSession
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsAccessor::checkConnectionFactory() throw ( IllegalStateException ) {
+void CmsAccessor::checkConnectionFactory() {
     if( getConnectionFactory() == NULL ) {
         throw IllegalStateException(
             __FILE__, __LINE__,

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h Mon Jun 21 20:32:45 2010
@@ -92,7 +92,9 @@ namespace cmsutil {
          * Set the CMS acknowledgment mode that is used when creating a CMS
          * Session to send a message.
          * <p>Default is <code>AUTO_ACKNOWLEDGE</code>.
-         * @param sessionAcknowledgeMode the acknowledgment mode
+         *
+         * @param sessionAcknowledgeMode
+         *      The acknowledgment mode to assign to the Session.
          */
         virtual void setSessionAcknowledgeMode(
                 cms::Session::AcknowledgeMode sessionAcknowledgeMode ) {
@@ -101,6 +103,7 @@ namespace cmsutil {
 
         /**
          * Return the acknowledgment mode for CMS sessions.
+         *
          * @return the acknowledgment mode applied by this accessor
          */
         virtual cms::Session::AcknowledgeMode getSessionAcknowledgeMode() const {
@@ -112,40 +115,51 @@ namespace cmsutil {
         /**
          * Initializes this object and prepares it for use.  This should be called
          * before any other methods are called.  This version does nothing.
+         *
+         * @throws CMSException if an error occurs during initialization.
+         * @throws IllegalStateException if this object has already been initialized.
          */
-        virtual void init()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException ) {}
+        virtual void init();
 
         /**
          * Shuts down this object and destroys any allocated resources.
+         *
+         * @throws CMSException if an error occurs during destruction.
+         * @throws IllegalStateException if this object has already been destroyed.
          */
-        virtual void destroy()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException ) {
+        virtual void destroy() {
             resourceLifecycleManager.destroy();
         }
 
         /**
          * Create a CMS Connection via this template's ConnectionFactory.
+         *
          * @return the new CMS Connection
-         * @throws cms::CMSException if thrown by CMS API methods
+         *
+         * @throws CMSException if thrown by CMS API methods
+         * @throws IllegalStateException if this object has not been initialized.
          */
-        virtual cms::Connection* createConnection()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
+        virtual cms::Connection* createConnection();
 
         /**
          * Create a CMS Session for the given Connection.
-         * @param con the CMS Connection to create a Session for
+         *
+         * @param con
+         *      The CMS Connection to create a Session for
+         *
          * @return the new CMS Session
-         * @throws cms::CMSException if thrown by CMS API methods
+         *
+         * @throws CMSException if thrown by CMS API methods
+         * @throws IllegalStateException if this object has not been initialized.
          */
-        virtual cms::Session* createSession( cms::Connection* con )
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
+        virtual cms::Session* createSession( cms::Connection* con );
 
         /**
          * Verifies that the connection factory is valid.
+         *
+         * @throws IllegalStateException if this object has not been initialized.
          */
-        virtual void checkConnectionFactory()
-            throw ( decaf::lang::exceptions::IllegalStateException );
+        virtual void checkConnectionFactory();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp Mon Jun 21 20:32:45 2010
@@ -34,8 +34,7 @@ CmsDestinationAccessor::~CmsDestinationA
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsDestinationAccessor::init()
-    throw ( cms::CMSException, IllegalStateException ) {
+void CmsDestinationAccessor::init() {
 
     CmsAccessor::init();
 
@@ -47,8 +46,7 @@ void CmsDestinationAccessor::init()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsDestinationAccessor::destroy()
-    throw ( cms::CMSException, IllegalStateException ) {
+void CmsDestinationAccessor::destroy() {
 
     if( destinationResolver != NULL ) {
         destinationResolver->destroy();
@@ -58,10 +56,8 @@ void CmsDestinationAccessor::destroy()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Destination* CmsDestinationAccessor::resolveDestinationName(
-    cms::Session* session,
-    const std::string& destName )
-        throw ( cms::CMSException, IllegalStateException ) {
+cms::Destination* CmsDestinationAccessor::resolveDestinationName( cms::Session* session,
+                                                                  const std::string& destName ) {
 
     checkDestinationResolver();
 
@@ -70,8 +66,7 @@ cms::Destination* CmsDestinationAccessor
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsDestinationAccessor::checkDestinationResolver()
-    throw ( IllegalStateException ) {
+void CmsDestinationAccessor::checkDestinationResolver() {
 
     if( getDestinationResolver() == NULL ) {
         throw IllegalStateException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h Mon Jun 21 20:32:45 2010
@@ -83,39 +83,14 @@ namespace cmsutil {
 
     protected:
 
-        /**
-         * Initializes the destination resolver.
-         */
-        virtual void init()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
-
-        /**
-         * Calls destroy() on the destination resolver.
-         */
-        virtual void destroy()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
-
-        /**
-         * Resolves the destination via the <code>DestinationResolver</code>.
-         * @param session
-         *      the session
-         * @param destName
-         *      the name of the destination.
-         * @return the destination
-         * @throws cms::CMSException if resolution failed.
-         * @throws decaf::lang::exceptions::IllegalStateException if the destination
-         *      resolver property is NULL.
-         */
-        virtual cms::Destination* resolveDestinationName(
-            cms::Session* session,
-            const std::string& destName )
-                throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
-
-        /**
-         * Verifies that the destination resolver is valid.
-         */
-        virtual void checkDestinationResolver()
-            throw ( decaf::lang::exceptions::IllegalStateException );
+        virtual void init();
+
+        virtual void destroy();
+
+        virtual cms::Destination* resolveDestinationName( cms::Session* session,
+                                                          const std::string& destName );
+
+        virtual void checkDestinationResolver();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp Mon Jun 21 20:32:45 2010
@@ -82,7 +82,7 @@ CmsTemplate::CmsTemplate( cms::Connectio
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CmsTemplate::~CmsTemplate() {
+CmsTemplate::~CmsTemplate() throw() {
 
     try {
         destroy();
@@ -143,7 +143,7 @@ void CmsTemplate::destroySessionPools() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::init() throw ( cms::CMSException, IllegalStateException ) {
+void CmsTemplate::init() {
 
     try {
 
@@ -161,7 +161,7 @@ void CmsTemplate::init() throw ( cms::CM
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::destroy() throw ( cms::CMSException, IllegalStateException ) {
+void CmsTemplate::destroy() {
 
     try {
 
@@ -186,7 +186,7 @@ void CmsTemplate::destroy() throw ( cms:
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::checkDefaultDestination() throw ( IllegalStateException ) {
+void CmsTemplate::checkDefaultDestination() {
     if( this->defaultDestination == NULL && this->defaultDestinationName.size()==0 ) {
         throw IllegalStateException(
             __FILE__, __LINE__,
@@ -196,8 +196,7 @@ void CmsTemplate::checkDefaultDestinatio
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Destination* CmsTemplate::resolveDefaultDestination( cms::Session* session )
-    throw ( cms::CMSException ) {
+cms::Destination* CmsTemplate::resolveDefaultDestination( cms::Session* session ) {
 
     try {
 
@@ -223,8 +222,7 @@ cms::Destination* CmsTemplate::resolveDe
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Connection* CmsTemplate::getConnection()
-    throw ( cms::CMSException ) {
+cms::Connection* CmsTemplate::getConnection() {
 
     try {
 
@@ -261,8 +259,7 @@ cms::Connection* CmsTemplate::getConnect
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-PooledSession* CmsTemplate::takeSession()
-    throw ( cms::CMSException ) {
+PooledSession* CmsTemplate::takeSession() {
 
     try {
 
@@ -278,8 +275,7 @@ PooledSession* CmsTemplate::takeSession(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::returnSession( PooledSession*& session )
-    throw ( cms::CMSException ) {
+void CmsTemplate::returnSession( PooledSession*& session ) {
 
     try {
 
@@ -297,7 +293,7 @@ void CmsTemplate::returnSession( PooledS
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::MessageProducer* CmsTemplate::createProducer(
-    cms::Session* session, cms::Destination* dest) throw ( cms::CMSException ) {
+    cms::Session* session, cms::Destination* dest ) {
 
     try {
 
@@ -330,8 +326,7 @@ cms::MessageProducer* CmsTemplate::creat
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::MessageConsumer* CmsTemplate::createConsumer(
-    cms::Session* session, cms::Destination* dest, const std::string& selector, bool noLocal )
-        throw ( cms::CMSException ) {
+    cms::Session* session, cms::Destination* dest, const std::string& selector, bool noLocal ) {
 
     try {
 
@@ -359,8 +354,7 @@ cms::MessageConsumer* CmsTemplate::creat
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::destroyProducer( cms::MessageProducer*& producer )
-    throw ( cms::CMSException ) {
+void CmsTemplate::destroyProducer( cms::MessageProducer*& producer ) {
 
     if( producer == NULL ) {
         return;
@@ -383,8 +377,7 @@ void CmsTemplate::destroyProducer( cms::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::destroyConsumer( cms::MessageConsumer*& consumer )
-    throw ( cms::CMSException ) {
+void CmsTemplate::destroyConsumer( cms::MessageConsumer*& consumer ) {
 
     if( consumer == NULL ) {
         return;
@@ -407,7 +400,7 @@ void CmsTemplate::destroyConsumer( cms::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::destroyMessage( cms::Message*& message) {
+void CmsTemplate::destroyMessage( cms::Message*& message ) {
 
     if( message == NULL ) {
         return;
@@ -419,7 +412,7 @@ void CmsTemplate::destroyMessage( cms::M
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::execute( SessionCallback* action ) throw ( cms::CMSException ) {
+void CmsTemplate::execute( SessionCallback* action ) {
 
     PooledSession* pooledSession = NULL;
 
@@ -447,7 +440,7 @@ void CmsTemplate::execute( SessionCallba
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::execute( ProducerCallback* action ) throw ( cms::CMSException ) {
+void CmsTemplate::execute( ProducerCallback* action ) {
 
     try {
 
@@ -466,8 +459,7 @@ void CmsTemplate::execute( ProducerCallb
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::execute( cms::Destination* dest, ProducerCallback* action )
-    throw ( cms::CMSException ) {
+void CmsTemplate::execute( cms::Destination* dest, ProducerCallback* action ) {
 
     try {
 
@@ -486,8 +478,7 @@ void CmsTemplate::execute( cms::Destinat
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::execute( const std::string& destinationName, ProducerCallback* action )
-    throw ( cms::CMSException ) {
+void CmsTemplate::execute( const std::string& destinationName, ProducerCallback* action ) {
 
     try {
 
@@ -506,8 +497,7 @@ void CmsTemplate::execute( const std::st
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::ProducerExecutor::doInCms( cms::Session* session )
-    throw ( cms::CMSException ) {
+void CmsTemplate::ProducerExecutor::doInCms( cms::Session* session ) {
 
     cms::MessageProducer* producer = NULL;
 
@@ -532,8 +522,7 @@ void CmsTemplate::ProducerExecutor::doIn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Destination* CmsTemplate::ResolveProducerExecutor::getDestination(
-    cms::Session* session ) throw ( cms::CMSException ) {
+cms::Destination* CmsTemplate::ResolveProducerExecutor::getDestination( cms::Session* session ) {
 
     try {
         return parent->resolveDestinationName( session, destinationName );
@@ -544,8 +533,7 @@ cms::Destination* CmsTemplate::ResolvePr
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::send( MessageCreator* messageCreator )
-    throw ( cms::CMSException ) {
+void CmsTemplate::send( MessageCreator* messageCreator ) {
 
     try {
         SendExecutor senderExecutor( messageCreator, this );
@@ -556,8 +544,7 @@ void CmsTemplate::send( MessageCreator* 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::send( cms::Destination* dest, MessageCreator* messageCreator )
-    throw ( cms::CMSException ) {
+void CmsTemplate::send( cms::Destination* dest, MessageCreator* messageCreator ) {
 
     try {
         SendExecutor senderExecutor( messageCreator, this );
@@ -569,8 +556,7 @@ void CmsTemplate::send( cms::Destination
 
 ////////////////////////////////////////////////////////////////////////////////
 void CmsTemplate::send( const std::string& destinationName,
-                        MessageCreator* messageCreator )
-    throw ( cms::CMSException ) {
+                        MessageCreator* messageCreator ) {
 
     try {
         SendExecutor senderExecutor( messageCreator, this );
@@ -583,7 +569,7 @@ void CmsTemplate::send( const std::strin
 ////////////////////////////////////////////////////////////////////////////////
 void CmsTemplate::doSend( cms::Session* session,
                           cms::MessageProducer* producer,
-                          MessageCreator* messageCreator) throw ( cms::CMSException ) {
+                          MessageCreator* messageCreator) {
 
     cms::Message* message = NULL;
 
@@ -618,8 +604,7 @@ void CmsTemplate::doSend( cms::Session* 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Message* CmsTemplate::doReceive( cms::MessageConsumer* consumer )
-    throw ( cms::CMSException ) {
+cms::Message* CmsTemplate::doReceive( cms::MessageConsumer* consumer ) {
 
     try {
 
@@ -647,8 +632,7 @@ cms::Message* CmsTemplate::doReceive( cm
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CmsTemplate::ReceiveExecutor::doInCms( cms::Session* session )
-    throw ( cms::CMSException ) {
+void CmsTemplate::ReceiveExecutor::doInCms( cms::Session* session ) {
 
     cms::MessageConsumer* consumer = NULL;
     message = NULL;
@@ -677,7 +661,7 @@ void CmsTemplate::ReceiveExecutor::doInC
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Destination* CmsTemplate::ResolveReceiveExecutor::getDestination(
-    cms::Session* session ) throw ( cms::CMSException ) {
+    cms::Session* session ) {
 
     try {
         return parent->resolveDestinationName( session, destinationName );
@@ -688,7 +672,7 @@ cms::Destination* CmsTemplate::ResolveRe
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Message* CmsTemplate::receive() throw ( cms::CMSException ) {
+cms::Message* CmsTemplate::receive() {
 
     try {
 
@@ -702,8 +686,7 @@ cms::Message* CmsTemplate::receive() thr
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Message* CmsTemplate::receive( cms::Destination* destination )
-    throw ( cms::CMSException ) {
+cms::Message* CmsTemplate::receive( cms::Destination* destination ) {
 
     try {
 
@@ -717,8 +700,7 @@ cms::Message* CmsTemplate::receive( cms:
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Message* CmsTemplate::receive( const std::string& destinationName )
-    throw ( cms::CMSException ) {
+cms::Message* CmsTemplate::receive( const std::string& destinationName ) {
 
     try {
 
@@ -733,8 +715,7 @@ cms::Message* CmsTemplate::receive( cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Message* CmsTemplate::receiveSelected( const std::string& selector )
-    throw ( cms::CMSException ) {
+cms::Message* CmsTemplate::receiveSelected( const std::string& selector ) {
 
     try {
 
@@ -750,8 +731,7 @@ cms::Message* CmsTemplate::receiveSelect
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Message* CmsTemplate::receiveSelected( cms::Destination* destination,
-                                            const std::string& selector )
-    throw ( cms::CMSException ) {
+                                            const std::string& selector ) {
 
     try {
 
@@ -767,8 +747,7 @@ cms::Message* CmsTemplate::receiveSelect
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Message* CmsTemplate::receiveSelected( const std::string& destinationName,
-                                            const std::string& selector )
-    throw ( cms::CMSException ) {
+                                            const std::string& selector ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h Mon Jun 21 20:32:45 2010
@@ -109,12 +109,11 @@ namespace cmsutil {
             : SessionCallback(), action( action ), parent( parent ), destination( destination ) {
             }
 
-            virtual ~ProducerExecutor() {}
+            virtual ~ProducerExecutor() throw() {}
 
-            virtual void doInCms( cms::Session* session ) throw ( cms::CMSException );
+            virtual void doInCms( cms::Session* session );
 
-            virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED )
-                throw ( cms::CMSException ) {
+            virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED ) {
                 return destination;
             }
         };
@@ -141,10 +140,9 @@ namespace cmsutil {
             : ProducerExecutor( action, parent, NULL ), destinationName( destinationName ) {
             }
 
-            virtual ~ResolveProducerExecutor() {}
+            virtual ~ResolveProducerExecutor() throw() {}
 
-            virtual cms::Destination* getDestination( cms::Session* session )
-                throw ( cms::CMSException );
+            virtual cms::Destination* getDestination( cms::Session* session );
         };
 
         /**
@@ -170,10 +168,10 @@ namespace cmsutil {
             : ProducerCallback(), messageCreator( messageCreator ), parent( parent ) {
             }
 
-            virtual ~SendExecutor() {}
+            virtual ~SendExecutor() throw() {}
 
             virtual void doInCms( cms::Session* session,
-                                  cms::MessageProducer* producer ) throw ( cms::CMSException ) {
+                                  cms::MessageProducer* producer ) {
                 parent->doSend( session, producer, messageCreator );
             }
         };
@@ -211,13 +209,11 @@ namespace cmsutil {
               parent( parent ) {
             }
 
-            virtual ~ReceiveExecutor() {}
+            virtual ~ReceiveExecutor() throw() {}
 
-            virtual void doInCms( cms::Session* session )
-                throw (cms::CMSException);
+            virtual void doInCms( cms::Session* session );
 
-            virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED )
-                throw ( cms::CMSException ) {
+            virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED ) {
                 return destination;
             }
 
@@ -250,10 +246,9 @@ namespace cmsutil {
 
             }
 
-            virtual ~ResolveReceiveExecutor() {}
+            virtual ~ResolveReceiveExecutor() throw() {}
 
-            virtual cms::Destination* getDestination( cms::Session* session )
-                throw ( cms::CMSException );
+            virtual cms::Destination* getDestination( cms::Session* session );
         };
 
     private:
@@ -296,7 +291,7 @@ namespace cmsutil {
         CmsTemplate();
         CmsTemplate( cms::ConnectionFactory* connectionFactory );
 
-        virtual ~CmsTemplate();
+        virtual ~CmsTemplate() throw();
 
         /**
          * Sets the destination object to be used by default for send/receive operations.
@@ -502,7 +497,7 @@ namespace cmsutil {
          *          the action to perform within a CMS Session
          * @throws cms::CMSException thrown if an error occurs.
          */
-        virtual void execute( SessionCallback* action ) throw ( cms::CMSException );
+        virtual void execute( SessionCallback* action );
 
         /**
          * Executes the given action and provides it with a CMS Session and
@@ -512,7 +507,7 @@ namespace cmsutil {
          *          the action to perform
          * @throws cms::CMSException thrown if an error occurs.
          */
-        virtual void execute( ProducerCallback* action ) throw ( cms::CMSException );
+        virtual void execute( ProducerCallback* action );
 
         /**
          * Executes the given action and provides it with a CMS Session and
@@ -524,8 +519,7 @@ namespace cmsutil {
          *          the action to perform
          * @throws cms::CMSException thrown if an error occurs.
          */
-        virtual void execute( cms::Destination* dest, ProducerCallback* action )
-            throw ( cms::CMSException );
+        virtual void execute( cms::Destination* dest, ProducerCallback* action );
 
         /**
          * Executes the given action and provides it with a CMS Session and
@@ -540,8 +534,7 @@ namespace cmsutil {
          * @throws cms::CMSException thrown if an error occurs.
          */
         virtual void execute( const std::string& destinationName,
-                              ProducerCallback* action )
-                                throw ( cms::CMSException );
+                              ProducerCallback* action );
 
         /**
          * Convenience method for sending a message to the default destination.
@@ -550,8 +543,7 @@ namespace cmsutil {
          *          Responsible for creating the message to be sent
          * @throws cms::CMSException thrown if an error occurs.
          */
-        virtual void send(MessageCreator* messageCreator)
-            throw ( cms::CMSException );
+        virtual void send( MessageCreator* messageCreator );
 
         /**
          * Convenience method for sending a message to the specified destination.
@@ -562,9 +554,7 @@ namespace cmsutil {
          *          Responsible for creating the message to be sent
          * @throws cms::CMSException thrown if an error occurs.
          */
-        virtual void send( cms::Destination* dest,
-                           MessageCreator* messageCreator )
-            throw ( cms::CMSException );
+        virtual void send( cms::Destination* dest, MessageCreator* messageCreator );
 
         /**
          * Convenience method for sending a message to the specified destination.
@@ -576,16 +566,14 @@ namespace cmsutil {
          * @throws cms::CMSException thrown if an error occurs.
          */
         virtual void send( const std::string& destinationName,
-                           MessageCreator* messageCreator )
-            throw ( cms::CMSException );
+                           MessageCreator* messageCreator );
 
         /**
          * Performs a synchronous read from the default destination.
          * @return the message
          * @throws cms::CMSException thrown if an error occurs
          */
-        virtual cms::Message* receive()
-            throw ( cms::CMSException );
+        virtual cms::Message* receive();
 
         /**
          * Performs a synchronous read from the specified destination.
@@ -594,8 +582,7 @@ namespace cmsutil {
          * @return the message
          * @throws cms::CMSException thrown if an error occurs
          */
-        virtual cms::Message* receive( cms::Destination* destination )
-            throw ( cms::CMSException );
+        virtual cms::Message* receive( cms::Destination* destination );
 
         /**
          * Performs a synchronous read from the specified destination.
@@ -605,8 +592,7 @@ namespace cmsutil {
          * @return the message
          * @throws cms::CMSException thrown if an error occurs
          */
-        virtual cms::Message* receive( const std::string& destinationName )
-            throw ( cms::CMSException );
+        virtual cms::Message* receive( const std::string& destinationName );
 
         /**
          * Performs a synchronous read consuming only messages identified by the
@@ -617,8 +603,7 @@ namespace cmsutil {
          * @return the message
          * @throws cms::CMSException thrown if an error occurs
          */
-        virtual cms::Message* receiveSelected( const std::string& selector )
-            throw ( cms::CMSException );
+        virtual cms::Message* receiveSelected( const std::string& selector );
 
         /**
          * Performs a synchronous read from the specified destination, consuming
@@ -632,8 +617,7 @@ namespace cmsutil {
          * @throws cms::CMSException thrown if an error occurs
          */
         virtual cms::Message* receiveSelected( cms::Destination* destination,
-                                               const std::string& selector )
-                                                   throw ( cms::CMSException );
+                                               const std::string& selector );
 
         /**
          * Performs a synchronous read from the specified destination, consuming
@@ -648,23 +632,13 @@ namespace cmsutil {
          * @throws cms::CMSException thrown if an error occurs
          */
         virtual cms::Message* receiveSelected( const std::string& destinationName,
-                                               const std::string& selector )
-                                                   throw ( cms::CMSException );
+                                               const std::string& selector );
 
     protected:
 
-        /**
-         * Initializes this object and prepares it for use.  This should be called
-         * before any other methds are called.
-         */
-        void init()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
+        void init();
 
-        /**
-         * Clears all internal resources.
-         */
-        void destroy()
-            throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException );
+        void destroy();
 
     private:
 
@@ -689,15 +663,15 @@ namespace cmsutil {
          * @throws decaf::lang::exceptions::IllegalStateException thrown
          * if the default destination is invalid.
          */
-        void checkDefaultDestination()
-            throw ( decaf::lang::exceptions::IllegalStateException );
+        void checkDefaultDestination();
 
         /**
          * Gets the connection, creating it if it doesn't already exist.
          * @return the connection
+         *
          * @throws cms::CMSException if any of the CMS methods throw.
          */
-        cms::Connection* getConnection() throw ( cms::CMSException );
+        cms::Connection* getConnection();
 
         /**
          * Creates a session initialized with the proper values.
@@ -705,7 +679,7 @@ namespace cmsutil {
          * @return the session
          * @throws cms::CMSException if any of the CMS methods throw.
          */
-        PooledSession* takeSession() throw ( cms::CMSException );
+        PooledSession* takeSession();
 
         /**
          * Closes, but does not destroy the pooled session resource.
@@ -713,7 +687,7 @@ namespace cmsutil {
          *          a pooled session resource
          * @throws cms::CMSException thrown if the CMS methods throw.
          */
-        void returnSession( PooledSession*& session ) throw ( cms::CMSException );
+        void returnSession( PooledSession*& session );
 
         /**
          * Allocates a producer initialized with the proper values.
@@ -726,8 +700,7 @@ namespace cmsutil {
          * @return the producer
          * @throws cms::CMSException thrown by the CMS API
          */
-        cms::MessageProducer* createProducer( cms::Session* session,
-                                              cms::Destination* dest ) throw ( cms::CMSException );
+        cms::MessageProducer* createProducer( cms::Session* session, cms::Destination* dest );
 
         /**
          * Closes and destroys a producer resource
@@ -735,7 +708,7 @@ namespace cmsutil {
          *          a producer to destroy
          * @throws cms::CMSException thrown if the CMS methods throw.
          */
-        void destroyProducer( cms::MessageProducer*& producer ) throw ( cms::CMSException );
+        void destroyProducer( cms::MessageProducer*& producer );
 
         /**
          * Allocates a consumer initialized with the proper values.
@@ -751,7 +724,7 @@ namespace cmsutil {
         cms::MessageConsumer* createConsumer( cms::Session* session,
                                               cms::Destination* dest,
                                               const std::string& selector,
-                                              bool noLocal ) throw ( cms::CMSException );
+                                              bool noLocal );
 
         /**
          * Closes and destroys a consumer resource
@@ -759,7 +732,7 @@ namespace cmsutil {
          *          a consumer to destroy
          * @throws cms::CMSException thrown if the CMS methods throw.
          */
-        void destroyConsumer( cms::MessageConsumer*& consumer ) throw ( cms::CMSException );
+        void destroyConsumer( cms::MessageConsumer*& consumer );
 
         /**
          * Destroys the given message
@@ -780,7 +753,7 @@ namespace cmsutil {
          */
         void doSend( cms::Session* session,
                      cms::MessageProducer* producer,
-                     MessageCreator* messageCreator ) throw ( cms::CMSException );
+                     MessageCreator* messageCreator );
 
         /**
          * Receives a message from a destination.
@@ -789,8 +762,7 @@ namespace cmsutil {
          * @return the message that was read
          * @throws cms::CMSException thrown if the CMS API throws.
          */
-        cms::Message* doReceive( cms::MessageConsumer* consumer )
-            throw ( cms::CMSException );
+        cms::Message* doReceive( cms::MessageConsumer* consumer );
 
         /**
          * Resolves the default destination and returns it.
@@ -799,8 +771,7 @@ namespace cmsutil {
          * @return the default destination
          * @throws cms::CMSException if an error occurs
          */
-        cms::Destination* resolveDefaultDestination( cms::Session* session )
-            throw ( cms::CMSException );
+        cms::Destination* resolveDefaultDestination( cms::Session* session );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DestinationResolver.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DestinationResolver.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DestinationResolver.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DestinationResolver.h Mon Jun 21 20:32:45 2010
@@ -32,7 +32,7 @@ namespace cmsutil {
     class AMQCPP_API DestinationResolver {
     public:
 
-        virtual ~DestinationResolver() {}
+        virtual ~DestinationResolver() throw() {}
 
         /**
          * Initializes this destination resolver for use.  Ensures that any
@@ -62,14 +62,14 @@ namespace cmsutil {
          * @param pubSubDomain
          *      If true, the name will be resolved to a Topic,
          *      otherwise a Queue.
+         *
          * @return the resolved destination
+         *
          * @throws cms::CMSException if resolution failed.
          */
-        virtual cms::Destination* resolveDestinationName(
-            cms::Session* session,
-            const std::string& destName,
-            bool pubSubDomain )
-                throw ( cms::CMSException ) = 0;
+        virtual cms::Destination* resolveDestinationName( cms::Session* session,
+                                                          const std::string& destName,
+                                                          bool pubSubDomain ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp Mon Jun 21 20:32:45 2010
@@ -25,8 +25,7 @@ using namespace decaf::util;
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Topic* DynamicDestinationResolver::SessionResolver::getTopic(
-        const std::string& topicName ) throw ( cms::CMSException ) {
+cms::Topic* DynamicDestinationResolver::SessionResolver::getTopic( const std::string& topicName ) {
 
     cms::Topic* topic = NULL;
     try {
@@ -49,8 +48,7 @@ cms::Topic* DynamicDestinationResolver::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::Queue* DynamicDestinationResolver::SessionResolver::getQueue(
-        const std::string& queueName ) throw ( cms::CMSException ) {
+cms::Queue* DynamicDestinationResolver::SessionResolver::getQueue( const std::string& queueName ) {
 
     cms::Queue* queue = NULL;
     try {
@@ -78,8 +76,7 @@ DynamicDestinationResolver::DynamicDesti
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DynamicDestinationResolver::~DynamicDestinationResolver() {
-
+DynamicDestinationResolver::~DynamicDestinationResolver() throw() {
     destroy();
 }
 
@@ -96,8 +93,7 @@ void DynamicDestinationResolver::destroy
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Destination* DynamicDestinationResolver::resolveDestinationName(
-        cms::Session* session, const std::string& destName, bool pubSubDomain)
-        throw (cms::CMSException) {
+        cms::Session* session, const std::string& destName, bool pubSubDomain ) {
 
     if( destName == "" ) {
         throw ActiveMQException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h Mon Jun 21 20:32:45 2010
@@ -57,13 +57,11 @@ namespace cmsutil {
                   queueMap() {
             }
 
-            virtual ~SessionResolver() {}
+            virtual ~SessionResolver() throw() {}
 
-            cms::Topic* getTopic(const std::string& topicName )
-                throw ( cms::CMSException );
+            cms::Topic* getTopic(const std::string& topicName );
 
-            cms::Queue* getQueue(const std::string& queueName )
-                throw ( cms::CMSException );
+            cms::Queue* getQueue(const std::string& queueName );
 
         };
 
@@ -86,7 +84,7 @@ namespace cmsutil {
 
         DynamicDestinationResolver();
 
-        virtual ~DynamicDestinationResolver();
+        virtual ~DynamicDestinationResolver() throw();
 
         virtual void init( ResourceLifecycleManager* mgr ) {
 
@@ -115,11 +113,9 @@ namespace cmsutil {
          * @return the resolved destination
          * @throws cms::CMSException if resolution failed.
          */
-        virtual cms::Destination* resolveDestinationName(
-            cms::Session* session,
-            const std::string& destName,
-            bool pubSubDomain )
-                throw ( cms::CMSException );
+        virtual cms::Destination* resolveDestinationName( cms::Session* session,
+                                                          const std::string& destName,
+                                                          bool pubSubDomain );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/MessageCreator.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/MessageCreator.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/MessageCreator.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/MessageCreator.h Mon Jun 21 20:32:45 2010
@@ -32,17 +32,17 @@ namespace cmsutil {
     class AMQCPP_API MessageCreator {
     public:
 
-        virtual ~MessageCreator(){}
+        virtual ~MessageCreator() throw () {}
 
         /**
          * Creates a message from the given session.
          *
          * @param session
          *          the CMS <code>Session</code>
+         *
          * @throws cms::CMSException if thrown by CMS API methods
          */
-        virtual cms::Message* createMessage( cms::Session* session )
-            throw ( cms::CMSException ) = 0;
+        virtual cms::Message* createMessage( cms::Session* session ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp Mon Jun 21 20:32:45 2010
@@ -31,7 +31,7 @@ PooledSession::PooledSession( SessionPoo
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-PooledSession::~PooledSession(){
+PooledSession::~PooledSession() throw() {
 
     // Destroy cached producers.
     std::vector<CachedProducer*> cachedProducers = producerCache.values();
@@ -49,7 +49,7 @@ PooledSession::~PooledSession(){
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PooledSession::close() throw( cms::CMSException ) {
+void PooledSession::close() {
 
     if( pool != NULL ) {
         pool->returnSession( this );
@@ -57,23 +57,17 @@ void PooledSession::close() throw( cms::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::QueueBrowser* PooledSession::createBrowser( const cms::Queue* queue )
-    throw( cms::CMSException ) {
-
+cms::QueueBrowser* PooledSession::createBrowser( const cms::Queue* queue ) {
     return session->createBrowser( queue );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::QueueBrowser* PooledSession::createBrowser( const cms::Queue* queue, const std::string& selector )
-    throw( cms::CMSException ) {
-
+cms::QueueBrowser* PooledSession::createBrowser( const cms::Queue* queue, const std::string& selector ) {
     return session->createBrowser( queue, selector );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::MessageProducer* PooledSession::createCachedProducer(
-        const cms::Destination* destination )
-    throw ( cms::CMSException ) {
+cms::MessageProducer* PooledSession::createCachedProducer( const cms::Destination* destination ) {
 
     try {
 
@@ -109,10 +103,9 @@ cms::MessageProducer* PooledSession::cre
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-cms::MessageConsumer* PooledSession::createCachedConsumer(
-    const cms::Destination* destination,
-    const std::string& selector,
-    bool noLocal ) throw ( cms::CMSException ) {
+cms::MessageConsumer* PooledSession::createCachedConsumer( const cms::Destination* destination,
+                                                           const std::string& selector,
+                                                           bool noLocal ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h Mon Jun 21 20:32:45 2010
@@ -57,7 +57,7 @@ namespace cmsutil {
         /**
          * Does nothing
          */
-        virtual ~PooledSession();
+        virtual ~PooledSession() throw();
 
         /**
          * Returns a non-constant reference to the internal session object.
@@ -80,48 +80,42 @@ namespace cmsutil {
         /**
          * Returns this session back to the pool, but does not close
          * or destroy the internal session object.
+         *
+         * @throws CMSException if an error occurs while performing this operation.
          */
-        virtual void close() throw( cms::CMSException );
+        virtual void close();
 
-        virtual void commit() throw ( cms::CMSException ) {
+        virtual void commit() {
             session->commit();
         }
 
-        virtual void rollback() throw ( cms::CMSException ) {
+        virtual void rollback() {
             session->rollback();
         }
 
-        virtual void recover() throw( cms::CMSException ) {
+        virtual void recover() {
             session->recover();
         }
 
-        virtual cms::MessageConsumer* createConsumer(
-            const cms::Destination* destination )
-                throw ( cms::CMSException ) {
+        virtual cms::MessageConsumer* createConsumer( const cms::Destination* destination ) {
             return session->createConsumer(destination);
         }
 
-        virtual cms::MessageConsumer* createConsumer(
-            const cms::Destination* destination,
-            const std::string& selector )
-                throw ( cms::CMSException ) {
+        virtual cms::MessageConsumer* createConsumer( const cms::Destination* destination,
+                                                      const std::string& selector ) {
             return session->createConsumer(destination, selector);
         }
 
-        virtual cms::MessageConsumer* createConsumer(
-            const cms::Destination* destination,
-            const std::string& selector,
-            bool noLocal )
-                throw ( cms::CMSException ) {
+        virtual cms::MessageConsumer* createConsumer( const cms::Destination* destination,
+                                                      const std::string& selector,
+                                                      bool noLocal ) {
             return session->createConsumer(destination, selector, noLocal);
         }
 
-        virtual cms::MessageConsumer* createDurableConsumer(
-            const cms::Topic* destination,
-            const std::string& name,
-            const std::string& selector,
-            bool noLocal = false )
-                throw ( cms::CMSException ) {
+        virtual cms::MessageConsumer* createDurableConsumer( const cms::Topic* destination,
+                                                             const std::string& name,
+                                                             const std::string& selector,
+                                                             bool noLocal = false ) {
             return session->createDurableConsumer(destination, name, selector, noLocal);
         }
 
@@ -136,16 +130,16 @@ namespace cmsutil {
          *          the selector to use
          * @param noLocal
          *          whether or not to receive messages from the same connection
+         *
          * @return the consumer resource
+         *
          * @throws cms::CMSException if something goes wrong.
          */
-        virtual cms::MessageConsumer* createCachedConsumer(
-                const cms::Destination* destination,
-                const std::string& selector,
-                bool noLocal) throw ( cms::CMSException );
+        virtual cms::MessageConsumer* createCachedConsumer( const cms::Destination* destination,
+                                                            const std::string& selector,
+                                                            bool noLocal );
 
-        virtual cms::MessageProducer* createProducer( const cms::Destination* destination )
-            throw ( cms::CMSException ) {
+        virtual cms::MessageProducer* createProducer( const cms::Destination* destination ) {
             return session->createProducer(destination);
         }
 
@@ -156,52 +150,42 @@ namespace cmsutil {
          *
          * @param destination
          *          the destination to send on
+         *
          * @return the producer resource
+         *
          * @throws cms::CMSException if something goes wrong.
          */
-        virtual cms::MessageProducer* createCachedProducer( const cms::Destination* destination )
-            throw ( cms::CMSException );
+        virtual cms::MessageProducer* createCachedProducer( const cms::Destination* destination );
 
-        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue )
-            throw( cms::CMSException );
+        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue );
 
-        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue, const std::string& selector )
-            throw( cms::CMSException );
+        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue, const std::string& selector );
 
-        virtual cms::Queue* createQueue( const std::string& queueName )
-            throw ( cms::CMSException ) {
+        virtual cms::Queue* createQueue( const std::string& queueName ) {
             return session->createQueue( queueName );
         }
 
-        virtual cms::Topic* createTopic( const std::string& topicName )
-            throw ( cms::CMSException ) {
+        virtual cms::Topic* createTopic( const std::string& topicName ) {
             return session->createTopic( topicName );
         }
 
-        virtual cms::TemporaryQueue* createTemporaryQueue()
-            throw ( cms::CMSException ) {
+        virtual cms::TemporaryQueue* createTemporaryQueue() {
             return session->createTemporaryQueue();
         }
 
-        virtual cms::TemporaryTopic* createTemporaryTopic()
-            throw ( cms::CMSException ) {
+        virtual cms::TemporaryTopic* createTemporaryTopic() {
             return session->createTemporaryTopic();
         }
 
-        virtual cms::Message* createMessage()
-            throw ( cms::CMSException ) {
+        virtual cms::Message* createMessage() {
             return session->createMessage();
         }
 
-        virtual cms::BytesMessage* createBytesMessage()
-            throw ( cms::CMSException) {
+        virtual cms::BytesMessage* createBytesMessage() {
             return session->createBytesMessage();
         }
 
-        virtual cms::BytesMessage* createBytesMessage(
-            const unsigned char* bytes,
-            int bytesSize )
-                throw ( cms::CMSException) {
+        virtual cms::BytesMessage* createBytesMessage( const unsigned char* bytes, int bytesSize ) {
             return session->createBytesMessage( bytes, bytesSize );
         }
 
@@ -210,31 +194,27 @@ namespace cmsutil {
             return session->createStreamMessage();
         }
 
-        virtual cms::TextMessage* createTextMessage()
-            throw ( cms::CMSException ) {
+        virtual cms::TextMessage* createTextMessage() {
             return session->createTextMessage();
         }
 
-        virtual cms::TextMessage* createTextMessage( const std::string& text )
-            throw ( cms::CMSException ) {
+        virtual cms::TextMessage* createTextMessage( const std::string& text ) {
             return session->createTextMessage( text );
         }
 
-        virtual cms::MapMessage* createMapMessage()
-            throw ( cms::CMSException ) {
+        virtual cms::MapMessage* createMapMessage() {
             return session->createMapMessage();
         }
 
-        virtual cms::Session::AcknowledgeMode getAcknowledgeMode() const throw ( cms::CMSException ) {
+        virtual cms::Session::AcknowledgeMode getAcknowledgeMode() const {
             return session->getAcknowledgeMode();
         }
 
-        virtual bool isTransacted() const throw ( cms::CMSException ) {
+        virtual bool isTransacted() const {
             return session->isTransacted();
         }
 
-        virtual void unsubscribe( const std::string& name )
-            throw ( cms::CMSException ) {
+        virtual void unsubscribe( const std::string& name ) {
             session->unsubscribe( name );
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ProducerCallback.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ProducerCallback.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ProducerCallback.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ProducerCallback.h Mon Jun 21 20:32:45 2010
@@ -31,7 +31,7 @@ namespace cmsutil {
     class AMQCPP_API ProducerCallback {
     public:
 
-        virtual ~ProducerCallback(){}
+        virtual ~ProducerCallback() throw() {}
 
         /**
          * Execute an action given a session and producer.
@@ -40,10 +40,10 @@ namespace cmsutil {
          *          the CMS <code>Session</code>
          * @param producer
          *          the CMS <code>Producer</code>
+         *
          * @throws cms::CMSException if thrown by CMS API methods
          */
-        virtual void doInCms( cms::Session* session, cms::MessageProducer* producer )
-            throw ( cms::CMSException ) = 0;
+        virtual void doInCms( cms::Session* session, cms::MessageProducer* producer ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.cpp Mon Jun 21 20:32:45 2010
@@ -48,7 +48,7 @@ void ResourceLifecycleManager::releaseAl
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::destroy() throw ( cms::CMSException ) {
+void ResourceLifecycleManager::destroy() {
 
     try{
         // Close all the connections.
@@ -123,8 +123,7 @@ void ResourceLifecycleManager::destroy()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::addConnection( cms::Connection* connection )
-    throw ( cms::CMSException ) {
+void ResourceLifecycleManager::addConnection( cms::Connection* connection ) {
 
     try{
         // Add the connection to the list.
@@ -136,8 +135,7 @@ void ResourceLifecycleManager::addConnec
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::addSession( cms::Session* session )
-    throw ( cms::CMSException ) {
+void ResourceLifecycleManager::addSession( cms::Session* session ) {
 
     try{
         // Add the session to the list.
@@ -150,8 +148,7 @@ void ResourceLifecycleManager::addSessio
 
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::addDestination( cms::Destination* dest )
-    throw ( cms::CMSException ) {
+void ResourceLifecycleManager::addDestination( cms::Destination* dest ) {
 
     try{
         // Add the destination to the list.
@@ -163,8 +160,7 @@ void ResourceLifecycleManager::addDestin
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::addMessageProducer( cms::MessageProducer* producer )
-    throw ( cms::CMSException ) {
+void ResourceLifecycleManager::addMessageProducer( cms::MessageProducer* producer ) {
 
     try{
         // Add the producer to the list.
@@ -176,8 +172,7 @@ void ResourceLifecycleManager::addMessag
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ResourceLifecycleManager::addMessageConsumer( cms::MessageConsumer* consumer )
-    throw ( cms::CMSException ) {
+void ResourceLifecycleManager::addMessageConsumer( cms::MessageConsumer* consumer ) {
 
     try{
         // Add the consumer to the list.



Mime
View raw message