activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r518951 - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/activemq/connector/openwire/commands/ main/activemq/connector/stomp/commands/ main/activemq/core/ main/cms/ test-integration/integration/connector/openwire/ test-integration/i...
Date Fri, 16 Mar 2007 12:05:28 GMT
Author: nmittler
Date: Fri Mar 16 05:05:27 2007
New Revision: 518951

URL: http://svn.apache.org/viewvc?view=rev&rev=518951
Log:
AMQCPP-89 - making method names in CMS consistent with JMS

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
Fri Mar 16 05:05:27 2007
@@ -614,7 +614,7 @@
          * Gets the Time Stamp for this Message
          * @return time stamp value
          */
-        virtual long long getCMSTimeStamp(void) const {
+        virtual long long getCMSTimestamp(void) const {
             return this->getTimestamp();
         }
 
@@ -622,7 +622,7 @@
          * Sets the Time Stamp for this message
          * @param timeStamp - integer time stamp value
          */
-        virtual void setCMSTimeStamp( long long timeStamp ) {
+        virtual void setCMSTimestamp( long long timeStamp ) {
             this->setTimestamp( timeStamp );
         }
 
@@ -630,7 +630,7 @@
          * Gets the CMS Message Type for this Message
          * @return type value
          */
-        virtual std::string getCMSMessageType(void) const {
+        virtual std::string getCMSType(void) const {
             return this->getType();
         }
 
@@ -638,7 +638,7 @@
          * Sets the CMS Message Type for this message
          * @param type - message type value string
          */
-        virtual void setCMSMessageType( const std::string& type ) {
+        virtual void setCMSType( const std::string& type ) {
             this->setType( type );
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
Fri Mar 16 05:05:27 2007
@@ -462,7 +462,7 @@
          * Gets the Time Stamp for this Message
          * @return time stamp value
          */
-        virtual long long getCMSTimeStamp() const {
+        virtual long long getCMSTimestamp() const {
             return util::Long::parseLong( getPropertyValue(
                 CommandConstants::toString(
                     CommandConstants::HEADER_TIMESTAMP ), "0" ) );
@@ -472,7 +472,7 @@
          * Sets the Time Stamp for this message
          * @param timeStamp time stamp value
          */
-        virtual void setCMSTimeStamp( long long timeStamp ) {
+        virtual void setCMSTimestamp( long long timeStamp ) {
             setPropertyValue(
                 CommandConstants::toString(
                     CommandConstants::HEADER_TIMESTAMP ),
@@ -483,7 +483,7 @@
          * Gets the CMS Message Type for this Message
          * @return type value
          */
-        virtual std::string getCMSMessageType() const {
+        virtual std::string getCMSType() const {
             std::string type = getPropertyValue(
                 CommandConstants::toString(
                     CommandConstants::HEADER_TYPE ), "null" );
@@ -497,7 +497,7 @@
          * Sets the CMS Message Type for this message
          * @param type type value
          */
-        virtual void setCMSMessageType( const std::string& type ) {
+        virtual void setCMSType( const std::string& type ) {
             setPropertyValue(
                 CommandConstants::toString(
                     CommandConstants::HEADER_TYPE ),

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
Fri Mar 16 05:05:27 2007
@@ -91,7 +91,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string ActiveMQConnection::getClientId() const
+std::string ActiveMQConnection::getClientID() const
 {
    return connectionData->getConnector()->getClientId();
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h Fri
Mar 16 05:05:27 2007
@@ -117,7 +117,7 @@
          * Get the Client Id for this session
          * @return string version of Client Id
          */
-        virtual std::string getClientId() const;
+        virtual std::string getClientID() const;
 
         /**
          * Retrieves the Connection Data object for this object.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp Fri
Mar 16 05:05:27 2007
@@ -171,7 +171,7 @@
 
         if( !disableTimestamps ) {
             long long timeStamp = Date::getCurrentTimeMilliseconds();
-            message->setCMSTimeStamp(timeStamp);
+            message->setCMSTimestamp(timeStamp);
             if( timeToLive > 0LL ) {
                 expiration = timeToLive + timeStamp;
             }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h Fri
Mar 16 05:05:27 2007
@@ -138,7 +138,7 @@
          * Sets if Message Ids are disbled for this Producer
          * @param boolean indicating enable / disable (true / false)
          */
-        virtual void setDisableMessageId( bool value ) {
+        virtual void setDisableMessageID( bool value ) {
             if( producerInfo != NULL ){
                 producerInfo->setDisableMessageId( value );
             }
@@ -148,7 +148,7 @@
          * Sets if Message Ids are disbled for this Producer
          * @param boolean indicating enable / disable (true / false)
          */
-        virtual bool getDisableMessageId() const {
+        virtual bool getDisableMessageID() const {
             if( this->producerInfo != NULL ) {
                 return this->producerInfo->isDisableMessageId();
             }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Connection.h Fri Mar 16 05:05:27
2007
@@ -63,7 +63,7 @@
          * Get the Client Id for this session
          * @return Client Id String
          */
-        virtual std::string getClientId() const = 0;      
+        virtual std::string getClientID() const = 0;      
 
         /**
          * Gets the registered Exception Listener for this connection

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?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h Fri Mar 16 05:05:27 2007
@@ -30,6 +30,8 @@
      * Root of all messages.  As in JMS, a message is comprised of
      * 3 parts: CMS-specific headers, user-defined properties, and
      * the body.
+     * 
+     * @see JMS API
      */
     class Message
     {         
@@ -45,8 +47,26 @@
         virtual Message* clone() const = 0;                
         
         /**
-         * Acknowledges all consumed messages of the session 
-         * of this consumed message.
+         * Acknowledges all consumed messages of the session of this consumed 
+         * message.
+         * 
+         * All consumed CMS messages support the acknowledge method for use 
+         * when a client has specified that its CMS session's consumed messages 
+         * are to be explicitly acknowledged. By invoking acknowledge on a 
+         * consumed message, a client acknowledges all messages consumed by the 
+         * session that the message was delivered to.
+         * 
+         * Calls to acknowledge are ignored for both transacted sessions and 
+         * sessions specified to use implicit acknowledgement modes.
+         * 
+         * A client may individually acknowledge each message as it is consumed, 
+         * or it may choose to acknowledge messages as an application-defined 
+         * group (which is done by calling acknowledge on the last received 
+         * message of the group, thereby acknowledging all messages consumed by 
+         * the session.)
+         * 
+         * Messages that have been received but not acknowledged may be 
+         * redelivered.
          */
         virtual void acknowledge() const throw( CMSException ) = 0;
       
@@ -57,8 +77,12 @@
         virtual void clearBody() = 0;
         
         /**
-         * Clears the message properties.  Does not clear the body or
-         * header values.
+         * Clears out the message body. Clearing a message's body does not clear 
+         * its header values or property entries.
+         * 
+         * If this message body was read-only, calling this method leaves the 
+         * message body in the same state as an empty body in a newly created 
+         * message.
          */
         virtual void clearProperties() = 0;
         
@@ -221,14 +245,47 @@
             const std::string& value ) throw( CMSException ) = 0;
       
         /**
-         * Get the Correlation Id for this message
+         * Gets the correlation ID for the message.
+         * 
+         * This method is used to return correlation ID values that are either 
+         * provider-specific message IDs or application-specific String values.
+         * 
          * @return string representation of the correlation Id
          */
         virtual std::string getCMSCorrelationID() const = 0;
 
         /**
-         * Sets the Correlation Id used by this message
-         * @param correlationId - String representing the correlation id.
+         * Sets the correlation ID for the message.
+         * 
+         * A client can use the CMSCorrelationID header field to link one 
+         * message with another. A typical use is to link a response message 
+         * with its request message.
+         * 
+         * CMSCorrelationID can hold one of the following:
+         * 
+         *  - A provider-specific message ID
+         *  - An application-specific String
+         *  - A provider-native byte[] value 
+         * 
+         * Since each message sent by a CMS provider is assigned a message ID 
+         * value, it is convenient to link messages via message ID. All message 
+         * ID values must start with the 'ID:' prefix.
+         * 
+         * In some cases, an application (made up of several clients) needs to 
+         * use an application-specific value for linking messages. For instance, 
+         * an application may use CMSCorrelationID to hold a value referencing 
+         * some external information. Application-specified values must not 
+         * start with the 'ID:' prefix; this is reserved for provider-generated 
+         * message ID values.
+         * 
+         * If a provider supports the native concept of correlation ID, a CMS 
+         * client may need to assign specific CMSCorrelationID values to match 
+         * those expected by clients that do not use the CMS API. A byte[] value 
+         * is used for this purpose. CMS providers without native correlation ID 
+         * values are not required to support byte[] values. The use of a byte[] 
+         * value for CMSCorrelationID is non-portable.
+         * 
+         * @param correlationId - the message ID of a message being referred to.
          */
         virtual void setCMSCorrelationID( const std::string& correlationId ) = 0;
 
@@ -240,105 +297,273 @@
 
         /**
          * Sets the DeliveryMode for this message
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the value for a message that has been received.
+         * 
          * @param mode - DeliveryMode enumerated value.
          */
         virtual void setCMSDeliveryMode( int mode ) = 0;
       
         /**
-         * Gets the Destination for this Message, returns a
+         * Gets the Destination object for this message.
+         * 
+         * The CMSDestination header field contains the destination to which the 
+         * message is being sent.
+         * 
+         * When a message is sent, this field is ignored. After completion of 
+         * the send or publish method, the field holds the destination specified 
+         * by the method.
+         * 
+         * When a message is received, its CMSDestination value must be 
+         * equivalent to the value assigned when it was sent.
+         * 
          * @return Destination object
          */
         virtual const Destination* getCMSDestination() const = 0;
       
         /**
-         * Sets the Destination for this message
+         * Sets the Destination object for this message.
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the value for a message that has been received.
+         * 
          * @param destination - Destination Object
          */
         virtual void setCMSDestination( const Destination* destination ) = 0;
       
         /**
-         * Gets the Expiration Time for this Message
-         * @return time value
+         * Gets the message's expiration value.
+         * 
+         * When a message is sent, the CMSExpiration header field is left 
+         * unassigned. After completion of the send or publish method, it holds 
+         * the expiration time of the message. This is the sum of the 
+         * time-to-live value specified by the client and the GMT at the time 
+         * of the send or publish.
+         * 
+         * If the time-to-live is specified as zero, CMSExpiration is set to 
+         * zero to indicate that the message does not expire.
+         * 
+         * When a message's expiration time is reached, a provider should 
+         * discard it. The CMS API does not define any form of notification of 
+         * message expiration.
+         * 
+         * Clients should not receive messages that have expired; however, the 
+         * CMS API does not guarantee that this will not happen.
+         * 
+         * @return the time the message expires, which is the sum of the 
+         * time-to-live value specified by the client and the GMT at the time 
+         * of the send
          */
         virtual long long getCMSExpiration() const = 0;
       
         /**
-         * Sets the Expiration Time for this message
-         * @param expireTime - time value
+         * Sets the message's expiration value.
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the value for a message that has been received.
+         * 
+         * @param expireTime the message's expiration time
          */
         virtual void setCMSExpiration( long long expireTime ) = 0;
       
         /**
-         * Gets the CMS Message Id for this Message
-         * @return time value
+         * The CMSMessageID header field contains a value that uniquely 
+         * identifies each message sent by a provider. 
+         * 
+         * When a message is sent, CMSMessageID can be ignored. When the 
+         * send or publish method returns, it contains a provider-assigned 
+         * value.
+         * 
+         * A CMSMessageID is a String value that should function as a unique 
+         * key for identifying messages in a historical repository. The exact 
+         * scope of uniqueness is provider-defined. It should at least cover 
+         * all messages for a specific installation of a provider, where an 
+         * installation is some connected set of message routers.
+         * 
+         * All CMSMessageID values must start with the prefix 'ID:'. Uniqueness 
+         * of message ID values across different providers is not required.
+         * 
+         * Since message IDs take some effort to create and increase a 
+         * message's size, some CMS providers may be able to optimize message 
+         * overhead if they are given a hint that the message ID is not used by 
+         * an application. By calling the MessageProducer.setDisableMessageID 
+         * method, a CMS client enables this potential optimization for all 
+         * messages sent by that message producer. If the CMS provider accepts 
+         * this hint, these messages must have the message ID set to null; if 
+         * the provider ignores the hint, the message ID must be set to its 
+         * normal unique value.
+         * 
+         * @return provider-assigned message id
          */
         virtual std::string getCMSMessageID() const = 0;
-      
+        
         /**
-         * Sets the CMS Message Id for this message
-         * @param id - time value
+         * Sets the message ID.
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the vaue for a message that has been received.
+         * 
+         * @param id - the ID of the message
          */
         virtual void setCMSMessageID( const std::string& id ) = 0;
       
         /**
-         * Gets the Priority Value for this Message
+         * Gets the message priority level.
+         * 
+         * The CMS API defines ten levels of priority value, with 0 as the 
+         * lowest priority and 9 as the highest. In addition, clients should 
+         * consider priorities 0-4 as gradations of normal priority and 
+         * priorities 5-9 as gradations of expedited priority.
+         * 
+         * The CMS API does not require that a provider strictly implement 
+         * priority ordering of messages; however, it should do its best to 
+         * deliver expedited messages ahead of normal messages.
+         * 
          * @return priority value
          */
         virtual int getCMSPriority() const = 0;
       
         /**
          * Sets the Priority Value for this message
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the value for a message that has been received.
+         * 
          * @param priority - priority value for this message
          */
         virtual void setCMSPriority( int priority ) = 0;
 
         /**
-         * Gets the Redelivered Flag for this Message
-         * @return redelivered value
+         * Gets an indication of whether this message is being redelivered.
+         * 
+         * If a client receives a message with the CMSRedelivered field set, it 
+         * is likely, but not guaranteed, that this message was delivered 
+         * earlier but that its receipt was not acknowledged at that time.
+         * 
+         * @return true if this message is being redelivered
          */
         virtual bool getCMSRedelivered() const = 0;
       
         /**
-         * Sets the Redelivered Flag for this message
+         * Specifies whether this message is being redelivered.
+         * 
+         * This field is set at the time the message is delivered. This method 
+         * can be used to change the value for a message that has been received.
+         * 
          * @param redelivered - boolean redelivered value
          */
         virtual void setCMSRedelivered( bool redelivered ) = 0;
 
         /**
-         * Gets the CMS Reply To Address for this Message
-         * @return Reply To Value
+         * Gets the Destination object to which a reply to this message should 
+         * be sent.
+         * 
+         * @return Destination to which to send a response to this message
          */
         virtual const cms::Destination* getCMSReplyTo() const = 0;
       
         /**
-         * Sets the CMS Reply To Address for this message
-         * @param id - Reply To value
+         * Sets the Destination object to which a reply to this message should 
+         * be sent.
+         * 
+         * The CMSReplyTo header field contains the destination where a reply 
+         * to the current message should be sent. If it is null, no reply is 
+         * expected. The destination may be either a Queue object or a Topic 
+         * object.
+         * 
+         * Messages sent with a null CMSReplyTo value may be a notification of 
+         * some event, or they may just be some data the sender thinks is of 
+         * interest.
+         * 
+         * Messages with a CMSReplyTo value typically expect a response. A 
+         * response is optional; it is up to the client to decide. These 
+         * messages are called requests. A message sent in response to a 
+         * request is called a reply.
+         * 
+         * In some cases a client may wish to match a request it sent earlier 
+         * with a reply it has just received. The client can use the 
+         * CMSCorrelationID header field for this purpose.
+         * 
+         * @param destination - Destination to which to send a response to this 
+         * message
          */
         virtual void setCMSReplyTo( const cms::Destination* destination ) = 0;
 
         /**
-         * Gets the Time Stamp for this Message
-         * @return time stamp value
-         */
-        virtual long long getCMSTimeStamp() const = 0;
-      
-        /**
-         * Sets the Time Stamp for this message
+         * Gets the message timestamp.
+         * 
+         * The CMSTimestamp header field contains the time a message was handed 
+         * off to a provider to be sent. It is not the time the message was 
+         * actually transmitted, because the actual send may occur later due to 
+         * transactions or other client-side queueing of messages.
+         * 
+         * When a message is sent, CMSTimestamp is ignored. When the send or 
+         * publish method returns, it contains a time value somewhere in the 
+         * interval between the call and the return. The value is in the format 
+         * of a normal millis time value in the Java programming language.
+         * 
+         * Since timestamps take some effort to create and increase a message's 
+         * size, some CMS providers may be able to optimize message overhead if 
+         * they are given a hint that the timestamp is not used by an 
+         * application. By calling the MessageProducer.setDisableMessageTimestamp 
+         * method, a CMS client enables this potential optimization for all 
+         * messages sent by that message producer. If the CMS provider accepts 
+         * this hint, these messages must have the timestamp set to zero; if the 
+         * provider ignores the hint, the timestamp must be set to its normal 
+         * value.
+         * 
+         * @return the message timestamp
+         */
+        virtual long long getCMSTimestamp() const = 0;
+      
+        /**
+         * Sets the message timestamp.
+         * 
+         * CMS providers set this field when a message is sent. This method can 
+         * be used to change the value for a message that has been received.
+         * 
          * @param timeStamp - integer time stamp value
          */
-        virtual void setCMSTimeStamp( long long timeStamp ) = 0;
+        virtual void setCMSTimestamp( long long timeStamp ) = 0;
 
         /**
-         * Gets the CMS Message Type for this Message
-         * @return type value
-         */
-        virtual std::string getCMSMessageType() const = 0;
-      
-        /**
-         * Sets the CMS Message Type for this message
-         * @param type - message type value string
+         * Gets the message type identifier supplied by the client when the 
+         * message was sent.
+         * 
+         * @return the message type
+         * @see setCMSType
+         */
+        virtual std::string getCMSType() const = 0;
+      
+        /**
+         * Sets the message type.
+         * 
+         * Some CMS providers use a message repository that contains the 
+         * definitions of messages sent by applications. The CMSType header 
+         * field may reference a message's definition in the provider's 
+         * repository.
+         * 
+         * The CMS API does not define a standard message definition repository, 
+         * nor does it define a naming policy for the definitions it contains.
+         * 
+         * Some messaging systems require that a message type definition for 
+         * each application message be created and that each message specify its 
+         * type. In order to work with such CMS providers, CMS clients should 
+         * assign a value to CMSType, whether the application makes use of it or 
+         * not. This ensures that the field is properly set for those providers 
+         * that require it.
+         * 
+         * To ensure portability, CMS clients should use symbolic values for 
+         * CMSType that can be configured at installation time to the values 
+         * defined in the current provider's message repository. If string 
+         * literals are used, they may not be valid type names for some CMS 
+         * providers.
+         * 
+         * @param type the message type
+         * @see getCMSType
          */
-        virtual void setCMSMessageType( const std::string& type ) = 0;
+        virtual void setCMSType( const std::string& type ) = 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?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/MessageProducer.h Fri Mar 16 05:05:27
2007
@@ -101,13 +101,13 @@
          * Sets if Message Ids are disbled for this Producer
          * @param value - boolean indicating enable / disable (true / false)
          */
-        virtual void setDisableMessageId( bool value ) = 0;
+        virtual void setDisableMessageID( bool value ) = 0;
       
         /**
          * Gets if Message Ids are disbled for this Producer
          * @return boolean indicating enable / disable (true / false)
          */
-        virtual bool getDisableMessageId() const = 0;
+        virtual bool getDisableMessageID() const = 0;
 
         /**
          * Sets if Message Time Stamps are disbled for this Producer

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
Fri Mar 16 05:05:27 2007
@@ -112,7 +112,7 @@
         delete connectionFactory;
         connection->start();
 
-        string sss=connection->getClientId();
+        string sss=connection->getClientID();
         cout << sss << endl;
 
         session = connection->createSession( Session::AUTO_ACKNOWLEDGE);

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
Fri Mar 16 05:05:27 2007
@@ -112,7 +112,7 @@
         delete connectionFactory;
         connection->start();
 
-        string sss=connection->getClientId();
+        string sss=connection->getClientID();
         cout << sss << endl;
 
         session = connection->createSession( Session::AUTO_ACKNOWLEDGE);

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
Fri Mar 16 05:05:27 2007
@@ -142,12 +142,12 @@
             cmd.setCMSReplyTo( &topic );
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() ==
                             "/topic/testTopic" );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 0 );
-            cmd.setCMSTimeStamp( 123 );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 123 );
-            CPPUNIT_ASSERT( cmd.getCMSMessageType() == "" );
-            cmd.setCMSMessageType( "test" );
-            CPPUNIT_ASSERT( std::string( cmd.getCMSMessageType() ) ==
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 0 );
+            cmd.setCMSTimestamp( 123 );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 123 );
+            CPPUNIT_ASSERT( cmd.getCMSType() == "" );
+            cmd.setCMSType( "test" );
+            CPPUNIT_ASSERT( std::string( cmd.getCMSType() ) ==
                             "test" );
             CPPUNIT_ASSERT( cmd.getRedeliveryCount() == 0 );
             cmd.setRedeliveryCount( 123 );
@@ -165,12 +165,12 @@
             cms::Message* cmd2 = cmd.clone();
 
             CPPUNIT_ASSERT( cmd.getCMSPriority() == cmd2->getCMSPriority() );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == cmd2->getCMSTimestamp() );
             CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
             CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID()
);
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString()
);
-            CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType()
);
+            CPPUNIT_ASSERT( std::string(cmd.getCMSType()) == cmd2->getCMSType() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID()
);
 
             core::ActiveMQMessage* message =

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
Fri Mar 16 05:05:27 2007
@@ -143,12 +143,12 @@
             cmd.setCMSReplyTo( &topic );
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == 
                             "/topic/testTopic" );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 0 );
-            cmd.setCMSTimeStamp( 123 );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 123 );
-            CPPUNIT_ASSERT( cmd.getCMSMessageType() == "" );
-            cmd.setCMSMessageType( "test" );
-            CPPUNIT_ASSERT( std::string( cmd.getCMSMessageType() ) == 
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 0 );
+            cmd.setCMSTimestamp( 123 );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 123 );
+            CPPUNIT_ASSERT( cmd.getCMSType() == "" );
+            cmd.setCMSType( "test" );
+            CPPUNIT_ASSERT( std::string( cmd.getCMSType() ) == 
                             "test" );
             CPPUNIT_ASSERT( cmd.getRedeliveryCount() == 0 );
             cmd.setRedeliveryCount( 123 );
@@ -157,12 +157,12 @@
             cms::Message* cmd2 = cmd.clone();
             
             CPPUNIT_ASSERT( cmd.getCMSPriority() == cmd2->getCMSPriority() );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == cmd2->getCMSTimestamp() );
             CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
             CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID()
);
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString()
);
-            CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType()
);
+            CPPUNIT_ASSERT( std::string(cmd.getCMSType()) == cmd2->getCMSType() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID()
);
 
             core::ActiveMQMessage* message = 
@@ -226,7 +226,7 @@
             
             // Test getting a bool property that doesn't exist. 
             try {
-                bool value = cmd.getBooleanProperty( "text" );
+                cmd.getBooleanProperty( "text" );
                 CPPUNIT_ASSERT(false);
             } catch( cms::CMSException& e){
             }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
Fri Mar 16 05:05:27 2007
@@ -138,12 +138,12 @@
             cmd.setCMSReplyTo( &topic );
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == 
                             "/topic/testTopic" );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 0 );
-            cmd.setCMSTimeStamp( 123 );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == 123 );
-            CPPUNIT_ASSERT( cmd.getCMSMessageType() == "" );
-            cmd.setCMSMessageType( "text" );
-            CPPUNIT_ASSERT( std::string( cmd.getCMSMessageType() ) == 
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 0 );
+            cmd.setCMSTimestamp( 123 );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == 123 );
+            CPPUNIT_ASSERT( cmd.getCMSType() == "" );
+            cmd.setCMSType( "text" );
+            CPPUNIT_ASSERT( std::string( cmd.getCMSType() ) == 
                             "text" );
             CPPUNIT_ASSERT( cmd.getRedeliveryCount() == 0 );
             cmd.setRedeliveryCount( 123 );
@@ -156,12 +156,12 @@
             cms::Message* cmd2 = cmd.clone();
             
             CPPUNIT_ASSERT( cmd.getCMSPriority() == cmd2->getCMSPriority() );
-            CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
+            CPPUNIT_ASSERT( cmd.getCMSTimestamp() == cmd2->getCMSTimestamp() );
             CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
             CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID()
);
             CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString()
);
-            CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType()
);
+            CPPUNIT_ASSERT( std::string(cmd.getCMSType()) == cmd2->getCMSType() );
             CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID()
);
 
             core::ActiveMQMessage* message = 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h?view=diff&rev=518951&r1=518950&r2=518951
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
Fri Mar 16 05:05:27 2007
@@ -214,7 +214,7 @@
             long long expiration = 0LL;
             
             if( timeStamp != 0 ) {
-                msg->setCMSTimeStamp( timeStamp );
+                msg->setCMSTimestamp( timeStamp );
 
                 if( timeToLive > 0LL ) {
                     expiration = timeToLive + timeStamp;



Mime
View raw message