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 [3/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/cms/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h Mon Jun 21 20:32:45 2010
@@ -88,7 +88,7 @@ namespace cms{
     class CMS_API Message {
     public:
 
-        virtual ~Message(){}
+        virtual ~Message() throw() {}
 
         /**
          * Clone this message exactly, returns a new instance that the
@@ -123,7 +123,7 @@ namespace cms{
          * @throws CMSException - if an internal error occurs.
          * @throws IllegalStateException - if this method is called on a closed session.
          */
-        virtual void acknowledge() const throw( IllegalStateException, CMSException ) = 0;
+        virtual void acknowledge() const = 0;
 
         /**
          * Clears out the body of the message.  This does not clear the
@@ -131,7 +131,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void clearBody() throw( CMSException ) = 0;
+        virtual void clearBody() = 0;
 
         /**
          * Clears out the message body. Clearing a message's body does not clear
@@ -143,7 +143,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void clearProperties() throw( CMSException ) = 0;
+        virtual void clearProperties() = 0;
 
         /**
          * Retrieves the property names.
@@ -153,7 +153,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::vector<std::string> getPropertyNames() const throw( CMSException ) = 0;
+        virtual std::vector<std::string> getPropertyNames() const = 0;
 
         /**
          * Indicates whether or not a given property exists.
@@ -164,7 +164,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual bool propertyExists( const std::string& name ) const throw( CMSException ) = 0;
+        virtual bool propertyExists( const std::string& name ) const = 0;
 
         /**
          * Gets a boolean property.
@@ -176,8 +176,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual bool getBooleanProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual bool getBooleanProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a byte property.
@@ -189,8 +188,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual unsigned char getByteProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual unsigned char getByteProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a double property.
@@ -202,8 +200,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual double getDoubleProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual double getDoubleProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a float property.
@@ -215,8 +212,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual float getFloatProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual float getFloatProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a int property.
@@ -228,8 +224,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual int getIntProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual int getIntProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a long property.
@@ -241,8 +236,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual long long getLongProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual long long getLongProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a short property.
@@ -254,8 +248,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual short getShortProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual short getShortProperty( const std::string& name ) const = 0;
 
         /**
          * Gets a string property.
@@ -267,8 +260,7 @@ namespace cms{
          * @throws CMSException if the property does not exist.
          * @throws MessageFormatException - if this type conversion is invalid.
          */
-        virtual std::string getStringProperty( const std::string& name ) const
-            throw( MessageFormatException, CMSException ) = 0;
+        virtual std::string getStringProperty( const std::string& name ) const = 0;
 
         /**
          * Sets a boolean property.
@@ -281,8 +273,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setBooleanProperty( const std::string& name, bool value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setBooleanProperty( const std::string& name, bool value ) = 0;
 
         /**
          * Sets a byte property.
@@ -295,8 +286,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setByteProperty( const std::string& name, unsigned char value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setByteProperty( const std::string& name, unsigned char value ) = 0;
 
         /**
          * Sets a double property.
@@ -309,8 +299,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setDoubleProperty( const std::string& name, double value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setDoubleProperty( const std::string& name, double value ) = 0;
 
         /**
          * Sets a float property.
@@ -322,8 +311,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setFloatProperty( const std::string& name, float value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setFloatProperty( const std::string& name, float value ) = 0;
 
         /**
          * Sets a int property.
@@ -336,8 +324,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setIntProperty( const std::string& name, int value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setIntProperty( const std::string& name, int value ) = 0;
 
         /**
          * Sets a long property.
@@ -350,8 +337,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setLongProperty( const std::string& name, long long value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setLongProperty( const std::string& name, long long value ) = 0;
 
         /**
          * Sets a short property.
@@ -364,8 +350,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setShortProperty( const std::string& name, short value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setShortProperty( const std::string& name, short value ) = 0;
 
         /**
          * Sets a string property.
@@ -378,8 +363,7 @@ namespace cms{
          * @throws CMSException - if the name is an empty string.
          * @throws MessageNotWriteableException - if properties are read-only
          */
-        virtual void setStringProperty( const std::string& name, const std::string& value )
-            throw( MessageNotWriteableException, CMSException ) = 0;
+        virtual void setStringProperty( const std::string& name, const std::string& value ) = 0;
 
         /**
          * Gets the correlation ID for the message.
@@ -391,7 +375,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getCMSCorrelationID() const throw( CMSException ) = 0;
+        virtual std::string getCMSCorrelationID() const = 0;
 
         /**
          * Sets the correlation ID for the message.
@@ -429,8 +413,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSCorrelationID( const std::string& correlationId )
-            throw( CMSException ) = 0;
+        virtual void setCMSCorrelationID( const std::string& correlationId ) = 0;
 
         /**
          * Gets the DeliveryMode for this message
@@ -439,7 +422,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual int getCMSDeliveryMode() const throw( CMSException ) = 0;
+        virtual int getCMSDeliveryMode() const = 0;
 
         /**
          * Sets the DeliveryMode for this message
@@ -452,7 +435,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSDeliveryMode( int mode ) throw( CMSException ) = 0;
+        virtual void setCMSDeliveryMode( int mode ) = 0;
 
         /**
          * Gets the Destination object for this message.
@@ -471,7 +454,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual const Destination* getCMSDestination() const throw( CMSException ) = 0;
+        virtual const Destination* getCMSDestination() const = 0;
 
         /**
          * Sets the Destination object for this message.
@@ -484,8 +467,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSDestination( const Destination* destination )
-            throw( CMSException ) = 0;
+        virtual void setCMSDestination( const Destination* destination ) = 0;
 
         /**
          * Gets the message's expiration value.
@@ -512,7 +494,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual long long getCMSExpiration() const throw( CMSException ) = 0;
+        virtual long long getCMSExpiration() const = 0;
 
         /**
          * Sets the message's expiration value.
@@ -525,8 +507,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSExpiration( long long expireTime )
-            throw( CMSException ) = 0;
+        virtual void setCMSExpiration( long long expireTime ) = 0;
 
         /**
          * The CMSMessageID header field contains a value that uniquely
@@ -559,7 +540,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getCMSMessageID() const throw( CMSException ) = 0;
+        virtual std::string getCMSMessageID() const = 0;
 
         /**
          * Sets the message ID.
@@ -572,7 +553,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSMessageID( const std::string& id ) throw( CMSException ) = 0;
+        virtual void setCMSMessageID( const std::string& id ) = 0;
 
         /**
          * Gets the message priority level.
@@ -590,7 +571,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual int getCMSPriority() const throw( CMSException ) = 0;
+        virtual int getCMSPriority() const = 0;
 
         /**
          * Sets the Priority Value for this message
@@ -603,7 +584,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSPriority( int priority ) throw( CMSException ) = 0;
+        virtual void setCMSPriority( int priority ) = 0;
 
         /**
          * Gets an indication of whether this message is being redelivered.
@@ -616,7 +597,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual bool getCMSRedelivered() const throw( CMSException ) = 0;
+        virtual bool getCMSRedelivered() const = 0;
 
         /**
          * Specifies whether this message is being redelivered.
@@ -629,7 +610,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSRedelivered( bool redelivered ) throw( CMSException ) = 0;
+        virtual void setCMSRedelivered( bool redelivered ) = 0;
 
         /**
          * Gets the Destination object to which a reply to this message should
@@ -639,7 +620,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual const cms::Destination* getCMSReplyTo() const throw( CMSException ) = 0;
+        virtual const cms::Destination* getCMSReplyTo() const = 0;
 
         /**
          * Sets the Destination object to which a reply to this message should
@@ -668,8 +649,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSReplyTo( const cms::Destination* destination )
-            throw( CMSException ) = 0;
+        virtual void setCMSReplyTo( const cms::Destination* destination ) = 0;
 
         /**
          * Gets the message timestamp.
@@ -698,7 +678,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual long long getCMSTimestamp() const throw( CMSException ) = 0;
+        virtual long long getCMSTimestamp() const = 0;
 
         /**
          * Sets the message timestamp.
@@ -711,7 +691,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSTimestamp( long long timeStamp ) throw( CMSException ) = 0;
+        virtual void setCMSTimestamp( long long timeStamp ) = 0;
 
         /**
          * Gets the message type identifier supplied by the client when the
@@ -722,7 +702,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getCMSType() const throw( CMSException ) = 0;
+        virtual std::string getCMSType() const = 0;
 
         /**
          * Sets the message type.
@@ -754,7 +734,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setCMSType( const std::string& type ) throw( CMSException ) = 0;
+        virtual void setCMSType( const std::string& type ) = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageConsumer.h Mon Jun 21 20:32:45 2010
@@ -54,7 +54,7 @@ namespace cms{
     class CMS_API MessageConsumer : public Closeable {
     public:
 
-        virtual ~MessageConsumer() {}
+        virtual ~MessageConsumer() throw() {}
 
         /**
          * Synchronously Receive a Message
@@ -63,7 +63,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Message* receive() throw ( CMSException ) = 0;
+        virtual Message* receive() = 0;
 
         /**
          * Synchronously Receive a Message, time out after defined interval.
@@ -73,7 +73,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Message* receive( int millisecs ) throw ( CMSException ) = 0;
+        virtual Message* receive( int millisecs ) = 0;
 
         /**
          * Receive a Message, does not wait if there isn't a new message
@@ -83,7 +83,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Message* receiveNoWait() throw ( CMSException ) = 0;
+        virtual Message* receiveNoWait() = 0;
 
         /**
          * Sets the MessageListener that this class will send notifs on
@@ -93,8 +93,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual void setMessageListener( MessageListener* listener )
-            throw ( CMSException ) = 0;
+        virtual void setMessageListener( MessageListener* listener ) = 0;
 
         /**
          * Gets the MessageListener that this class will send mew Message
@@ -104,7 +103,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual MessageListener* getMessageListener() const throw ( CMSException ) = 0;
+        virtual MessageListener* getMessageListener() const = 0;
 
         /**
          * Gets this message consumer's message selector expression.
@@ -113,8 +112,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual std::string getMessageSelector() const
-            throw ( cms::CMSException ) = 0;
+        virtual std::string getMessageSelector() const = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageEnumeration.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageEnumeration.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageEnumeration.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageEnumeration.h Mon Jun 21 20:32:45 2010
@@ -35,7 +35,7 @@ namespace cms{
     class CMS_API MessageEnumeration {
     public:
 
-        virtual ~MessageEnumeration() {}
+        virtual ~MessageEnumeration() throw() {}
 
         /**
          * Returns true if there are more Message in the Browser that can be retrieved
@@ -56,7 +56,7 @@ namespace cms{
          *
          * @throws CMSException if no more Message's currently in the Queue.
          */
-        virtual cms::Message* nextMessage() throw( cms::CMSException ) = 0;
+        virtual cms::Message* nextMessage() = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageListener.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageListener.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageListener.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageListener.h Mon Jun 21 20:32:45 2010
@@ -33,7 +33,7 @@ namespace cms{
     class CMS_API MessageListener{
     public:
 
-        virtual ~MessageListener(){}
+        virtual ~MessageListener() throw() {}
 
         /**
          * Called asynchronously when a new message is received, the message
@@ -45,12 +45,14 @@ namespace cms{
          * was contained in this Message.
          *
          * It is considered a programming error for this method to throw an
-         * exception.
+         * exception.  The method has been tagged with the 'throw()' qualifier,
+         * this implies that you application will segfault if you throw an error
+         * from an implementation of this method.
          *
          * @param message
          *      Message object {const} pointer recipient does not own.
          */
-        virtual void onMessage( const Message* message ) = 0;
+        virtual void onMessage( const Message* message ) throw() = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h Mon Jun 21 20:32:45 2010
@@ -57,7 +57,7 @@ namespace cms{
     class CMS_API MessageProducer : public Closeable {
     public:
 
-        virtual ~MessageProducer() {}
+        virtual ~MessageProducer() throw() {}
 
         /**
          * Sends the message to the default producer destination, but does
@@ -74,10 +74,7 @@ namespace cms{
          * @throws UnsupportedOperationException - if a client uses this method with a
          *         MessageProducer that did not specify a destination at creation time.
          */
-        virtual void send( Message* message ) throw ( cms::CMSException,
-                                                      cms::MessageFormatException,
-                                                      cms::InvalidDestinationException,
-                                                      cms::UnsupportedOperationException ) = 0;
+        virtual void send( Message* message ) = 0;
 
         /**
          * Sends the message to the default producer destination, but does
@@ -99,11 +96,7 @@ namespace cms{
          * @throws UnsupportedOperationException - if a client uses this method with a
          *         MessageProducer that did not specify a destination at creation time.
          */
-        virtual void send( Message* message, int deliveryMode, int priority, long long timeToLive )
-            throw ( cms::CMSException,
-                    cms::MessageFormatException,
-                    cms::InvalidDestinationException,
-                    cms::UnsupportedOperationException ) = 0;
+        virtual void send( Message* message, int deliveryMode, int priority, long long timeToLive ) = 0;
 
         /**
          * Sends the message to the designated destination, but does
@@ -122,11 +115,7 @@ namespace cms{
          * @throws UnsupportedOperationException - if a client uses this method with a
          *         MessageProducer that did not specify a destination at creation time.
          */
-        virtual void send( const Destination* destination, Message* message )
-            throw ( cms::CMSException,
-                    cms::MessageFormatException,
-                    cms::InvalidDestinationException,
-                    cms::UnsupportedOperationException ) = 0;
+        virtual void send( const Destination* destination, Message* message ) = 0;
 
         /**
          * Sends the message to the designated destination, but does
@@ -151,11 +140,7 @@ namespace cms{
          *         MessageProducer that did not specify a destination at creation time.
          */
         virtual void send( const Destination* destination, Message* message,
-                           int deliveryMode, int priority, long long timeToLive )
-            throw ( cms::CMSException,
-                    cms::MessageFormatException,
-                    cms::InvalidDestinationException,
-                    cms::UnsupportedOperationException ) = 0;
+                           int deliveryMode, int priority, long long timeToLive ) = 0;
 
         /**
          * Sets the delivery mode for this Producer
@@ -165,7 +150,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setDeliveryMode( int mode ) throw ( CMSException ) = 0;
+        virtual void setDeliveryMode( int mode ) = 0;
 
         /**
          * Gets the delivery mode for this Producer
@@ -174,7 +159,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual int getDeliveryMode() const throw ( CMSException ) = 0;
+        virtual int getDeliveryMode() const = 0;
 
         /**
          * Sets if Message Ids are disabled for this Producer
@@ -184,7 +169,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setDisableMessageID( bool value ) throw ( CMSException ) = 0;
+        virtual void setDisableMessageID( bool value ) = 0;
 
         /**
          * Gets if Message Ids are disabled for this Producer
@@ -193,7 +178,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual bool getDisableMessageID() const throw ( CMSException ) = 0;
+        virtual bool getDisableMessageID() const = 0;
 
         /**
          * Sets if Message Time Stamps are disabled for this Producer
@@ -201,8 +186,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setDisableMessageTimeStamp( bool value )
-            throw ( CMSException ) = 0;
+        virtual void setDisableMessageTimeStamp( bool value ) = 0;
 
         /**
          * Gets if Message Time Stamps are disabled for this Producer
@@ -211,8 +195,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual bool getDisableMessageTimeStamp() const
-            throw ( CMSException ) = 0;
+        virtual bool getDisableMessageTimeStamp() const = 0;
 
         /**
          * Sets the Priority that this Producers sends messages at
@@ -222,7 +205,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setPriority( int priority ) throw ( CMSException ) = 0;
+        virtual void setPriority( int priority ) = 0;
 
         /**
          * Gets the Priority level that this producer sends messages at
@@ -231,7 +214,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual int getPriority() const throw ( CMSException ) = 0;
+        virtual int getPriority() const = 0;
 
         /**
          * Sets the Time to Live that this Producers sends messages with.  This
@@ -243,7 +226,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void setTimeToLive( long long time ) throw ( CMSException ) = 0;
+        virtual void setTimeToLive( long long time ) = 0;
 
         /**
          * Gets the Time to Live that this producer sends messages with
@@ -252,7 +235,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual long long getTimeToLive() const throw ( CMSException ) = 0;
+        virtual long long getTimeToLive() const = 0;
 
     };
 

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Queue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Queue.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Queue.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Queue.h Mon Jun 21 20:32:45 2010
@@ -37,7 +37,7 @@ namespace cms{
     class CMS_API Queue : public Destination{
     public:
 
-        virtual ~Queue(){}
+        virtual ~Queue() throw() {}
 
         /**
          * Gets the name of this queue.
@@ -46,8 +46,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual std::string getQueueName() const
-            throw( CMSException ) = 0;
+        virtual std::string getQueueName() const = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/QueueBrowser.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/QueueBrowser.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/QueueBrowser.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/QueueBrowser.h Mon Jun 21 20:32:45 2010
@@ -53,14 +53,14 @@ namespace cms{
     class CMS_API QueueBrowser : public Closeable {
     public:
 
-        virtual ~QueueBrowser() {}
+        virtual ~QueueBrowser() throw() {}
 
         /**
          * @returns the Queue that this browser is listening on.
          *
          * @throws CMSException if an internal error occurs.
          */
-        virtual const Queue* getQueue() const throw ( cms::CMSException ) = 0;
+        virtual const Queue* getQueue() const = 0;
 
         /**
          * @returns the MessageSelector that is used on when this browser was
@@ -68,7 +68,7 @@ namespace cms{
          *
          * @throws CMSException if an internal error occurs.
          */
-        virtual std::string getMessageSelector() const throw ( cms::CMSException ) = 0;
+        virtual std::string getMessageSelector() const = 0;
 
         /**
          * Gets a pointer to an Enumeration object for browsing the Messages currently in
@@ -80,7 +80,7 @@ namespace cms{
          *
          * @throws CMSException if an internal error occurs.
          */
-        virtual cms::MessageEnumeration* getEnumeration() throw( cms::CMSException ) = 0;
+        virtual cms::MessageEnumeration* getEnumeration() = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h Mon Jun 21 20:32:45 2010
@@ -141,7 +141,7 @@ namespace cms{
 
     public:
 
-        virtual ~Session() {}
+        virtual ~Session() throw() {}
 
         /**
          * Closes this session as well as any active child consumers or
@@ -149,7 +149,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual void close() throw( CMSException ) = 0;
+        virtual void close() = 0;
 
         /**
          * Commits all messages done in this transaction and releases any
@@ -158,7 +158,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws IllegalStateException - if the method is not called by a transacted session.
          */
-        virtual void commit() throw ( CMSException ) = 0;
+        virtual void commit() = 0;
 
         /**
          * Rolls back all messages done in this transaction and releases any
@@ -167,7 +167,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws IllegalStateException - if the method is not called by a transacted session.
          */
-        virtual void rollback() throw ( CMSException ) = 0;
+        virtual void rollback() = 0;
 
         /**
          * Stops message delivery in this session, and restarts message delivery with the
@@ -189,7 +189,7 @@ namespace cms{
          *                        delivery due to some internal error.
          * @throws IllegalStateException - if the method is called by a transacted session.
          */
-        virtual void recover() throw( CMSException ) = 0;
+        virtual void recover() = 0;
 
         /**
          * Creates a MessageConsumer for the specified destination.
@@ -202,8 +202,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws InvalidDestinationException - if an invalid destination is specified.
          */
-        virtual MessageConsumer* createConsumer( const Destination* destination )
-            throw ( CMSException ) = 0;
+        virtual MessageConsumer* createConsumer( const Destination* destination ) = 0;
 
         /**
          * Creates a MessageConsumer for the specified destination, using a
@@ -220,10 +219,8 @@ namespace cms{
          * @throws InvalidDestinationException - if an invalid destination is specified.
          * @throws InvalidSelectorException - if the message selector is invalid.
          */
-        virtual MessageConsumer* createConsumer(
-            const Destination* destination,
-            const std::string& selector )
-                throw ( CMSException ) = 0;
+        virtual MessageConsumer* createConsumer( const Destination* destination,
+                                                 const std::string& selector ) = 0;
 
         /**
          * Creates a MessageConsumer for the specified destination, using a
@@ -244,11 +241,9 @@ namespace cms{
          * @throws InvalidDestinationException - if an invalid destination is specified.
          * @throws InvalidSelectorException - if the message selector is invalid.
          */
-        virtual MessageConsumer* createConsumer(
-            const Destination* destination,
-            const std::string& selector,
-            bool noLocal )
-                throw ( CMSException ) = 0;
+        virtual MessageConsumer* createConsumer( const Destination* destination,
+                                                 const std::string& selector,
+                                                 bool noLocal ) = 0;
 
         /**
          * Creates a durable subscriber to the specified topic, using a Message
@@ -273,12 +268,10 @@ namespace cms{
          * @throws InvalidDestinationException - if an invalid destination is specified.
          * @throws InvalidSelectorException - if the message selector is invalid.
          */
-        virtual MessageConsumer* createDurableConsumer(
-            const Topic* destination,
-            const std::string& name,
-            const std::string& selector,
-            bool noLocal = false )
-                throw ( CMSException ) = 0;
+        virtual MessageConsumer* createDurableConsumer( const Topic* destination,
+                                                        const std::string& name,
+                                                        const std::string& selector,
+                                                        bool noLocal = false ) = 0;
 
         /**
          * Creates a MessageProducer to send messages to the specified
@@ -291,8 +284,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws InvalidDestinationException - if an invalid destination is specified.
          */
-        virtual MessageProducer* createProducer( const Destination* destination )
-            throw ( CMSException ) = 0;
+        virtual MessageProducer* createProducer( const Destination* destination ) = 0;
 
         /**
          * Creates a new QueueBrowser to peek at Messages on the given Queue.
@@ -304,8 +296,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws InvalidDestinationException - if the destination given is invalid.
          */
-        virtual QueueBrowser* createBrowser( const cms::Queue* queue )
-            throw( CMSException ) = 0;
+        virtual QueueBrowser* createBrowser( const cms::Queue* queue ) = 0;
 
         /**
          * Creates a new QueueBrowser to peek at Messages on the given Queue.
@@ -319,8 +310,7 @@ namespace cms{
          * @throws CMSException - If an internal error occurs.
          * @throws InvalidDestinationException - if the destination given is invalid.
          */
-        virtual QueueBrowser* createBrowser( const cms::Queue* queue, const std::string& selector )
-            throw( CMSException ) = 0;
+        virtual QueueBrowser* createBrowser( const cms::Queue* queue, const std::string& selector ) = 0;
 
         /**
          * Creates a queue identity given a Queue name.
@@ -331,8 +321,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Queue* createQueue( const std::string& queueName )
-            throw ( CMSException ) = 0;
+        virtual Queue* createQueue( const std::string& queueName ) = 0;
 
         /**
          * Creates a topic identity given a Queue name.
@@ -343,8 +332,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Topic* createTopic( const std::string& topicName )
-            throw ( CMSException ) = 0;
+        virtual Topic* createTopic( const std::string& topicName ) = 0;
 
         /**
          * Creates a TemporaryQueue object.
@@ -353,32 +341,28 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual TemporaryQueue* createTemporaryQueue()
-            throw ( CMSException ) = 0;
+        virtual TemporaryQueue* createTemporaryQueue() = 0;
 
         /**
          * Creates a TemporaryTopic object.
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual TemporaryTopic* createTemporaryTopic()
-            throw ( CMSException ) = 0;
+        virtual TemporaryTopic* createTemporaryTopic() = 0;
 
         /**
          * Creates a new Message
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual Message* createMessage()
-            throw ( CMSException ) = 0;
+        virtual Message* createMessage() = 0;
 
         /**
          * Creates a BytesMessage
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual BytesMessage* createBytesMessage()
-            throw ( CMSException) = 0;
+        virtual BytesMessage* createBytesMessage() = 0;
 
         /**
          * Creates a BytesMessage and sets the payload to the passed value
@@ -390,24 +374,21 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual BytesMessage* createBytesMessage( const unsigned char* bytes, int bytesSize )
-            throw ( CMSException) = 0;
+        virtual BytesMessage* createBytesMessage( const unsigned char* bytes, int bytesSize ) = 0;
 
         /**
          * Creates a new StreamMessage
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual StreamMessage* createStreamMessage()
-            throw ( CMSException ) = 0;
+        virtual StreamMessage* createStreamMessage() = 0;
 
         /**
          * Creates a new TextMessage
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual TextMessage* createTextMessage()
-            throw ( CMSException ) = 0;
+        virtual TextMessage* createTextMessage() = 0;
 
         /**
          * Creates a new TextMessage and set the text to the value given
@@ -417,16 +398,14 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual TextMessage* createTextMessage( const std::string& text )
-            throw ( CMSException ) = 0;
+        virtual TextMessage* createTextMessage( const std::string& text ) = 0;
 
         /**
          * Creates a new MapMessage
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual MapMessage* createMapMessage()
-            throw ( CMSException ) = 0;
+        virtual MapMessage* createMapMessage() = 0;
 
         /**
          * Returns the acknowledgment mode of the session.
@@ -435,8 +414,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual AcknowledgeMode getAcknowledgeMode() const
-            throw ( CMSException ) = 0;
+        virtual AcknowledgeMode getAcknowledgeMode() const = 0;
 
         /**
          * Gets if the Sessions is a Transacted Session
@@ -445,7 +423,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual bool isTransacted() const throw ( CMSException ) = 0;
+        virtual bool isTransacted() const = 0;
 
         /**
          * Unsubscribes a durable subscription that has been created by a
@@ -463,8 +441,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual void unsubscribe( const std::string& name )
-            throw ( CMSException ) = 0;
+        virtual void unsubscribe( const std::string& name ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Startable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Startable.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Startable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Startable.h Mon Jun 21 20:32:45 2010
@@ -36,14 +36,14 @@ namespace cms{
     class CMS_API Startable {
     public:
 
-        virtual ~Startable() {}
+        virtual ~Startable() throw() {}
 
         /**
          * Starts the service.
          *
          * @throws CMSException if an internal error occurs while starting.
          */
-        virtual void start() throw( CMSException ) = 0;
+        virtual void start() = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Stoppable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Stoppable.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Stoppable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Stoppable.h Mon Jun 21 20:32:45 2010
@@ -43,7 +43,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs while stopping the Service.
          */
-        virtual void stop() throw( CMSException ) = 0;
+        virtual void stop() = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h Mon Jun 21 20:32:45 2010
@@ -61,7 +61,7 @@ namespace cms {
     class CMS_API StreamMessage : public Message {
     public:
 
-        virtual ~StreamMessage() {}
+        virtual ~StreamMessage() throw() {}
 
         /**
          * Reads a Boolean from the Stream message stream
@@ -73,10 +73,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual bool readBoolean() const throw ( cms::MessageEOFException,
-                                                 cms::MessageFormatException,
-                                                 cms::MessageNotReadableException,
-                                                 cms::CMSException ) = 0;
+        virtual bool readBoolean() const = 0;
 
         /**
          * Writes a boolean to the Stream message stream as a 1-byte value.
@@ -89,8 +86,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -102,10 +98,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual unsigned char readByte() const throw ( cms::MessageEOFException,
-                                                       cms::MessageFormatException,
-                                                       cms::MessageNotReadableException,
-                                                       cms::CMSException ) = 0;
+        virtual unsigned char readByte() const = 0;
 
         /**
          * Writes a byte to the Stream message stream as a 1-byte value
@@ -116,8 +109,7 @@ namespace cms {
          *                        to 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 Stream message stream.
@@ -143,11 +135,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readBytes( std::vector<unsigned char>& value ) const
-            throw ( cms::MessageEOFException,
-                    cms::MessageFormatException,
-                    cms::MessageNotReadableException,
-                    cms::CMSException ) = 0;
+        virtual int readBytes( std::vector<unsigned char>& value ) const = 0;
 
         /**
          * Writes a byte array to the Stream message stream using the vector
@@ -159,9 +147,7 @@ namespace cms {
          *                        to 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 Stream message stream.
@@ -194,11 +180,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readBytes( unsigned char* buffer, int length ) const
-            throw ( cms::MessageEOFException,
-                    cms::MessageFormatException,
-                    cms::MessageNotReadableException,
-                    cms::CMSException ) = 0;
+        virtual int readBytes( unsigned char* buffer, int length ) const = 0;
 
         /**
          * Writes a portion of a byte array to the Stream message stream.
@@ -214,9 +196,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -228,10 +208,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual char readChar() const throw ( cms::MessageEOFException,
-                                              cms::MessageFormatException,
-                                              cms::MessageNotReadableException,
-                                              cms::CMSException ) = 0;
+        virtual char readChar() const = 0;
 
         /**
          * Writes a char to the Stream message stream as a 1-byte value
@@ -242,8 +219,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -255,10 +231,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual float readFloat() const throw ( cms::MessageEOFException,
-                                                cms::MessageFormatException,
-                                                cms::MessageNotReadableException,
-                                                cms::CMSException ) = 0;
+        virtual float readFloat() const = 0;
 
         /**
          * Writes a float to the Stream message stream as a 4 byte value
@@ -268,8 +241,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -281,10 +253,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual double readDouble() const throw ( cms::MessageEOFException,
-                                                  cms::MessageFormatException,
-                                                  cms::MessageNotReadableException,
-                                                  cms::CMSException ) = 0;
+        virtual double readDouble() const = 0;
 
         /**
          * Writes a double to the Stream message stream as a 8 byte value
@@ -294,8 +263,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -307,10 +275,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual short readShort() const throw ( cms::MessageEOFException,
-                                                cms::MessageFormatException,
-                                                cms::MessageNotReadableException,
-                                                cms::CMSException ) = 0;
+        virtual short readShort() const = 0;
 
         /**
          * Writes a signed short to the Stream message stream as a 2 byte value
@@ -321,8 +286,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -334,10 +298,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual unsigned short readUnsignedShort() const throw ( cms::MessageEOFException,
-                                                                 cms::MessageFormatException,
-                                                                 cms::MessageNotReadableException,
-                                                                 cms::CMSException ) = 0;
+        virtual unsigned short readUnsignedShort() const = 0;
 
         /**
          * Writes a unsigned short to the Stream message stream as a 2 byte value
@@ -348,8 +309,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -361,10 +321,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual int readInt() const throw ( cms::MessageEOFException,
-                                            cms::MessageFormatException,
-                                            cms::MessageNotReadableException,
-                                            cms::CMSException ) = 0;
+        virtual int readInt() const = 0;
 
         /**
          * Writes a signed int to the Stream message stream as a 4 byte value
@@ -375,8 +332,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -388,10 +344,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual long long readLong() const throw ( cms::MessageEOFException,
-                                                   cms::MessageFormatException,
-                                                   cms::MessageNotReadableException,
-                                                   cms::CMSException ) = 0;
+        virtual long long readLong() const = 0;
 
         /**
          * Writes a long long to the Stream message stream as a 8 byte value
@@ -402,8 +355,7 @@ namespace cms {
          *                        to 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 Stream message stream
@@ -415,10 +367,7 @@ namespace cms {
          * @throw MessageFormatException - if this type conversion is invalid.
          * @throw MessageNotReadableException - if the message is in write-only mode.
          */
-        virtual std::string readString() const throw ( cms::MessageEOFException,
-                                                       cms::MessageFormatException,
-                                                       cms::MessageNotReadableException,
-                                                       cms::CMSException ) = 0;
+        virtual std::string readString() const = 0;
 
         /**
          * Writes an ASCII String to the Stream message stream
@@ -429,8 +378,7 @@ namespace cms {
          *                        to 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;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h Mon Jun 21 20:32:45 2010
@@ -39,7 +39,7 @@ namespace cms{
     class CMS_API TemporaryQueue : public Destination {
     public:
 
-        virtual ~TemporaryQueue() {}
+        virtual ~TemporaryQueue() throw() {}
 
         /**
          * Gets the name of this queue.
@@ -48,14 +48,14 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getQueueName() const throw( CMSException ) = 0;
+        virtual std::string getQueueName() const = 0;
 
         /**
          * Destroy's the Temporary Destination at the Provider.
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual void destroy() throw ( CMSException ) = 0;
+        virtual void destroy() = 0;
 
    };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryTopic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryTopic.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryTopic.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TemporaryTopic.h Mon Jun 21 20:32:45 2010
@@ -39,7 +39,7 @@ namespace cms{
     class CMS_API TemporaryTopic : public Destination {
     public:
 
-        virtual ~TemporaryTopic() {}
+        virtual ~TemporaryTopic() throw() {}
 
         /**
          * Gets the name of this topic.
@@ -48,14 +48,14 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getTopicName() const throw( CMSException ) = 0;
+        virtual std::string getTopicName() const = 0;
 
         /**
          * Destroy's the Temporary Destination at the Provider
          *
          * @throws CMSException
          */
-        virtual void destroy() throw ( CMSException ) = 0;
+        virtual void destroy() = 0;
 
    };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TextMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TextMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TextMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/TextMessage.h Mon Jun 21 20:32:45 2010
@@ -41,7 +41,7 @@ namespace cms{
     class CMS_API TextMessage : public Message{
     public:
 
-        virtual ~TextMessage(){}
+        virtual ~TextMessage() throw() {}
 
         /**
          * Gets the message character buffer.
@@ -50,7 +50,7 @@ namespace cms{
          *
          * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getText() const throw( cms::CMSException ) = 0;
+        virtual std::string getText() const = 0;
 
         /**
          * Sets the message contents, does not take ownership of the passed
@@ -62,8 +62,7 @@ namespace cms{
          * @throws CMSException - if an internal error occurs.
          * @throws MessageNotWriteableException - if the message is in read-only mode..
          */
-        virtual void setText( const char* msg ) throw( cms::MessageNotWriteableException,
-                                                       cms::CMSException ) = 0;
+        virtual void setText( const char* msg ) = 0;
 
         /**
          * Sets the message contents
@@ -74,8 +73,7 @@ namespace cms{
          * @throws CMSException - if an internal error occurs.
          * @throws MessageNotWriteableException - if the message is in read-only mode..
          */
-        virtual void setText( const std::string& msg ) throw( cms::MessageNotWriteableException,
-                                                              cms::CMSException ) = 0;
+        virtual void setText( const std::string& msg ) = 0;
 
     };
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Topic.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Topic.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Topic.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Topic.h Mon Jun 21 20:32:45 2010
@@ -36,7 +36,7 @@ namespace cms{
     class CMS_API Topic : public Destination{
     public:
 
-        virtual ~Topic() {}
+        virtual ~Topic() throw() {}
 
         /**
          * Gets the name of this topic.
@@ -45,8 +45,7 @@ namespace cms{
          *
          * @throws CMSException - If an internal error occurs.
          */
-        virtual std::string getTopicName()
-            const throw( CMSException ) = 0;
+        virtual std::string getTopicName() const = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp Mon Jun 21 20:32:45 2010
@@ -154,10 +154,10 @@ bool Properties::isEmpty() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t Properties::size() const {
+int Properties::size() const {
 
     synchronized( &( internal->properties ) ) {
-        return internal->properties.size();
+        return (int)internal->properties.size();
     }
 
     return 0;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h Mon Jun 21 20:32:45 2010
@@ -91,7 +91,7 @@ namespace util{
         /**
          * @return The number of Properties in this Properties Object.
          */
-        std::size_t size() const;
+        int size() const;
 
         /**
          * Looks up the value for the given property.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/CmsTemplateTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/CmsTemplateTest.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/CmsTemplateTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/CmsTemplateTest.cpp Mon Jun 21 20:32:45 2010
@@ -53,7 +53,7 @@ namespace test {
             this->text = text;
         }
 
-        virtual ~TextMessageCreator() {}
+        virtual ~TextMessageCreator() throw() {}
 
         std::string getText() const {
             return text;
@@ -124,7 +124,7 @@ namespace test {
             this->count = count;
         }
 
-        virtual ~Receiver(){
+        virtual ~Receiver() throw() {
         }
 
         int getNumReceived() const {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp Mon Jun 21 20:32:45 2010
@@ -115,7 +115,7 @@ namespace test {
             this->numReceived = 0;
         }
 
-        virtual ~Consumer(){
+        virtual ~Consumer() throw() {
         }
 
         virtual int getNumReceived() const{
@@ -137,7 +137,7 @@ namespace test {
             }
         }
 
-        virtual void onMessage( const cms::Message* message ){
+        virtual void onMessage( const cms::Message* message ) throw() {
 
             try{
                 const TextMessage* textMessage =

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/SlowListenerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/SlowListenerTest.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/SlowListenerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/SlowListenerTest.cpp Mon Jun 21 20:32:45 2010
@@ -46,8 +46,9 @@ namespace test{
         decaf::util::StlSet<long long> threadIds;
 
         SlowListener() { count = 0; }
+        virtual ~SlowListener() throw() {};
 
-        void onMessage( const cms::Message* message ) {
+        void onMessage( const cms::Message* message ) throw() {
 
             synchronized( &threadIds ) {
                 count++;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireClientAckTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireClientAckTest.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireClientAckTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireClientAckTest.cpp Mon Jun 21 20:32:45 2010
@@ -48,7 +48,9 @@ namespace {
             this->dontAck = dontAck;
         }
 
-        virtual void onMessage( const Message* message ) {
+        virtual ~MyMesageListener() throw() {}
+
+        virtual void onMessage( const Message* message ) throw() {
 
             CPPUNIT_ASSERT( message != NULL );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireTempDestinationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireTempDestinationTest.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireTempDestinationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/openwire/OpenwireTempDestinationTest.cpp Mon Jun 21 20:32:45 2010
@@ -72,7 +72,7 @@ namespace openwire{
             this->numReceived = 0;
         }
 
-        virtual ~Requester() {}
+        virtual ~Requester() throw() {}
 
         virtual unsigned int getNumReceived() const {
             return this->numReceived;
@@ -105,7 +105,7 @@ namespace openwire{
             }
         }
 
-        virtual void onMessage( const cms::Message* message ) {
+        virtual void onMessage( const cms::Message* message ) throw() {
 
             try {
 
@@ -145,7 +145,7 @@ namespace openwire{
             this->numReceived = 0;
         }
 
-        virtual ~Responder() {}
+        virtual ~Responder() throw() {}
 
         virtual unsigned int getNumReceived() const {
             return this->numReceived;
@@ -155,7 +155,7 @@ namespace openwire{
             this->requests.await( 2000 * this->messageCount );
         }
 
-        virtual void onMessage( const cms::Message* message ) {
+        virtual void onMessage( const cms::Message* message ) throw() {
 
             try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.cpp Mon Jun 21 20:32:45 2010
@@ -34,7 +34,7 @@ CMSListener::CMSListener( cms::Session* 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CMSListener::~CMSListener() {
+CMSListener::~CMSListener() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ void CMSListener::asyncWaitForMessages( 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CMSListener::onMessage( const cms::Message* message ) {
+void CMSListener::onMessage( const cms::Message* message ) throw() {
 
     if( session->getAcknowledgeMode() == cms::Session::CLIENT_ACKNOWLEDGE ) {
         try {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSListener.h Mon Jun 21 20:32:45 2010
@@ -38,7 +38,7 @@ namespace util {
     public:
 
         CMSListener( cms::Session* session );
-        virtual ~CMSListener();
+        virtual ~CMSListener() throw();
 
         unsigned int getNumReceived() const {
             return this->numReceived;
@@ -49,7 +49,7 @@ namespace util {
         virtual void asyncWaitForMessages( unsigned int count );
 
         virtual void onException( const cms::CMSException& error );
-        virtual void onMessage( const cms::Message* message );
+        virtual void onMessage( const cms::Message* message ) throw();
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.cpp?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.cpp Mon Jun 21 20:32:45 2010
@@ -53,7 +53,7 @@ CMSProvider::CMSProvider( const std::str
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CMSProvider::~CMSProvider() {
+CMSProvider::~CMSProvider() throw() {
     try{
         close();
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/CMSProvider.h Mon Jun 21 20:32:45 2010
@@ -62,7 +62,7 @@ namespace util {
         CMSProvider( const std::string& brokerURL,
                      cms::Session::AcknowledgeMode ackMode = cms::Session::AUTO_ACKNOWLEDGE );
 
-        virtual ~CMSProvider();
+        virtual ~CMSProvider() throw();
 
         virtual void close() throw( decaf::io::IOException );
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsAccessorTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsAccessorTest.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsAccessorTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsAccessorTest.h Mon Jun 21 20:32:45 2010
@@ -27,34 +27,33 @@ namespace activemq{
 namespace cmsutil{
 
     class DummyConnectionFactory;
-    
+
     class CmsAccessorTest : public CppUnit::TestFixture
     {
         CPPUNIT_TEST_SUITE( CmsAccessorTest );
         CPPUNIT_TEST( testConnectionFactory );
         CPPUNIT_TEST( testAckMode );
         CPPUNIT_TEST( testCreateResources );
-        CPPUNIT_TEST_SUITE_END();               
+        CPPUNIT_TEST_SUITE_END();
 
         class MyAccessor : public CmsAccessor {
-        
+
         public:
-            
-            virtual ~MyAccessor(){}
-            
-            virtual cms::Connection* createConnection() throw (cms::CMSException) {
+
+            virtual ~MyAccessor() throw(){}
+
+            virtual cms::Connection* createConnection() {
                 return CmsAccessor::createConnection();
             }
-                
-            virtual cms::Session* createSession(cms::Connection* con) 
-                throw (cms::CMSException) {
+
+            virtual cms::Session* createSession(cms::Connection* con) {
                 return CmsAccessor::createSession(con);
             }
         };
-        
+
         MyAccessor* accessor;
         DummyConnectionFactory* cf;
-        
+
     public:
 
         CmsAccessorTest() {}
@@ -62,7 +61,7 @@ namespace cmsutil{
 
         virtual void setUp();
         virtual void tearDown();
-        
+
         void testConnectionFactory();
         void testAckMode();
         void testCreateResources();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsDestinationAccessorTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsDestinationAccessorTest.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsDestinationAccessorTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsDestinationAccessorTest.h Mon Jun 21 20:32:45 2010
@@ -27,51 +27,47 @@ namespace activemq{
 namespace cmsutil{
 
     class DummyConnectionFactory;
-    
+
     class CmsDestinationAccessorTest : public CppUnit::TestFixture
     {
         CPPUNIT_TEST_SUITE( CmsDestinationAccessorTest );
         CPPUNIT_TEST( test );
-        CPPUNIT_TEST_SUITE_END();               
-             
+        CPPUNIT_TEST_SUITE_END();
+
 
         class MyAccessor : public CmsDestinationAccessor {
-        
+
         public:
-            
-            virtual ~MyAccessor(){
+
+            virtual ~MyAccessor() throw(){
                 try {
                     destroy();
-                } catch( ... ) {                    
+                } catch( ... ) {
                 }
             }
-            
-            virtual cms::Connection* createConnection() throw (cms::CMSException) {
+
+            virtual cms::Connection* createConnection() {
                 return CmsDestinationAccessor::createConnection();
             }
-                
-            virtual cms::Session* createSession(cms::Connection* con) 
-                throw (cms::CMSException) {
+
+            virtual cms::Session* createSession(cms::Connection* con) {
                 return CmsDestinationAccessor::createSession(con);
             }
-            virtual cms::Destination* resolveDestinationName( 
-                cms::Session* session, 
-                const std::string& destName ) throw (cms::CMSException) {
+            virtual cms::Destination* resolveDestinationName( cms::Session* session,
+                                                              const std::string& destName ) {
                 return CmsDestinationAccessor::resolveDestinationName(session,destName);
             }
-            virtual void init() 
-            throw (cms::CMSException, decaf::lang::exceptions::IllegalStateException) {
+            virtual void init() {
                 CmsDestinationAccessor::init();
             }
-            virtual void destroy() 
-            throw (cms::CMSException, decaf::lang::exceptions::IllegalStateException) {
+            virtual void destroy() {
                 CmsDestinationAccessor::destroy();
             }
         };
-        
+
         MyAccessor* accessor;
         DummyConnectionFactory* cf;
-        
+
     public:
 
         CmsDestinationAccessorTest() {}
@@ -79,7 +75,7 @@ namespace cmsutil{
 
         virtual void setUp();
         virtual void tearDown();
-        
+
         void test();
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsTemplateTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsTemplateTest.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsTemplateTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/CmsTemplateTest.h Mon Jun 21 20:32:45 2010
@@ -70,7 +70,7 @@ namespace cmsutil{
                 priority = 0;
                 ttl = 0LL;
             }
-            virtual ~MySendListener(){}
+            virtual ~MySendListener() throw() {}
 
             virtual void onSend(const cms::Destination* destination,
                 cms::Message* message, int deliveryMode, int priority,
@@ -99,7 +99,7 @@ namespace cmsutil{
 
             FailSendListener() {
             }
-            virtual ~FailSendListener(){}
+            virtual ~FailSendListener() throw() {}
 
             virtual void onSend(const cms::Destination* destination,
                     cms::Message* message, int deliveryMode, int priority,
@@ -124,7 +124,7 @@ namespace cmsutil{
             MySessionCallback() {
                 session = NULL;
             }
-            virtual ~MySessionCallback(){}
+            virtual ~MySessionCallback() throw() {}
 
             virtual void doInCms(cms::Session* session) throw (cms::CMSException) {
                 this->session = session;
@@ -142,7 +142,7 @@ namespace cmsutil{
                 session = NULL;
                 producer = NULL;
             }
-            virtual ~MyProducerCallback(){}
+            virtual ~MyProducerCallback() throw() {}
 
             virtual void doInCms(cms::Session* session,
                     cms::MessageProducer* producer) throw (cms::CMSException) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnection.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnection.h Mon Jun 21 20:32:45 2010
@@ -38,7 +38,7 @@ namespace cmsutil {
         DummyConnection(MessageContext* messageContext ) {
             this->messageContext = messageContext;
         }
-        virtual ~DummyConnection() {}
+        virtual ~DummyConnection() throw() {}
 
         virtual const cms::ConnectionMetaData* getMetaData() const throw( cms::CMSException ) {
             return NULL;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnectionFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnectionFactory.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnectionFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConnectionFactory.h Mon Jun 21 20:32:45 2010
@@ -27,22 +27,22 @@ namespace cmsutil {
 
     class DummyConnectionFactory : public cms::ConnectionFactory {
     private:
-        
+
         MessageContext messageContext;
-        
+
     public:
-        
-        virtual ~DummyConnectionFactory() {}
+
+        virtual ~DummyConnectionFactory() throw() {}
 
         virtual cms::Connection* createConnection() throw ( cms::CMSException ) {
-            
+
             return new DummyConnection(&messageContext);
         }
 
         virtual cms::Connection* createConnection( const std::string& username,
                                                    const std::string& password )
             throw ( cms::CMSException ) {
-            
+
             return new DummyConnection(&messageContext);
         }
 
@@ -50,19 +50,19 @@ namespace cmsutil {
                                                    const std::string& password,
                                                    const std::string& clientId )
             throw ( cms::CMSException ) {
-            
+
             DummyConnection* c = new DummyConnection(&messageContext);
             c->setClientID(clientId);
-            
+
             return c;
         }
-        
+
         MessageContext* getMessageContext() {
             return &messageContext;
         }
-        
+
     };
-    
+
 }}
 
 #endif /*ACTIVEMQ_CMSUTIL_DUMMYCONNECTIONFACTORY_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyConsumer.h Mon Jun 21 20:32:45 2010
@@ -41,7 +41,7 @@ namespace cmsutil {
             this->dest = dest;
             this->listener = NULL;
         }
-        virtual ~DummyConsumer() {}
+        virtual ~DummyConsumer() throw() {}
 
         virtual void close() throw( cms::CMSException ){}
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessage.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessage.h Mon Jun 21 20:32:45 2010
@@ -27,7 +27,7 @@ namespace cmsutil{
     {
     public:
 
-        virtual ~DummyMessage(){}
+        virtual ~DummyMessage() throw() {}
 
         virtual Message* clone() const { return NULL; }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessageCreator.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessageCreator.h?rev=956683&r1=956682&r2=956683&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessageCreator.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyMessageCreator.h Mon Jun 21 20:32:45 2010
@@ -26,10 +26,10 @@ namespace cmsutil {
 
     class DummyMessageCreator : public MessageCreator {
     public:
-        
-        virtual ~DummyMessageCreator() {}
-        
-        virtual cms::Message* createMessage(cms::Session* session ) 
+
+        virtual ~DummyMessageCreator() throw() {}
+
+        virtual cms::Message* createMessage(cms::Session* session )
                     throw (cms::CMSException) {
             return new DummyMessage();
         }