Author: tabish
Date: Tue Nov 28 08:05:03 2006
New Revision: 480109
URL: http://svn.apache.org/viewvc?view=rev&rev=480109
Log:
http://issues.apache.org/activemq/browse/AMQCPP-16
CMS API Updates
Fixed the Openwire Commands that implement CMS Message to implement the new
interface.
Added the Openwire stuff back into the Makefile.
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?view=diff&rev=480109&r1=480108&r2=480109
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Tue
Nov 28 08:05:03 2006
@@ -250,8 +250,8 @@
cms/Message.h \
cms/MessageConsumer.h
-# include activemq/connector/openwire/commands/srcmakefile.mk
-# include activemq/connector/openwire/marshal/v2/srcmakefile.mk
+include activemq/connector/openwire/commands/srcmakefile.mk
+include activemq/connector/openwire/marshal/v2/srcmakefile.mk
##
## Compiler / Linker Info
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h?view=diff&rev=480109&r1=480108&r2=480109
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
Tue Nov 28 08:05:03 2006
@@ -86,12 +86,174 @@
virtual void acknowledge(void) const throw( cms::CMSException );
/**
- * Retrieves a reference to the properties object owned
- * by this message
- * @return A Properties Object reference
+ * Clears out the body of the message. This does not clear the
+ * headers or properties.
*/
- virtual activemq::util::Properties& getProperties(void);
- virtual const activemq::util::Properties& getProperties(void) const;
+ virtual void clearBody();
+
+ /**
+ * Clears the message properties. Does not clear the body or
+ * header values.
+ */
+ virtual void clearProperties();
+
+ /**
+ * Retrieves the propery names.
+ * @return The complete set of property names currently in this
+ * message.
+ */
+ virtual std::vector<std::string> getPropertyNames() const ;
+
+ /**
+ * Indicates whether or not a given property exists.
+ * @param name The name of the property to look up.
+ * @return True if the property exists in this message.
+ */
+ virtual bool propertyExists( const std::string& name ) const;
+
+ /**
+ * Gets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual bool getBooleanProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a byte property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual unsigned char getByteProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a double property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual double getDoubleProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a float property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual float getFloatProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a int property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual int getIntProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a long property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual long long getLongProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a short property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual short getShortProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a string property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual std::string getStringProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Sets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setBooleanProperty( const std::string& name,
+ bool value ) throw( cms::CMSException );
+
+ /**
+ * Sets a byte property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setByteProperty( const std::string& name,
+ unsigned char value ) throw( cms::CMSException );
+
+ /**
+ * Sets a double property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setDoubleProperty( const std::string& name,
+ double value ) throw( cms::CMSException );
+
+ /**
+ * Sets a float property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setFloatProperty( const std::string& name,
+ float value ) throw( cms::CMSException );
+
+ /**
+ * Sets a int property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setIntProperty( const std::string& name,
+ int value ) throw( cms::CMSException );
+
+ /**
+ * Sets a long property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setLongProperty( const std::string& name,
+ long long value ) throw( cms::CMSException );
+
+ /**
+ * Sets a short property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setShortProperty( const std::string& name,
+ short value ) throw( cms::CMSException );
+
+ /**
+ * Sets a string property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setStringProperty( const std::string& name,
+ const std::string& value ) throw( cms::CMSException );
/**
* Get the Correlation Id for this message
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h?view=diff&rev=480109&r1=480108&r2=480109
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
Tue Nov 28 08:05:03 2006
@@ -86,12 +86,174 @@
virtual void acknowledge(void) const throw( cms::CMSException );
/**
- * Retrieves a reference to the properties object owned
- * by this message
- * @return A Properties Object reference
+ * Clears out the body of the message. This does not clear the
+ * headers or properties.
*/
- virtual activemq::util::Properties& getProperties(void);
- virtual const activemq::util::Properties& getProperties(void) const;
+ virtual void clearBody();
+
+ /**
+ * Clears the message properties. Does not clear the body or
+ * header values.
+ */
+ virtual void clearProperties();
+
+ /**
+ * Retrieves the propery names.
+ * @return The complete set of property names currently in this
+ * message.
+ */
+ virtual std::vector<std::string> getPropertyNames() const ;
+
+ /**
+ * Indicates whether or not a given property exists.
+ * @param name The name of the property to look up.
+ * @return True if the property exists in this message.
+ */
+ virtual bool propertyExists( const std::string& name ) const;
+
+ /**
+ * Gets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual bool getBooleanProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a byte property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual unsigned char getByteProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a double property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual double getDoubleProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a float property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual float getFloatProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a int property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual int getIntProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a long property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual long long getLongProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a short property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual short getShortProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a string property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual std::string getStringProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Sets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setBooleanProperty( const std::string& name,
+ bool value ) throw( cms::CMSException );
+
+ /**
+ * Sets a byte property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setByteProperty( const std::string& name,
+ unsigned char value ) throw( cms::CMSException );
+
+ /**
+ * Sets a double property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setDoubleProperty( const std::string& name,
+ double value ) throw( cms::CMSException );
+
+ /**
+ * Sets a float property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setFloatProperty( const std::string& name,
+ float value ) throw( cms::CMSException );
+
+ /**
+ * Sets a int property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setIntProperty( const std::string& name,
+ int value ) throw( cms::CMSException );
+
+ /**
+ * Sets a long property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setLongProperty( const std::string& name,
+ long long value ) throw( cms::CMSException );
+
+ /**
+ * Sets a short property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setShortProperty( const std::string& name,
+ short value ) throw( cms::CMSException );
+
+ /**
+ * Sets a string property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setStringProperty( const std::string& name,
+ const std::string& value ) throw( cms::CMSException );
/**
* Get the Correlation Id for this message
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h?view=diff&rev=480109&r1=480108&r2=480109
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
Tue Nov 28 08:05:03 2006
@@ -86,12 +86,174 @@
virtual void acknowledge(void) const throw( cms::CMSException );
/**
- * Retrieves a reference to the properties object owned
- * by this message
- * @return A Properties Object reference
+ * Clears out the body of the message. This does not clear the
+ * headers or properties.
*/
- virtual activemq::util::Properties& getProperties(void);
- virtual const activemq::util::Properties& getProperties(void) const;
+ virtual void clearBody();
+
+ /**
+ * Clears the message properties. Does not clear the body or
+ * header values.
+ */
+ virtual void clearProperties();
+
+ /**
+ * Retrieves the propery names.
+ * @return The complete set of property names currently in this
+ * message.
+ */
+ virtual std::vector<std::string> getPropertyNames() const ;
+
+ /**
+ * Indicates whether or not a given property exists.
+ * @param name The name of the property to look up.
+ * @return True if the property exists in this message.
+ */
+ virtual bool propertyExists( const std::string& name ) const;
+
+ /**
+ * Gets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual bool getBooleanProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a byte property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual unsigned char getByteProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a double property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual double getDoubleProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a float property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual float getFloatProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a int property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual int getIntProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a long property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual long long getLongProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a short property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual short getShortProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Gets a string property.
+ * @param name The name of the property to retrieve.
+ * @return The value for the named property.
+ * @throws CMSException if the property does not exist.
+ */
+ virtual std::string getStringProperty( const std::string& name ) const
+ throw( cms::CMSException );
+
+ /**
+ * Sets a boolean property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setBooleanProperty( const std::string& name,
+ bool value ) throw( cms::CMSException );
+
+ /**
+ * Sets a byte property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setByteProperty( const std::string& name,
+ unsigned char value ) throw( cms::CMSException );
+
+ /**
+ * Sets a double property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setDoubleProperty( const std::string& name,
+ double value ) throw( cms::CMSException );
+
+ /**
+ * Sets a float property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setFloatProperty( const std::string& name,
+ float value ) throw( cms::CMSException );
+
+ /**
+ * Sets a int property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setIntProperty( const std::string& name,
+ int value ) throw( cms::CMSException );
+
+ /**
+ * Sets a long property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setLongProperty( const std::string& name,
+ long long value ) throw( cms::CMSException );
+
+ /**
+ * Sets a short property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setShortProperty( const std::string& name,
+ short value ) throw( cms::CMSException );
+
+ /**
+ * Sets a string property.
+ * @param name The name of the property to retrieve.
+ * @param value The value for the named property.
+ * @throws CMSException
+ */
+ virtual void setStringProperty( const std::string& name,
+ const std::string& value ) throw( cms::CMSException );
/**
* Get the Correlation Id for this message
