activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r775980 [4/4] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/cmsutil/ main/activemq/commands/ main/activemq/core/ main/activemq/transport/mock/ main/activemq/wireformat/openwire/ main/activemq/wireformat/stomp/ main...
Date Mon, 18 May 2009 15:13:33 GMT
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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -23,22 +23,25 @@
 #include <cms/CMSException.h>
 
 namespace cms{
-    
+
     /**
      * An interface encapsulating a provider-specific queue name.
+     *
+     * @since 1.0
      */
     class CMS_API Queue : public Destination{
-        
     public:
-    
+
         virtual ~Queue(){}
-        
+
         /**
          * Gets the name of this queue.
-         * 
+         *
          * @return The queue name.
+         *
+         * @throws CMSException - If an internal error occurs.
          */
-        virtual std::string getQueueName() const 
+        virtual std::string getQueueName() const
             throw( CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -19,6 +19,7 @@
 #define _CMS_QUEUEBROWSER_H_
 
 #include <vector>
+#include <string>
 #include <cms/Config.h>
 #include <cms/Closeable.h>
 #include <cms/Queue.h>
@@ -30,6 +31,8 @@
     /**
      * This class implements in interface for browsing the messages in a Queue
      * without removing them.
+     *
+     * @since 1.1
      */
     class CMS_API QueueBrowser : public Closeable {
     public:
@@ -38,6 +41,7 @@
 
         /**
          * @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;
@@ -45,17 +49,23 @@
         /**
          * @returns the MessageSelector that is used on when this browser was
          * created or empty string if no selector was present.
+         *
          * @throws CMSException if an internal error occurs.
          */
-        virtual std::string getMessageSelector() const throw ( cms::CMSExceptio ) = 0;
+        virtual std::string getMessageSelector() const throw ( cms::CMSException ) = 0;
 
         /**
          * Gets an enumeration for browsing the current queue messages in the
-         * order they would be received.
-         * @returns an stl vector for browsing the messages.
+         * order they would be received.  The enumeration returned is a static view
+         * of the Queue and is not updated as new Messages arrive, the client should
+         * refresh its enumeration by calling this method again.
+         *
+         * @returns an STL vector for browsing the messages.
+         *
          * @throws CMSException if an internal error occurs.
          */
-        virtual std::vector<cms::Message*> getEnumeration() const throw ( cms::CMSException ) = 0;
+        virtual std::vector<const cms::Message*> getEnumeration() const
+            throw ( cms::CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -28,12 +28,12 @@
 #include <cms/MessageConsumer.h>
 #include <cms/Topic.h>
 #include <cms/Queue.h>
+#include <cms/QueueBrowser.h>
 #include <cms/TemporaryTopic.h>
 #include <cms/TemporaryQueue.h>
 #include <cms/CMSException.h>
 
-namespace cms
-{
+namespace cms{
 
     /**
      * A Session object is a single-threaded context for producing and consuming
@@ -64,13 +64,25 @@
      * If a client desires to have one thread produce messages while others consume
      * them, the client should use a separate session for its producing thread.
      *
+     * Certain rules apply to a session's <code>close</code> method and are detailed
+     * below.
+     *
+     *  - There is no need to close the producers and consumers of a closed session.
+     *  - The close call will block until a receive call or message listener in progress
+     *    has completed. A blocked message consumer receive call returns null when this
+     *    session is closed.
+     *  - Closing a transacted session must roll back the transaction in progress.
+     *  - The close method is the only Session method that can be called concurrently.
+     *  - Invoking any other Session method on a closed session must throw an
+     *    IllegalStateException. Closing a closed session must not throw  any exceptions.
+     *
      * @since 1.0
      */
     class CMS_API Session : public Closeable {
     public:
 
-        enum AcknowledgeMode
-        {
+        enum AcknowledgeMode {
+
             /**
              * With this acknowledgment mode, the session automatically
              * acknowledges a client's receipt of a message either when
@@ -119,7 +131,7 @@
          * Closes this session as well as any active child consumers or
          * producers.
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual void close() throw( CMSException ) = 0;
 
@@ -127,7 +139,8 @@
          * Commits all messages done in this transaction and releases any
          * locks currently held.
          *
-         * @throws CMSException
+         * @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;
 
@@ -135,22 +148,46 @@
          * Rolls back all messages done in this transaction and releases any
          * locks currently held.
          *
-         * @throws CMSException
+         * @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;
 
         /**
+         * Stops message delivery in this session, and restarts message delivery with the
+         * oldest unacknowledged message.
+         *
+         * All consumers deliver messages in a serial order. Acknowledging a received message
+         * automatically acknowledges all messages that have been delivered to the client.
+         *
+         * Restarting a session causes it to take the following actions:
+         *
+         *  - Stop message delivery
+         *  - Mark all messages that might have been delivered but not acknowledged
+         *    as "redelivered"
+         *  - Restart the delivery sequence including all unacknowledged messages that had
+         *    been previously delivered.  Redelivered messages do not have to be delivered in
+         *    exactly their original delivery order.
+         *
+         * @throws CMSException - if the CMS provider fails to stop and restart message
+         *                        delivery due to some internal error.
+         * @throws IllegalStateException - if the method is called by a transacted session.
+         */
+        virtual void recover() throw( CMSException ) = 0;
+
+        /**
          * Creates a MessageConsumer for the specified destination.
          *
          * @param destination
          *      the Destination that this consumer receiving messages for.
          * @return pointer to a new MessageConsumer that is owned by the
          *         caller ( caller deletes )
-         * @throws CMSException
+         *
+         * @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 )
+            throw ( CMSException ) = 0;
 
         /**
          * Creates a MessageConsumer for the specified destination, using a
@@ -162,7 +199,10 @@
          *      the Message Selector to use
          * @return pointer to a new MessageConsumer that is owned by the
          *         caller ( caller deletes )
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
+         * @throws InvalidDestinationException - if an invalid destination is specified.
+         * @throws InvalidSelectorException - if the message selector is invalid.
          */
         virtual MessageConsumer* createConsumer(
             const Destination* destination,
@@ -183,7 +223,10 @@
          *      for NoLocal is not specified if the destination is a queue.
          * @return pointer to a new MessageConsumer that is owned by the
          *         caller ( caller deletes )
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
+         * @throws InvalidDestinationException - if an invalid destination is specified.
+         * @throws InvalidSelectorException - if the message selector is invalid.
          */
         virtual MessageConsumer* createConsumer(
             const Destination* destination,
@@ -192,8 +235,10 @@
                 throw ( CMSException ) = 0;
 
         /**
-         * Creates a durable subscriber to the specified topic, using a
-         * message selector
+         * Creates a durable subscriber to the specified topic, using a Message
+         * selector.  Sessions that create durable consumers must use the same client Id
+         * as was used the last time the subscription was created in order to receive
+         * all messages that were delivered while the client was offline.
          *
          * @param destination
          *      the topic to subscribe to
@@ -207,7 +252,10 @@
          *      for NoLocal is not specified if the destination is a queue.
          * @return pointer to a new durable MessageConsumer that is owned by
          *         the caller ( caller deletes )
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
+         * @throws InvalidDestinationException - if an invalid destination is specified.
+         * @throws InvalidSelectorException - if the message selector is invalid.
          */
         virtual MessageConsumer* createDurableConsumer(
             const Topic* destination,
@@ -223,18 +271,49 @@
          * @param destination
          *      the Destination to send on
          * @return New MessageProducer that is owned by the caller.
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
+         * @throws InvalidDestinationException - if an invalid destination is specified.
          */
         virtual MessageProducer* createProducer( const Destination* destination )
             throw ( CMSException ) = 0;
 
         /**
+         * Creates a new QueueBrowser to peek at Messages on the given Queue.
+         *
+         * @param queue
+         *      the Queue to browse
+         * @return New QueueBrowser that is owned by the caller.
+         *
+         * @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;
+
+        /**
+         * Creates a new QueueBrowser to peek at Messages on the given Queue.
+         *
+         * @param queue
+         *      the Queue to browse
+         * @param selector
+         *      the Message selector to filter which messages are browsed.
+         * @return New QueueBrowser that is owned by the caller.
+         *
+         * @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;
+
+        /**
          * Creates a queue identity given a Queue name.
          *
          * @param queueName
          *      the name of the new Queue
          * @return new Queue pointer that is owned by the caller.
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual Queue* createQueue( const std::string& queueName )
             throw ( CMSException ) = 0;
@@ -245,7 +324,8 @@
          * @param topicName
          *      the name of the new Topic
          * @return new Topic pointer that is owned by the caller.
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual Topic* createTopic( const std::string& topicName )
             throw ( CMSException ) = 0;
@@ -254,7 +334,8 @@
          * Creates a TemporaryQueue object.
          *
          * @return new TemporaryQueue pointer that is owned by the caller.
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual TemporaryQueue* createTemporaryQueue()
             throw ( CMSException ) = 0;
@@ -262,7 +343,7 @@
         /**
          * Creates a TemporaryTopic object.
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual TemporaryTopic* createTemporaryTopic()
             throw ( CMSException ) = 0;
@@ -270,7 +351,7 @@
         /**
          * Creates a new Message
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual Message* createMessage()
             throw ( CMSException ) = 0;
@@ -278,7 +359,7 @@
         /**
          * Creates a BytesMessage
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual BytesMessage* createBytesMessage()
             throw ( CMSException) = 0;
@@ -290,7 +371,8 @@
          *      an array of bytes to set in the message
          * @param bytesSize
          *      the size of the bytes array, or number of bytes to use
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual BytesMessage* createBytesMessage(
             const unsigned char* bytes,
@@ -300,7 +382,7 @@
         /**
          * Creates a new StreamMessage
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual StreamMessage* createStreamMessage()
             throw ( CMSException ) = 0;
@@ -308,7 +390,7 @@
         /**
          * Creates a new TextMessage
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual TextMessage* createTextMessage()
             throw ( CMSException ) = 0;
@@ -318,7 +400,8 @@
          *
          * @param text
          *      the initial text for the message
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual TextMessage* createTextMessage( const std::string& text )
             throw ( CMSException ) = 0;
@@ -326,7 +409,7 @@
         /**
          * Creates a new MapMessage
          *
-         * @throws CMSException
+         * @throws CMSException - If an internal error occurs.
          */
         virtual MapMessage* createMapMessage()
             throw ( CMSException ) = 0;
@@ -335,15 +418,20 @@
          * Returns the acknowledgment mode of the session.
          *
          * @return the Sessions Acknowledge Mode
+         *
+         * @throws CMSException - If an internal error occurs.
          */
-        virtual AcknowledgeMode getAcknowledgeMode() const = 0;
+        virtual AcknowledgeMode getAcknowledgeMode() const
+            throw ( CMSException ) = 0;
 
         /**
          * Gets if the Sessions is a Transacted Session
          *
          * @return transacted true - false.
+         *
+         * @throws CMSException - If an internal error occurs.
          */
-        virtual bool isTransacted() const = 0;
+        virtual bool isTransacted() const throw ( CMSException ) = 0;
 
         /**
          * Unsubscribes a durable subscription that has been created by a
@@ -358,7 +446,8 @@
          *
          * @param name
          *      The name used to identify this subscription
-         * @throws CMSException
+         *
+         * @throws CMSException - If an internal error occurs.
          */
         virtual void unsubscribe( const std::string& name )
             throw ( CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -14,30 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-#ifndef CMS_STARTABLE_H
-#define CMS_STARTABLE_H
+
+#ifndef _CMS_STARTABLE_H
+#define _CMS_STARTABLE_H
 
 #include <cms/Config.h>
 #include <cms/CMSException.h>
 
 namespace cms{
-    
+
     /**
      * Interface for a class that implements the start method.
+     *
+     * @since 1.0
      */
-    class CMS_API Startable{
-        
+    class CMS_API Startable {
     public:
-    
-        virtual ~Startable(){}
-        
+
+        virtual ~Startable() {}
+
         /**
          * Starts the service.
+         *
+         * @throws CMSException if an internal error occurs while starting.
          */
         virtual void start() throw( CMSException ) = 0;
-        
+
     };
 }
 
-#endif /*CMS_STARTABLE_H*/
+#endif /*_CMS_STARTABLE_H*/

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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -14,30 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-#ifndef CMS_STOPPABLE_H
-#define CMS_STOPPABLE_H
+
+#ifndef _CMS_STOPPABLE_H
+#define _CMS_STOPPABLE_H
 
 #include <cms/Config.h>
 #include <cms/CMSException.h>
 
 namespace cms{
-    
+
     /**
      * Interface for a class that implements the stop method.
+     *
+     * @since 1.0
      */
     class CMS_API Stoppable{
-        
     public:
-    
-        virtual ~Stoppable(){}
-        
+
+        virtual ~Stoppable() {}
+
         /**
          * Stops this service.
+         *
+         * @throws CMSException - if an internal error occurs whle stopping the Service.
          */
         virtual void stop() throw( CMSException ) = 0;
-        
+
     };
 }
 
-#endif /*CMS_STOPPABLE_H*/
+#endif /*_CMS_STOPPABLE_H*/

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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -55,7 +55,7 @@
      *    |----------------------------------------------------------------------
      *
      *
-     * @since 1.2
+     * @since 1.3
      */
     class CMS_API StreamMessage : public Message {
     public:

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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -26,25 +26,27 @@
 
     /**
      * An interface encapsulating a provider-specific queue name.
+     *
+     * @since 1.0
      */
-    class CMS_API TemporaryQueue : public Destination
-    {
+    class CMS_API TemporaryQueue : public Destination {
     public:
 
         virtual ~TemporaryQueue() {}
 
         /**
          * Gets the name of this queue.
-         * 
+         *
          * @return The queue name.
+         *
+         * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getQueueName() const
-            throw( CMSException ) = 0;
+        virtual std::string getQueueName() const throw( CMSException ) = 0;
 
         /**
          * Destroy's the Temp Destination at the Broker
-         * 
-         * @throws CMSException
+         *
+         * @throws CMSException - if an internal error occurs.
          */
         virtual void destroy() throw ( CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -35,15 +35,16 @@
 
         /**
          * Gets the name of this topic.
-         * 
+         *
          * @return The topic name.
+         *
+         * @throws CMSException - if an internal error occurs.
          */
-        virtual std::string getTopicName()
-            const throw( CMSException ) = 0;
+        virtual std::string getTopicName() const throw( CMSException ) = 0;
 
         /**
          * Destroy's the Temp Destination at the Broker
-         * 
+         *
          * @throws CMSException
          */
         virtual void destroy() throw ( CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -23,37 +23,46 @@
 #include <cms/CMSException.h>
 
 namespace cms{
-    
+
     /**
      * Interface for a text message.
+     *
+     * @since 1.0
      */
     class CMS_API TextMessage : public Message{
-
     public:
 
         virtual ~TextMessage(){}
 
         /**
          * Gets the message character buffer.
-         * 
+         *
          * @return The message character buffer.
+         *
+         * @throws CMSException - if an internal error occurs.
          */
         virtual std::string getText() const throw( CMSException ) = 0;
 
         /**
          * Sets the message contents, does not take ownership of the passed
          * char*, but copies it instead.
-         * 
-         * @param msg 
+         *
+         * @param msg
          *      The message buffer.
+         *
+         * @throws CMSException - if an internal error occurs.
+         * @throws MessageNotWriteableException - if the message is in read-only mode..
          */
         virtual void setText( const char* msg ) throw( CMSException ) = 0;
 
         /**
          * Sets the message contents
-         * 
-         * @param msg 
+         *
+         * @param msg
          *      The message buffer.
+         *
+         * @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( CMSException ) = 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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -23,24 +23,27 @@
 #include <cms/CMSException.h>
 
 namespace cms{
-    
+
     /**
      * An interface encapsulating a provider-specific topic name.
+     *
+     * @since 1.0
      */
     class CMS_API Topic : public Destination{
-        
     public:
-    
+
         virtual ~Topic() {}
-        
+
         /**
          * Gets the name of this topic.
-         * 
+         *
          * @return The topic name.
+         *
+         * @throws CMSException - If an internal error occurs.
          */
-        virtual std::string getTopicName() 
+        virtual std::string getTopicName()
             const throw( CMSException ) = 0;
-            
+
     };
 
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp Mon May 18 15:13:29 2009
@@ -57,8 +57,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 int StandardInputStream::read( unsigned char* buffer,
-                               std::size_t offset,
-                               std::size_t bufferSize )
+                               std::size_t offset DECAF_UNUSED,
+                               std::size_t bufferSize DECAF_UNUSED )
     throw ( decaf::io::IOException, decaf::lang::exceptions::NullPointerException ) {
 
     if( buffer == NULL ) {
@@ -71,7 +71,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::size_t StandardInputStream::skip( std::size_t num )
+std::size_t StandardInputStream::skip( std::size_t num DECAF_UNUSED )
     throw ( decaf::io::IOException,
             decaf::lang::exceptions::UnsupportedOperationException ) {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/CharArrayBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/CharArrayBuffer.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/CharArrayBuffer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/nio/CharArrayBuffer.cpp Mon May 18 15:13:29 2009
@@ -306,8 +306,6 @@
 CharSequence* CharArrayBuffer::subSequence( std::size_t start, std::size_t end ) const
     throw ( decaf::lang::exceptions::IndexOutOfBoundsException ) {
 
-    CharArrayBuffer* buffer = NULL;
-
     try{
 
         if( start > end ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/HexStringParser.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/HexStringParser.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/HexStringParser.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/HexStringParser.cpp Mon May 18 15:13:29 2009
@@ -293,7 +293,7 @@
 
     //If the Integer part is a zero number.
     int i;
-    for( i = 0; (std::size_t)i < strDecimalPart.length() && strDecimalPart.at(i) == '0'; i++ );
+    for( i = 0; (std::size_t)i < strDecimalPart.length() && strDecimalPart.at(i) == '0'; i++ ) {};
 
     if( (std::size_t)i == strDecimalPart.length() ) {
         return 0;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Long.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Long.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Long.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Long.cpp Mon May 18 15:13:29 2009
@@ -286,12 +286,12 @@
     unsigned long long uvalue = (unsigned long long)value;
 
     // From Hacker's Delight, 7-1, Figure 7-1
-    uvalue = ( uvalue & 0x5555555555555555ULL ) << 1 | (uvalue >> 1) &
-             0x5555555555555555ULL;
-    uvalue = ( uvalue & 0x3333333333333333ULL ) << 2 | (uvalue >> 2) &
-             0x3333333333333333ULL;
-    uvalue = ( uvalue & 0x0F0F0F0F0F0F0F0FULL ) << 4 | (uvalue >> 4) &
-             0x0F0F0F0F0F0F0F0FULL;
+    uvalue = ( ( uvalue & 0x5555555555555555ULL ) << 1 ) | ( (uvalue >> 1) &
+             0x5555555555555555ULL );
+    uvalue = ( ( uvalue & 0x3333333333333333ULL ) << 2 ) | ( (uvalue >> 2) &
+             0x3333333333333333ULL );
+    uvalue = ( ( uvalue & 0x0F0F0F0F0F0F0F0FULL ) << 4 ) | ( (uvalue >> 4) &
+             0x0F0F0F0F0F0F0F0FULL );
 
     return reverseBytes( uvalue );
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Throwable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Throwable.h?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Throwable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Throwable.h Mon May 18 15:13:29 2009
@@ -34,14 +34,14 @@
      * library should extend from this or from the Exception class in order to ensure
      * that all Decaf Exceptions are interchangeable with the std::exception class.
      *
-     * Throwable can wrap another throwable as the cause if the error being thrown.
+     * Throwable can wrap another Throwable as the cause if the error being thrown.
      * The user can inspect the cause by calling <code>getCause</code>, the pointer
      * returned is the property of the Throwable instance and will be deleted when it
      * is deleted or goes out of scope.
      *
      * @since 1.0
      */
-    class DECAF_API Throwable : public virtual std::exception {
+    class DECAF_API Throwable : public std::exception {
     public:
 
         Throwable() throw() : std::exception() {}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URL.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URL.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URL.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URL.cpp Mon May 18 15:13:29 2009
@@ -26,5 +26,5 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-URL::URL( const std::string& url ) {
+URL::URL( const std::string& url DECAF_UNUSED ) {
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp Mon May 18 15:13:29 2009
@@ -101,7 +101,7 @@
 void TimeUnit::sleep( long long timeout ) const {
     if( timeout > 0 ) {
         long long ms = toMillis( timeout );
-        int ns = excessNanos( timeout, ms );
+        //int ns = excessNanos( timeout, ms );
         Thread::sleep( (int)ms );
         // TODO - Only have a wait for Milliseconds currently.
         //Thread::sleep( ms, ns );
@@ -112,7 +112,7 @@
 void TimeUnit::timedWait( Synchronizable* obj, long long timeout ) const {
     if( timeout > 0 ) {
         long long ms = toMillis( timeout );
-        int ns = excessNanos( timeout, ms );
+        //int ns = excessNanos( timeout, ms );
         obj->wait( (unsigned long)ms );
         // TODO - Only have a wait for Milliseconds currently.
         //obj.wait( ms, ns );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp Mon May 18 15:13:29 2009
@@ -37,8 +37,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 bool AtomicBoolean::compareAndSet( bool expect, bool update ) {
-    int upd = update ? 1 : 0;
-    int exp = expect ? 1 : 0;
+    unsigned int upd = update ? 1 : 0;
+    unsigned int exp = expect ? 1 : 0;
     return apr_atomic_cas32( &this->value, upd, exp ) == exp;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/TestRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/TestRegistry.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/TestRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/TestRegistry.cpp Mon May 18 15:13:29 2009
@@ -53,8 +53,9 @@
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompCmsTemplateTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompDurableTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompExpirationTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompSimpleRollbackTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompSimpleTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompTransactionTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompSlowListenerTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompJmsMessageGroupsTest );
+
+//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompTransactionTest );
+//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::test::stomp::StompSimpleRollbackTest );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/IntegrationCommon.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/IntegrationCommon.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/IntegrationCommon.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/util/IntegrationCommon.cpp Mon May 18 15:13:29 2009
@@ -22,7 +22,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 const int IntegrationCommon::defaultDelay = 1000;
-const unsigned int IntegrationCommon::defaultMsgCount = 999;
+const unsigned int IntegrationCommon::defaultMsgCount = 2000;
 bool IntegrationCommon::debug = false;
 
 ////////////////////////////////////////////////////////////////////////////////

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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -24,14 +24,14 @@
 namespace activemq {
 namespace cmsutil {
 
-    class DummyConsumer : public cms::MessageConsumer {  
+    class DummyConsumer : public cms::MessageConsumer {
     private:
         std::string selector;
         cms::MessageListener* listener;
         MessageContext* messageContext;
         const cms::Destination* dest;
         bool noLocal;
-        
+
     public:
 
         DummyConsumer(MessageContext* messageContext, const cms::Destination* dest, const std::string& selector, bool noLocal) {
@@ -42,7 +42,7 @@
             this->listener = NULL;
         }
         virtual ~DummyConsumer() {}
-              
+
         virtual void close() throw( cms::CMSException ){}
 
         virtual cms::Message* receive() throw ( cms::CMSException ) {
@@ -57,21 +57,21 @@
             return messageContext->receive(dest, selector, noLocal, -1);
         }
 
-        virtual void setMessageListener( cms::MessageListener* listener ) {
+        virtual void setMessageListener( cms::MessageListener* listener ) throw ( cms::CMSException ) {
             this->listener = listener;
         }
 
-        virtual cms::MessageListener* getMessageListener() const {
+        virtual cms::MessageListener* getMessageListener() const throw ( cms::CMSException ) {
             return listener;
         }
 
-        virtual std::string getMessageSelector() const 
+        virtual std::string getMessageSelector() const
             throw ( cms::CMSException ) {
             return selector;
         }
-        
+
     };
-    
+
 }}
 
 #endif /*ACTIVEMQ_CMSUTIL_DUMMYCONSUMER_H_*/

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=775980&r1=775979&r2=775980&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 May 18 15:13:29 2009
@@ -22,132 +22,132 @@
 
 namespace activemq{
 namespace cmsutil{
-   
+
     class DummyMessage : public cms::Message
-    {         
+    {
     public:
-   
+
         virtual ~DummyMessage(){}
-      
-        virtual Message* clone() const { return NULL; }               
-        
+
+        virtual Message* clone() const { return NULL; }
+
         virtual void acknowledge() const throw( cms::CMSException ){}
-      
-        virtual void clearBody(){}
-        
-        virtual void clearProperties(){}
-  
-        virtual std::vector<std::string> getPropertyNames() const {
+
+        virtual void clearBody() throw ( cms::CMSException ){}
+
+        virtual void clearProperties() throw ( cms::CMSException ){}
+
+        virtual std::vector<std::string> getPropertyNames() const throw ( cms::CMSException ) {
             return std::vector<std::string>();
         }
-        
-        virtual bool propertyExists( const std::string& name ) const {
+
+        virtual bool propertyExists( const std::string& name ) const throw ( cms::CMSException ) {
             return false;
         }
-        
-        virtual bool getBooleanProperty( const std::string& name ) const 
+
+        virtual bool getBooleanProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return false;
         }
-        
-        virtual unsigned char getByteProperty( const std::string& name ) const 
+
+        virtual unsigned char getByteProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return (unsigned char)0;
         }
-        virtual double getDoubleProperty( const std::string& name ) const 
+        virtual double getDoubleProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return 0.0;
         }
-        
-        virtual float getFloatProperty( const std::string& name ) const 
+
+        virtual float getFloatProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return 0.0f;
         }
-            
-        virtual int getIntProperty( const std::string& name ) const 
+
+        virtual int getIntProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return 0;
         }
-        virtual long long getLongProperty( const std::string& name ) const 
+        virtual long long getLongProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return 0LL;
         }
-          
-        virtual short getShortProperty( const std::string& name ) const 
+
+        virtual short getShortProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return 0;
         }
-            
-        virtual std::string getStringProperty( const std::string& name ) const 
+
+        virtual std::string getStringProperty( const std::string& name ) const
             throw( cms::CMSException ) {
             return "";
         }
-        
+
         virtual void setBooleanProperty( const std::string& name,
             bool value ) throw( cms::CMSException ) {}
-            
+
         virtual void setByteProperty( const std::string& name,
             unsigned char value ) throw( cms::CMSException ) {}
-            
+
         virtual void setDoubleProperty( const std::string& name,
             double value ) throw( cms::CMSException ) {}
-            
+
         virtual void setFloatProperty( const std::string& name,
             float value ) throw( cms::CMSException ) {}
-            
-        
+
+
         virtual void setIntProperty( const std::string& name,
             int value ) throw( cms::CMSException ) {}
-            
+
         virtual void setLongProperty( const std::string& name,
             long long value ) throw( cms::CMSException ) {}
-            
+
         virtual void setShortProperty( const std::string& name,
             short value ) throw( cms::CMSException ) {}
-            
+
         virtual void setStringProperty( const std::string& name,
             const std::string& value ) throw( cms::CMSException ) {}
-      
-        virtual std::string getCMSCorrelationID() const {return "";}
 
-        virtual void setCMSCorrelationID( const std::string& correlationId ) {}
+        virtual std::string getCMSCorrelationID() const throw ( cms::CMSException ) {return "";}
+
+        virtual void setCMSCorrelationID( const std::string& correlationId ) throw ( cms::CMSException ) {}
+
+        virtual int getCMSDeliveryMode() const throw ( cms::CMSException ) { return 0; }
+
+        virtual void setCMSDeliveryMode( int mode ) throw ( cms::CMSException ) {}
+
+        virtual const cms::Destination* getCMSDestination() const throw ( cms::CMSException ) { return NULL; }
+
+        virtual void setCMSDestination( const cms::Destination* destination ) throw ( cms::CMSException ) {}
+
+        virtual long long getCMSExpiration() const throw ( cms::CMSException ) { return 0LL; }
+
+        virtual void setCMSExpiration( long long expireTime ) throw ( cms::CMSException ) {}
+
+        virtual std::string getCMSMessageID() const throw ( cms::CMSException ) { return ""; }
+
+        virtual void setCMSMessageID( const std::string& id ) throw ( cms::CMSException ) {}
+
+        virtual int getCMSPriority() const throw ( cms::CMSException ) { return 0; }
+
+        virtual void setCMSPriority( int priority ) throw ( cms::CMSException ) {}
+
+        virtual bool getCMSRedelivered() const throw ( cms::CMSException ) { return false; }
+
+        virtual void setCMSRedelivered( bool redelivered ) throw ( cms::CMSException ) {}
+
+        virtual const cms::Destination* getCMSReplyTo() const throw ( cms::CMSException ) { return NULL; }
+
+        virtual void setCMSReplyTo( const cms::Destination* destination ) throw ( cms::CMSException ) {}
+
+        virtual long long getCMSTimestamp() const throw ( cms::CMSException ) { return 0LL; }
+
+        virtual void setCMSTimestamp( long long timeStamp ) throw ( cms::CMSException ) {}
+
+        virtual std::string getCMSType() const throw ( cms::CMSException ) { return ""; }
 
-        virtual int getCMSDeliveryMode() const { return 0; }
+        virtual void setCMSType( const std::string& type ) throw ( cms::CMSException ) {}
 
-        virtual void setCMSDeliveryMode( int mode ) {}
-      
-        virtual const cms::Destination* getCMSDestination() const { return NULL; }
-      
-        virtual void setCMSDestination( const cms::Destination* destination ) {}
-              
-        virtual long long getCMSExpiration() const { return 0LL; }
-      
-        virtual void setCMSExpiration( long long expireTime ) {}
-              
-        virtual std::string getCMSMessageID() const { return ""; }
-        
-        virtual void setCMSMessageID( const std::string& id ) {}
-      
-        virtual int getCMSPriority() const { return 0; }
-      
-        virtual void setCMSPriority( int priority ) {}
-
-        virtual bool getCMSRedelivered() const { return false; }
-      
-        virtual void setCMSRedelivered( bool redelivered ) {}
-
-        virtual const cms::Destination* getCMSReplyTo() const { return NULL; }
-      
-        virtual void setCMSReplyTo( const cms::Destination* destination ) {}
-        
-        virtual long long getCMSTimestamp() const { return 0LL; }
-      
-        virtual void setCMSTimestamp( long long timeStamp ) {}
-
-        virtual std::string getCMSType() const { return ""; }
-      
-        virtual void setCMSType( const std::string& type ) {}
-        
     };
 }}
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyProducer.h?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummyProducer.h Mon May 18 15:13:29 2009
@@ -24,7 +24,7 @@
 namespace activemq {
 namespace cmsutil {
 
-    class DummyProducer : public cms::MessageProducer {  
+    class DummyProducer : public cms::MessageProducer {
     private:
         const cms::Destination* dest;
         int deliveryMode;
@@ -33,7 +33,7 @@
         int priority;
         long long ttl;
         MessageContext* messageContext;
-        
+
     public:
 
         DummyProducer(MessageContext* messageContext, const cms::Destination* dest) {
@@ -46,14 +46,14 @@
             this->messageContext = messageContext;
         }
         virtual ~DummyProducer() {}
-              
+
         virtual void close() throw( cms::CMSException ){}
-        
+
         /**
          * Sends the message to the default producer destination, but does
          * not take ownership of the message, caller must still destroy it.
          * Uses default values for deliveryMode, priority, and time to live.
-         * 
+         *
          * @param message
          *      The message to be sent.
          * @throws cms::CMSException
@@ -65,28 +65,28 @@
         /**
          * Sends the message to the default producer destination, but does
          * not take ownership of the message, caller must still destroy it.
-         * 
+         *
          * @param message
          *      The message to be sent.
-         * @param deliveryMode 
+         * @param deliveryMode
          *      The delivery mode to be used.
-         * @param priority 
+         * @param priority
          *      The priority for this message.
-         * @param timeToLive 
+         * @param timeToLive
          *      The time to live value for this message in milliseconds.
          * @throws cms::CMSException
          */
-        virtual void send( cms::Message* message, int deliveryMode, int priority, 
+        virtual void send( cms::Message* message, int deliveryMode, int priority,
             long long timeToLive) throw ( cms::CMSException ){
-            
+
             send(dest, message, deliveryMode, priority, timeToLive);
         }
-            
+
         /**
          * Sends the message to the designated destination, but does
          * not take ownership of the message, caller must still destroy it.
          * Uses default values for deliveryMode, priority, and time to live.
-         * 
+         *
          * @param destination
          *      The destination on which to send the message
          * @param message
@@ -97,65 +97,65 @@
                            cms::Message* message ) throw ( cms::CMSException ){
             send(dest, message, deliveryMode, priority, ttl);
         }
-                           
+
         /**
          * Sends the message to the designated destination, but does
          * not take ownership of the message, caller must still destroy it.
-         * 
+         *
          * @param destination
          *      The destination on which to send the message
          * @param message
          *      The message to be sent.
          * @param deliveryMode
          *      The delivery mode to be used.
-         * @param priority 
+         * @param priority
          *      The priority for this message.
-         * @param timeToLive 
+         * @param timeToLive
          *      The time to live value for this message in milliseconds.
          * @throws cms::CMSException
-         */     
+         */
         virtual void send( const cms::Destination* destination,
-            cms::Message* message, int deliveryMode, int priority, 
+            cms::Message* message, int deliveryMode, int priority,
             long long timeToLive) throw ( cms::CMSException ){
-            
+
             messageContext->send(destination, message, deliveryMode, priority, timeToLive);
         }
-            
-        /** 
+
+        /**
          * Sets the delivery mode for this Producer
-         * 
+         *
          * @param mode
          *      The DeliveryMode
          */
-        virtual void setDeliveryMode( int mode ) {
+        virtual void setDeliveryMode( int mode ) throw ( cms::CMSException ) {
             this->deliveryMode = mode;
         }
-      
-        /** 
+
+        /**
          * Gets the delivery mode for this Producer
-         * 
+         *
          * @return The DeliveryMode
          */
-        virtual int getDeliveryMode() const {
+        virtual int getDeliveryMode() const throw ( cms::CMSException ) {
             return deliveryMode;
         }
-      
+
         /**
          * Sets if Message Ids are disbled for this Producer
-         * 
+         *
          * @param value
          *      boolean indicating enable / disable (true / false)
          */
-        virtual void setDisableMessageID( bool value ) {
+        virtual void setDisableMessageID( bool value ) throw ( cms::CMSException ) {
             disableMessageId = value;
         }
-      
+
         /**
          * Gets if Message Ids are disbled for this Producer
-         * 
+         *
          * @return boolean indicating enable / disable (true / false)
          */
-        virtual bool getDisableMessageID() const {
+        virtual bool getDisableMessageID() const throw ( cms::CMSException ) {
             return disableMessageId;
         }
 
@@ -163,61 +163,61 @@
          * Sets if Message Time Stamps are disbled for this Producer
          * @param value - boolean indicating enable / disable (true / false)
          */
-        virtual void setDisableMessageTimeStamp( bool value ) {
+        virtual void setDisableMessageTimeStamp( bool value ) throw ( cms::CMSException ) {
             disableMessageTimestamp = value;
         }
-      
+
         /**
          * Gets if Message Time Stamps are disbled for this Producer
-         * 
+         *
          * @return boolean indicating enable / disable (true / false)
          */
-        virtual bool getDisableMessageTimeStamp() const {
+        virtual bool getDisableMessageTimeStamp() const throw ( cms::CMSException ) {
             return disableMessageTimestamp;
         }
-      
+
         /**
          * Sets the Priority that this Producers sends messages at
-         * 
+         *
          * @param priority
          *      int value for Priority level
          */
-        virtual void setPriority( int priority ) {
+        virtual void setPriority( int priority ) throw ( cms::CMSException ) {
             this->priority = priority;
         }
-      
+
         /**
          * Gets the Priority level that this producer sends messages at
-         * 
+         *
          * @return int based priority level
          */
-        virtual int getPriority() const {
+        virtual int getPriority() const throw ( cms::CMSException ) {
             return priority;
         }
-      
+
         /**
          * Sets the Time to Live that this Producers sends messages with.  This
          * value will be used if the time to live is not specified via the
          * send method.
-         * 
+         *
          * @param time
          *      default time to live value in milliseconds
          */
-        virtual void setTimeToLive( long long time ) {
+        virtual void setTimeToLive( long long time ) throw ( cms::CMSException ) {
             ttl = time;
         }
-      
+
         /**
          * Gets the Time to Live that this producer sends messages with
-         * 
+         *
          * @return Time to live value in milliseconds
          */
-        virtual long long getTimeToLive() const {
+        virtual long long getTimeToLive() const throw ( cms::CMSException ) {
             return ttl;
         }
-        
+
     };
-    
+
 }}
 
 #endif /*ACTIVEMQ_CMSUTIL_DUMMYPRODUCER_H_*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/cmsutil/DummySession.h Mon May 18 15:13:29 2009
@@ -51,6 +51,8 @@
 
         virtual void rollback() throw ( cms::CMSException ) {}
 
+        virtual void recover() throw ( cms::CMSException ) {}
+
         virtual cms::MessageConsumer* createConsumer(
             const cms::Destination* destination )
                 throw ( cms::CMSException ) {
@@ -83,6 +85,12 @@
         virtual cms::MessageProducer* createProducer( const cms::Destination* destination )
             throw ( cms::CMSException ) { return new DummyProducer(messageContext, destination); }
 
+        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue )
+            throw( cms::CMSException ) { return NULL; }
+
+        virtual cms::QueueBrowser* createBrowser( const cms::Queue* queue, const std::string& selector )
+            throw( cms::CMSException ) { return NULL; }
+
         virtual cms::Queue* createQueue( const std::string& queueName )
             throw ( cms::CMSException ) {
             return new activemq::commands::ActiveMQQueue( queueName );
@@ -124,12 +132,17 @@
         virtual cms::MapMessage* createMapMessage()
             throw ( cms::CMSException ){ return NULL; }
 
-        virtual cms::Session::AcknowledgeMode getAcknowledgeMode() const { return mode; }
+        virtual cms::Session::AcknowledgeMode getAcknowledgeMode() const throw ( cms::CMSException ) {
+            return mode;
+        }
+
         virtual void setAcknowledgeMode(cms::Session::AcknowledgeMode mode) {
             this->mode = mode;
         }
 
-        virtual bool isTransacted() const{ return mode==cms::Session::SESSION_TRANSACTED; }
+        virtual bool isTransacted() const throw ( cms::CMSException ){
+            return mode==cms::Session::SESSION_TRANSACTED;
+        }
 
         virtual void unsubscribe( const std::string& name )
             throw ( cms::CMSException ){}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.cpp Mon May 18 15:13:29 2009
@@ -98,9 +98,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQExceptionTest::testMessage0(){
-    char* text = "This is a test";
-      ActiveMQException ex( __FILE__, __LINE__, text );
-      CPPUNIT_ASSERT( strcmp( ex.getMessage().c_str(), text ) == 0 );
+    const char* text = "This is a test";
+    ActiveMQException ex( __FILE__, __LINE__, text );
+    CPPUNIT_ASSERT( strcmp( ex.getMessage().c_str(), text ) == 0 );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/LongArrayBufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/LongArrayBufferTest.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/LongArrayBufferTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/internal/nio/LongArrayBufferTest.cpp Mon May 18 15:13:29 2009
@@ -511,7 +511,7 @@
     for( std::size_t i = 0; i < testBuffer1->capacity(); i++ ) {
         CPPUNIT_ASSERT( testBuffer1->position() == 0 );
         LongBuffer& ret = testBuffer1->put(i, i );
-        CPPUNIT_ASSERT( testBuffer1->get(i) == i );
+        CPPUNIT_ASSERT( testBuffer1->get(i) == (long long)i );
         CPPUNIT_ASSERT( &ret == testBuffer1 );
     }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/URISyntaxExceptionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/URISyntaxExceptionTest.cpp?rev=775980&r1=775979&r2=775980&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/URISyntaxExceptionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/URISyntaxExceptionTest.cpp Mon May 18 15:13:29 2009
@@ -38,5 +38,5 @@
     URISyntaxException e2( __FILE__, __LINE__, "str", "problem");
     CPPUNIT_ASSERT_MESSAGE("returned incorrect reason", e2.getReason() == "problem" );
     CPPUNIT_ASSERT_MESSAGE("returned incorrect input", e2.getInput() == "str" );
-    CPPUNIT_ASSERT_MESSAGE("returned incorrect index", -1 == e2.getIndex());
+    CPPUNIT_ASSERT_MESSAGE("returned incorrect index", -1 == (int)e2.getIndex());
 }



Mime
View raw message