activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r452542 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire: commands/ marshal/
Date Tue, 03 Oct 2006 15:47:12 GMT
Author: tabish
Date: Tue Oct  3 08:47:11 2006
New Revision: 452542

URL: http://svn.apache.org/viewvc?view=rev&rev=452542
Log:
Adding new code for Openwire Support

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.cpp
    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/ActiveMQDestination.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
    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/ActiveMQMessage.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQBytesMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQBytesMessage::ActiveMQBytesMessage()
 {

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=452542&r1=452541&r2=452542
==============================================================================
--- 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 Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQMessage.h>
+#include <cms/BytesMessage.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQBytesMessage : public ActiveMQMessage
+    class ActiveMQBytesMessage : public ActiveMQMessage,
+                                 public cms::BytesMessage
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQBYTESMESSAGE = 24;
@@ -57,6 +46,177 @@
         virtual ~ActiveMQBytesMessage();
 
         virtual unsigned char getDataStructureType() const;
+        
+    public:   // CMS Message
+    
+        /**
+         * Clonse this message exactly, returns a new instance that the
+         * caller is required to delete.
+         * @return new copy of this message
+         */
+        virtual cms::Message* clone(void) const;
+        
+        /**
+         * Acknowledges all consumed messages of the session 
+         * of this consumed message.
+         */
+        virtual void acknowledge(void) const throw( cms::CMSException );
+      
+        /**
+         * Retrieves a reference to the properties object owned
+         * by this message
+         * @return A Properties Object reference
+         */
+        virtual activemq::util::Properties& getProperties(void);
+        virtual const activemq::util::Properties& getProperties(void) const;
+      
+        /**
+         * Get the Correlation Id for this message
+         * @return string representation of the correlation Id
+         */
+        virtual const char* getCMSCorrelationId(void) const;
+
+        /**
+         * Sets the Correlation Id used by this message
+         * @param correlationId - String representing the correlation id.
+         */
+        virtual void setCMSCorrelationId( const std::string& correlationId );
+
+        /**
+         * Gets the DeliveryMode for this message
+         * @return DeliveryMode enumerated value.
+         */
+        virtual int getCMSDeliveryMode(void) const;
+
+        /**
+         * Sets the DeliveryMode for this message
+         * @param mode - DeliveryMode enumerated value.
+         */
+        virtual void setCMSDeliveryMode( int mode );
+      
+        /**
+         * Gets the Destination for this Message, returns a
+         * @return Destination object
+         */
+        virtual const cms::Destination* getCMSDestination(void) const;
+      
+        /**
+         * Sets the Destination for this message
+         * @param destination - Destination Object
+         */
+        virtual void setCMSDestination( const cms::Destination* destination );
+      
+        /**
+         * Gets the Expiration Time for this Message
+         * @return time value
+         */
+        virtual long getCMSExpiration(void) const;
+      
+        /**
+         * Sets the Expiration Time for this message
+         * @param expireTime - time value
+         */
+        virtual void setCMSExpiration( long expireTime );
+      
+        /**
+         * Gets the CMS Message Id for this Message
+         * @return time value
+         */
+        virtual const char* getCMSMessageId(void) const;
+      
+        /**
+         * Sets the CMS Message Id for this message
+         * @param id - time value
+         */
+        virtual void setCMSMessageId( const std::string& id );
+      
+        /**
+         * Gets the Priority Value for this Message
+         * @return priority value
+         */
+        virtual int getCMSPriority(void) const;
+      
+        /**
+         * Sets the Priority Value for this message
+         * @param priority - priority value for this message
+         */
+        virtual void setCMSPriority( int priority );
+
+        /**
+         * Gets the Redelivered Flag for this Message
+         * @return redelivered value
+         */
+        virtual bool getCMSRedelivered(void) const;
+      
+        /**
+         * Sets the Redelivered Flag for this message
+         * @param redelivered - boolean redelivered value
+         */
+        virtual void setCMSRedelivered( bool redelivered );
+
+        /**
+         * Gets the CMS Reply To Address for this Message
+         * @return Reply To Value
+         */
+        virtual const char* getCMSReplyTo(void) const;
+      
+        /**
+         * Sets the CMS Reply To Address for this message
+         * @param id - Reply To value
+         */
+        virtual void setCMSReplyTo( const std::string& id );
+
+        /**
+         * Gets the Time Stamp for this Message
+         * @return time stamp value
+         */
+        virtual long getCMSTimeStamp(void) const;
+      
+        /**
+         * Sets the Time Stamp for this message
+         * @param timeStamp - integer time stamp value
+         */
+        virtual void setCMSTimeStamp( long timeStamp );
+
+        /**
+         * Gets the CMS Message Type for this Message
+         * @return type value
+         */
+        virtual const char* getCMSMessageType(void) const;
+      
+        /**
+         * Sets the CMS Message Type for this message
+         * @param type - message type value string
+         */
+        virtual void setCMSMessageType( const std::string& type );
+
+    public:   // CMS BytesMessage
+    
+        /**
+         * sets the bytes given to the message body.  
+         * @param Byte Buffer to copy
+         * @param Number of bytes in Buffer to copy
+         * @throws CMSException
+         */
+        virtual void setBodyBytes( 
+            const unsigned char* buffer, const unsigned long numBytes ) 
+                throw( cms::CMSException );
+            
+        /**
+         * Gets the bytes that are contained in this message, user should
+         * copy this data into a user allocated buffer.  Call 
+         * <code>getBodyLength</code> to determine the number of bytes
+         * to expect.
+         * @return const pointer to a byte buffer
+         */
+        virtual const unsigned char* getBodyBytes(void) const;
+      
+        /**
+         * Returns the number of bytes contained in the body of this message.
+         * @return number of bytes.
+         */
+        virtual unsigned long getBodyLength(void) const;
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQDestination
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQDestination::ActiveMQDestination()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQDestination.h Tue Oct  3 08:47:11 2006
@@ -31,16 +31,6 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
     class ActiveMQDestination
     {
     protected:

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQMapMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQMapMessage::ActiveMQMapMessage()
 {

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=452542&r1=452541&r2=452542
==============================================================================
--- 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 Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQMessage.h>
+#include <cms/MapMessage.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQMapMessage : public ActiveMQMessage
+    class ActiveMQMapMessage : public ActiveMQMessage,
+                               public cms::MapMessage
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQMAPMESSAGE = 25;
@@ -57,6 +46,323 @@
         virtual ~ActiveMQMapMessage();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Message
+    
+        /**
+         * Clonse this message exactly, returns a new instance that the
+         * caller is required to delete.
+         * @return new copy of this message
+         */
+        virtual cms::Message* clone(void) const;
+        
+        /**
+         * Acknowledges all consumed messages of the session 
+         * of this consumed message.
+         */
+        virtual void acknowledge(void) const throw( cms::CMSException );
+      
+        /**
+         * Retrieves a reference to the properties object owned
+         * by this message
+         * @return A Properties Object reference
+         */
+        virtual activemq::util::Properties& getProperties(void);
+        virtual const activemq::util::Properties& getProperties(void) const;
+      
+        /**
+         * Get the Correlation Id for this message
+         * @return string representation of the correlation Id
+         */
+        virtual const char* getCMSCorrelationId(void) const;
+
+        /**
+         * Sets the Correlation Id used by this message
+         * @param correlationId - String representing the correlation id.
+         */
+        virtual void setCMSCorrelationId( const std::string& correlationId );
+
+        /**
+         * Gets the DeliveryMode for this message
+         * @return DeliveryMode enumerated value.
+         */
+        virtual int getCMSDeliveryMode(void) const;
+
+        /**
+         * Sets the DeliveryMode for this message
+         * @param mode - DeliveryMode enumerated value.
+         */
+        virtual void setCMSDeliveryMode( int mode );
+      
+        /**
+         * Gets the Destination for this Message, returns a
+         * @return Destination object
+         */
+        virtual const cms::Destination* getCMSDestination(void) const;
+      
+        /**
+         * Sets the Destination for this message
+         * @param destination - Destination Object
+         */
+        virtual void setCMSDestination( const cms::Destination* destination );
+      
+        /**
+         * Gets the Expiration Time for this Message
+         * @return time value
+         */
+        virtual long getCMSExpiration(void) const;
+      
+        /**
+         * Sets the Expiration Time for this message
+         * @param expireTime - time value
+         */
+        virtual void setCMSExpiration( long expireTime );
+      
+        /**
+         * Gets the CMS Message Id for this Message
+         * @return time value
+         */
+        virtual const char* getCMSMessageId(void) const;
+      
+        /**
+         * Sets the CMS Message Id for this message
+         * @param id - time value
+         */
+        virtual void setCMSMessageId( const std::string& id );
+      
+        /**
+         * Gets the Priority Value for this Message
+         * @return priority value
+         */
+        virtual int getCMSPriority(void) const;
+      
+        /**
+         * Sets the Priority Value for this message
+         * @param priority - priority value for this message
+         */
+        virtual void setCMSPriority( int priority );
+
+        /**
+         * Gets the Redelivered Flag for this Message
+         * @return redelivered value
+         */
+        virtual bool getCMSRedelivered(void) const;
+      
+        /**
+         * Sets the Redelivered Flag for this message
+         * @param redelivered - boolean redelivered value
+         */
+        virtual void setCMSRedelivered( bool redelivered );
+
+        /**
+         * Gets the CMS Reply To Address for this Message
+         * @return Reply To Value
+         */
+        virtual const char* getCMSReplyTo(void) const;
+      
+        /**
+         * Sets the CMS Reply To Address for this message
+         * @param id - Reply To value
+         */
+        virtual void setCMSReplyTo( const std::string& id );
+
+        /**
+         * Gets the Time Stamp for this Message
+         * @return time stamp value
+         */
+        virtual long getCMSTimeStamp(void) const;
+      
+        /**
+         * Sets the Time Stamp for this message
+         * @param timeStamp - integer time stamp value
+         */
+        virtual void setCMSTimeStamp( long timeStamp );
+
+        /**
+         * Gets the CMS Message Type for this Message
+         * @return type value
+         */
+        virtual const char* getCMSMessageType(void) const;
+      
+        /**
+         * Sets the CMS Message Type for this message
+         * @param type - message type value string
+         */
+        virtual void setCMSMessageType( const std::string& type );
+
+    public:   // CMS MapMessage
+    
+        /**
+         * Returns an Enumeration of all the names in the MapMessage 
+         * object.
+         * @return STL Vector of String values, each of which is the 
+         *         name of an item in the MapMessage
+         * @throws CMSException
+         */
+        virtual std::vector< std::string > getMapNames(void) const;
+
+        /**
+         * Indicates whether an item exists in this MapMessage object.
+         * @param name - String name of the Object in question
+         * @return boolean value indicating if the name is in the map
+         */
+        virtual bool itemExists( const std::string& name ) const;
+        
+        /**
+         * Returns the Boolean value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual bool getBoolean( const std::string& name );
+        
+        /** 
+         * Sets a boolean value with the specified name into the Map.
+         * @param name - the name of the boolean
+         * @param value - the boolean value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setBoolean( const std::string& name,
+                                 bool value );
+
+        /**
+         * Returns the Byte value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual unsigned char getByte( const std::string& name );
+        
+        /** 
+         * Sets a Byte value with the specified name into the Map.
+         * @param name - the name of the Byte
+         * @param value - the Byte value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setByte( const std::string& name,
+                              unsigned char value );
+
+        /**
+         * Returns the Bytes value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual unsigned char* getBytes( const std::string& name );
+        
+        /** 
+         * Sets a Bytes value with the specified name into the Map.
+         * @param name - the name of the Bytes
+         * @param value - the Bytes value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setBytes( const std::string& name,
+                               unsigned char* value );
+
+        /**
+         * Returns the Char value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual char getChar( const std::string& name );
+        
+        /** 
+         * Sets a Char value with the specified name into the Map.
+         * @param name - the name of the Char
+         * @param value - the Char value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setChar( const std::string& name, char value );
+
+        /**
+         * Returns the Double value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual double getDouble( const std::string& name );
+        
+        /** 
+         * Sets a Double value with the specified name into the Map.
+         * @param name - the name of the Double
+         * @param value - the Double value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setDouble( const std::string& name,
+                                double value );
+
+        /**
+         * Returns the Float value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual float getFloat( const std::string& name );
+        
+        /** 
+         * Sets a Float value with the specified name into the Map.
+         * @param name - the name of the Float
+         * @param value - the Float value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setFloat( const std::string& name, float value );
+
+        /**
+         * Returns the Int value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual int getInt( const std::string& name );
+        
+        /** 
+         * Sets a Int value with the specified name into the Map.
+         * @param name - the name of the Int
+         * @param value - the Int value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setInt( const std::string& name, int value );
+
+        /**
+         * Returns the Long value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual long getLong( const std::string& name );
+        
+        /** 
+         * Sets a Long value with the specified name into the Map.
+         * @param name - the name of the Long
+         * @param value - the Long value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setLong( const std::string& name, long value );
+
+        /**
+         * Returns the Short value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual short getShort( const std::string& name );
+        
+        /** 
+         * Sets a Short value with the specified name into the Map.
+         * @param name - the name of the Short
+         * @param value - the Short value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setShort( const std::string& name, short value );
+
+        /**
+         * Returns the String value of the Specified name
+         * @param name of the value to fetch from the map
+         * @throws CMSException
+         */
+        virtual std::string getString( const std::string& name );
+        
+        /** 
+         * Sets a String value with the specified name into the Map.
+         * @param name - the name of the String
+         * @param value - the String value to set in the Map
+         * @throws CMSException
+         */
+        virtual void setString( const std::string& name, 
+                                const std::string& value );
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,29 +22,16 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQMessage::ActiveMQMessage()
-{
-}
+{}
 
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQMessage::~ActiveMQMessage()
-{
-}
+{}
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char ActiveMQMessage::getDataStructureType() const
-{
+unsigned char ActiveMQMessage::getDataStructureType() const {
     return ActiveMQMessage::ID_ACTIVEMQMESSAGE; 
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.h Tue Oct  3 08:47:11 2006
@@ -27,174 +27,20 @@
 namespace openwire{
 namespace commands{
 
-    template< typename T >
     class ActiveMQMessage : 
         public Message, 
-        public core::ActiveMQMessage,
-        public T
+        public core::ActiveMQMessage
     {
     public:
 
-        static const unsigned char ID_ACTIVEMQ_MESSAGE = 23; 
+        static const unsigned char ID_ACTIVEMQMESSAGE = 23; 
 
     public:
 
-        ActiveMQMessage() {}
-        virtual ~ActiveMQMessage() {}
+        ActiveMQMessage();
+        virtual ~ActiveMQMessage();
 
-        virtual unsigned char getDataStructureType() const {
-            return ID_ACTIVEMQ_MESSAGE;
-        }
-
-    public:   // cms::Message
-    
-        /**
-         * Clonse this message exactly, returns a new instance that the
-         * caller is required to delete.
-         * @return new copy of this message
-         */
-        virtual Message* clone(void) const = 0;
-        
-        /**
-         * Acknowledges all consumed messages of the session 
-         * of this consumed message.
-         */
-        virtual void acknowledge(void) const throw( CMSException ) {
-            try {
-                ackHandler->acknowledgeMessage( 
-                    dynamic_cast<core::ActiveMQMessage*>(this) );
-            }
-            AMQ_CATCH_RETHROW( CMSException )
-            AMQ_CATCHALL_THROW( CMSException )           
-        }
-      
-        /**
-         * Retrieves a reference to the properties object owned
-         * by this message
-         * @return A Properties Object reference
-         */
-        virtual activemq::util::Properties& getProperties(void) = 0;
-        virtual const activemq::util::Properties& getProperties(void) const = 0;
-      
-        /**
-         * Get the Correlation Id for this message
-         * @return string representation of the correlation Id
-         */
-        virtual const char* getCMSCorrelationId(void) const = 0;
-
-        /**
-         * Sets the Correlation Id used by this message
-         * @param correlationId - String representing the correlation id.
-         */
-        virtual void setCMSCorrelationId( const std::string& correlationId ) = 0;
-
-        /**
-         * Gets the DeliveryMode for this message
-         * @return DeliveryMode enumerated value.
-         */
-        virtual int getCMSDeliveryMode(void) const = 0;
-
-        /**
-         * Sets the DeliveryMode for this message
-         * @param mode - DeliveryMode enumerated value.
-         */
-        virtual void setCMSDeliveryMode( int mode ) = 0;
-      
-        /**
-         * Gets the Destination for this Message, returns a
-         * @return Destination object
-         */
-        virtual const Destination* getCMSDestination(void) const = 0;
-      
-        /**
-         * Sets the Destination for this message
-         * @param destination - Destination Object
-         */
-        virtual void setCMSDestination( const Destination* destination ) = 0;
-      
-        /**
-         * Gets the Expiration Time for this Message
-         * @return time value
-         */
-        virtual long getCMSExpiration(void) const = 0;
-      
-        /**
-         * Sets the Expiration Time for this message
-         * @param expireTime - time value
-         */
-        virtual void setCMSExpiration( long expireTime ) = 0;
-      
-        /**
-         * Gets the CMS Message Id for this Message
-         * @return time value
-         */
-        virtual const char* getCMSMessageId(void) const = 0;
-      
-        /**
-         * Sets the CMS Message Id for this message
-         * @param id - time value
-         */
-        virtual void setCMSMessageId( const std::string& id ) = 0;
-      
-        /**
-         * Gets the Priority Value for this Message
-         * @return priority value
-         */
-        virtual int getCMSPriority(void) const = 0;
-      
-        /**
-         * Sets the Priority Value for this message
-         * @param priority - priority value for this message
-         */
-        virtual void setCMSPriority( int priority ) = 0;
-
-        /**
-         * Gets the Redelivered Flag for this Message
-         * @return redelivered value
-         */
-        virtual bool getCMSRedelivered(void) const = 0;
-      
-        /**
-         * Sets the Redelivered Flag for this message
-         * @param redelivered - boolean redelivered value
-         */
-        virtual void setCMSRedelivered( bool redelivered ) = 0;
-
-        /**
-         * Gets the CMS Reply To Address for this Message
-         * @return Reply To Value
-         */
-        virtual const char* getCMSReplyTo(void) const = 0;
-      
-        /**
-         * Sets the CMS Reply To Address for this message
-         * @param id - Reply To value
-         */
-        virtual void setCMSReplyTo( const std::string& id ) = 0;
-
-        /**
-         * Gets the Time Stamp for this Message
-         * @return time stamp value
-         */
-        virtual long getCMSTimeStamp(void) const = 0;
-      
-        /**
-         * Sets the Time Stamp for this message
-         * @param timeStamp - integer time stamp value
-         */
-        virtual void setCMSTimeStamp( long timeStamp ) = 0;
-
-        /**
-         * Gets the CMS Message Type for this Message
-         * @return type value
-         */
-        virtual const char* getCMSMessageType(void) const = 0;
-      
-        /**
-         * Sets the CMS Message Type for this message
-         * @param type - message type value string
-         */
-        virtual void setCMSMessageType( const std::string& type ) = 0;
+        virtual unsigned char getDataStructureType() const;
 
     public:   // core::ActiveMQMessage
     
@@ -203,7 +49,7 @@
          * when the Acknowledge method is called.
          * @param handler ActiveMQAckHandler to call
          */
-        virtual void setAckHandler( ActiveMQAckHandler* handler ) {
+        virtual void setAckHandler( core::ActiveMQAckHandler* handler ) {
             this->ackHandler = handler;
         }
         
@@ -279,20 +125,6 @@
 //        copy.acknowledgeCallback = acknowledgeCallback;
 //    }
 //
-//
-//    public boolean equals(Object o) {
-//        if (this == o)
-//            return true;
-//        if (o == null || o.getClass() != getClass())
-//            return false;
-//
-//        ActiveMQMessage msg = (ActiveMQMessage) o;
-//        MessageId oMsg = msg.getMessageId();
-//        MessageId thisMsg = this.getMessageId();
-//        return thisMsg != null && oMsg != null && oMsg.equals(thisMsg);
-//    }
-//
-
 //    public void clearBody() throws JMSException {
 //        setContent(null);
 //        readOnlyBody = false;
@@ -775,14 +607,6 @@
 //        return false;
 //    }
 //
-//    public Callback getAcknowledgeCallback() {
-//        return acknowledgeCallback;
-//    }
-//
-//    public void setAcknowledgeCallback(Callback acknowledgeCallback) {
-//        this.acknowledgeCallback = acknowledgeCallback;
-//    }
-//    
 //    /**
 //     * Send operation event listener.  Used to get the message ready to be sent. 
 //     */
@@ -791,9 +615,5 @@
 //        setReadOnlyProperties(true);
 //    }
 //
-//
-//    public Response visit(CommandVisitor visitor) throws Exception {
-//        return visitor.processMessage( this );
-//    }
 //}
 //

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQObjectMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQObjectMessage::ActiveMQObjectMessage()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQObjectMessage.h Tue Oct  3 08:47:11 2006
@@ -32,16 +32,6 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
     class ActiveMQObjectMessage : public ActiveMQMessage
     {
     protected:

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.cpp Tue Oct  3 08:47:11 2006
@@ -22,25 +22,13 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQQueue
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQQueue::ActiveMQQueue()
-{
-}
+{}
 
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQQueue::~ActiveMQQueue()
-{
-}
+{}
 
 ////////////////////////////////////////////////////////////////////////////////
 unsigned char ActiveMQQueue::getDataStructureType() const

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQQueue.h Tue Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <cms/Queue.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQQueue : public ActiveMQDestination
+    class ActiveMQQueue : public ActiveMQDestination,
+                          public cms::Queue
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQQUEUE = 100;
@@ -57,6 +46,59 @@
         virtual ~ActiveMQQueue();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Destination
+
+        /**
+         * Retrieve the Destination Type for this Destination
+         * @return The Destination Type
+         */
+        virtual cms::Destination::DestinationType getDestinationType(void) const;
+        
+        /**
+         * Converts the Destination Name into a String 
+         * @return string name
+         */
+        virtual std::string toString(void) const;
+
+        /**
+         * Converts the Destination to a String value representing the
+         * Provider specific name fot this destination, which is not
+         * necessarily equal to the User Supplied name of the Destination
+         * @return Provider specific Name
+         */
+        virtual std::string toProviderString(void) const;
+        
+        /**
+         * Creates a new instance of this destination type that is a
+         * copy of this one, and returns it.
+         * @returns cloned copy of this object
+         */
+        virtual cms::Destination* clone(void) const;
+      
+        /**
+         * Copies the contents of the given Destinastion object to this one.
+         * @param source The source Destination object.
+         */
+        virtual void copy( const cms::Destination& source );
+
+        /**
+         * Retrieve any properties that might be part of the destination
+         * that was specified.  This is a deviation from the JMS spec
+         * but necessary due to C++ restrictions.  
+         * @return const reference to a properties object.
+         */
+        virtual const activemq::util::Properties& getProperties(void) const;
+
+    public:  // CMS Queue
+
+        /**
+         * Gets the name of this queue.
+         * @return The queue name.
+         */
+        virtual std::string getQueueName() const 
+            throw( cms::CMSException );
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQStreamMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQStreamMessage::ActiveMQStreamMessage()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQStreamMessage.h Tue Oct  3 08:47:11 2006
@@ -32,16 +32,6 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
     class ActiveMQStreamMessage : public ActiveMQMessage
     {
     protected:

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQTempDestination
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQTempDestination::ActiveMQTempDestination()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempDestination.h Tue Oct  3 08:47:11 2006
@@ -32,16 +32,6 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
     class ActiveMQTempDestination : public ActiveMQDestination
     {
     protected:

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQTempQueue
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQTempQueue::ActiveMQTempQueue()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempQueue.h Tue Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQTempDestination.h>
+#include <cms/TemporaryQueue.h>
 #include <vector>
 #include <string>
 
@@ -42,7 +43,8 @@
      *         in the activemq-openwire-generator module
      *
      */
-    class ActiveMQTempQueue : public ActiveMQTempDestination
+    class ActiveMQTempQueue : public ActiveMQTempDestination,
+                              public cms::TemporaryQueue
     {
     protected:
 
@@ -57,6 +59,59 @@
         virtual ~ActiveMQTempQueue();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Destination
+
+        /**
+         * Retrieve the Destination Type for this Destination
+         * @return The Destination Type
+         */
+        virtual cms::Destination::DestinationType getDestinationType(void) const;
+        
+        /**
+         * Converts the Destination Name into a String 
+         * @return string name
+         */
+        virtual std::string toString(void) const;
+
+        /**
+         * Converts the Destination to a String value representing the
+         * Provider specific name fot this destination, which is not
+         * necessarily equal to the User Supplied name of the Destination
+         * @return Provider specific Name
+         */
+        virtual std::string toProviderString(void) const;
+        
+        /**
+         * Creates a new instance of this destination type that is a
+         * copy of this one, and returns it.
+         * @returns cloned copy of this object
+         */
+        virtual cms::Destination* clone(void) const;
+      
+        /**
+         * Copies the contents of the given Destinastion object to this one.
+         * @param source The source Destination object.
+         */
+        virtual void copy( const cms::Destination& source );
+
+        /**
+         * Retrieve any properties that might be part of the destination
+         * that was specified.  This is a deviation from the JMS spec
+         * but necessary due to C++ restrictions.  
+         * @return const reference to a properties object.
+         */
+        virtual const activemq::util::Properties& getProperties(void) const;
+
+    public:
+    
+        /**
+         * Gets the name of this queue.
+         * @return The queue name.
+         */
+        virtual const char* getQueueName(void) const 
+            throw( cms::CMSException );
+            
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQTempTopic
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQTempTopic::ActiveMQTempTopic()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTempTopic.h Tue Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQTempDestination.h>
+#include <cms/TemporaryTopic.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQTempTopic : public ActiveMQTempDestination
+    class ActiveMQTempTopic : public ActiveMQTempDestination,
+                              public cms::TemporaryTopic
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQTEMPTOPIC = 103;
@@ -57,6 +46,59 @@
         virtual ~ActiveMQTempTopic();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Destination
+
+        /**
+         * Retrieve the Destination Type for this Destination
+         * @return The Destination Type
+         */
+        virtual cms::Destination::DestinationType getDestinationType(void) const;
+        
+        /**
+         * Converts the Destination Name into a String 
+         * @return string name
+         */
+        virtual std::string toString(void) const;
+
+        /**
+         * Converts the Destination to a String value representing the
+         * Provider specific name fot this destination, which is not
+         * necessarily equal to the User Supplied name of the Destination
+         * @return Provider specific Name
+         */
+        virtual std::string toProviderString(void) const;
+        
+        /**
+         * Creates a new instance of this destination type that is a
+         * copy of this one, and returns it.
+         * @returns cloned copy of this object
+         */
+        virtual cms::Destination* clone(void) const;
+      
+        /**
+         * Copies the contents of the given Destinastion object to this one.
+         * @param source The source Destination object.
+         */
+        virtual void copy( const cms::Destination& source );
+
+        /**
+         * Retrieve any properties that might be part of the destination
+         * that was specified.  This is a deviation from the JMS spec
+         * but necessary due to C++ restrictions.  
+         * @return const reference to a properties object.
+         */
+        virtual const activemq::util::Properties& getProperties(void) const;
+
+    public:  // CMS Temporary Topic
+
+        /**
+         * Gets the name of this topic.
+         * @return The topic name.
+         */
+        virtual const char* getTopicName(void) 
+            const throw( cms::CMSException );
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQTextMessage
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQTextMessage::ActiveMQTextMessage()
 {

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=452542&r1=452541&r2=452542
==============================================================================
--- 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 Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQMessage.h>
+#include <cms/TextMessage.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQTextMessage : public ActiveMQMessage
+    class ActiveMQTextMessage : public ActiveMQMessage,
+                                public cms::TextMessage
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQTEXTMESSAGE = 28;
@@ -57,6 +46,171 @@
         virtual ~ActiveMQTextMessage();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Message
+    
+        /**
+         * Clonse this message exactly, returns a new instance that the
+         * caller is required to delete.
+         * @return new copy of this message
+         */
+        virtual cms::Message* clone(void) const;
+        
+        /**
+         * Acknowledges all consumed messages of the session 
+         * of this consumed message.
+         */
+        virtual void acknowledge(void) const throw( cms::CMSException );
+      
+        /**
+         * Retrieves a reference to the properties object owned
+         * by this message
+         * @return A Properties Object reference
+         */
+        virtual activemq::util::Properties& getProperties(void);
+        virtual const activemq::util::Properties& getProperties(void) const;
+      
+        /**
+         * Get the Correlation Id for this message
+         * @return string representation of the correlation Id
+         */
+        virtual const char* getCMSCorrelationId(void) const;
+
+        /**
+         * Sets the Correlation Id used by this message
+         * @param correlationId - String representing the correlation id.
+         */
+        virtual void setCMSCorrelationId( const std::string& correlationId );
+
+        /**
+         * Gets the DeliveryMode for this message
+         * @return DeliveryMode enumerated value.
+         */
+        virtual int getCMSDeliveryMode(void) const;
+
+        /**
+         * Sets the DeliveryMode for this message
+         * @param mode - DeliveryMode enumerated value.
+         */
+        virtual void setCMSDeliveryMode( int mode );
+      
+        /**
+         * Gets the Destination for this Message, returns a
+         * @return Destination object
+         */
+        virtual const cms::Destination* getCMSDestination(void) const;
+      
+        /**
+         * Sets the Destination for this message
+         * @param destination - Destination Object
+         */
+        virtual void setCMSDestination( const cms::Destination* destination );
+      
+        /**
+         * Gets the Expiration Time for this Message
+         * @return time value
+         */
+        virtual long getCMSExpiration(void) const;
+      
+        /**
+         * Sets the Expiration Time for this message
+         * @param expireTime - time value
+         */
+        virtual void setCMSExpiration( long expireTime );
+      
+        /**
+         * Gets the CMS Message Id for this Message
+         * @return time value
+         */
+        virtual const char* getCMSMessageId(void) const;
+      
+        /**
+         * Sets the CMS Message Id for this message
+         * @param id - time value
+         */
+        virtual void setCMSMessageId( const std::string& id );
+      
+        /**
+         * Gets the Priority Value for this Message
+         * @return priority value
+         */
+        virtual int getCMSPriority(void) const;
+      
+        /**
+         * Sets the Priority Value for this message
+         * @param priority - priority value for this message
+         */
+        virtual void setCMSPriority( int priority );
+
+        /**
+         * Gets the Redelivered Flag for this Message
+         * @return redelivered value
+         */
+        virtual bool getCMSRedelivered(void) const;
+      
+        /**
+         * Sets the Redelivered Flag for this message
+         * @param redelivered - boolean redelivered value
+         */
+        virtual void setCMSRedelivered( bool redelivered );
+
+        /**
+         * Gets the CMS Reply To Address for this Message
+         * @return Reply To Value
+         */
+        virtual const char* getCMSReplyTo(void) const;
+      
+        /**
+         * Sets the CMS Reply To Address for this message
+         * @param id - Reply To value
+         */
+        virtual void setCMSReplyTo( const std::string& id );
+
+        /**
+         * Gets the Time Stamp for this Message
+         * @return time stamp value
+         */
+        virtual long getCMSTimeStamp(void) const;
+      
+        /**
+         * Sets the Time Stamp for this message
+         * @param timeStamp - integer time stamp value
+         */
+        virtual void setCMSTimeStamp( long timeStamp );
+
+        /**
+         * Gets the CMS Message Type for this Message
+         * @return type value
+         */
+        virtual const char* getCMSMessageType(void) const;
+      
+        /**
+         * Sets the CMS Message Type for this message
+         * @param type - message type value string
+         */
+        virtual void setCMSMessageType( const std::string& type );
+
+    public:   // CMS TextMessage
+    
+        /**
+         * Gets the message character buffer.
+         * @return The message character buffer.
+         */
+        virtual const char* getText() const throw( cms::CMSException );
+
+        /**
+         * Sets the message contents, does not take ownership of the passed
+         * char*, but copies it instead.  
+         * @param msg The message buffer.
+         */
+        virtual void setText( const char* msg ) throw( cms::CMSException );
+
+        /**
+         * Sets the message contents
+         * @param msg The message buffer.
+         */
+        virtual void setText( const std::string& msg ) throw( cms::CMSException );
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.cpp?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.cpp Tue Oct  3 08:47:11 2006
@@ -22,16 +22,6 @@
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 
-/*
- *
- *  Command and marshalling code for OpenWire format for ActiveMQTopic
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Java Classes in the
- *         activemq-core module
- *
- */
 ////////////////////////////////////////////////////////////////////////////////
 ActiveMQTopic::ActiveMQTopic()
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTopic.h Tue Oct  3 08:47:11 2006
@@ -24,6 +24,7 @@
 #endif
 
 #include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <cms/Topic.h>
 #include <vector>
 #include <string>
 
@@ -32,21 +33,9 @@
 namespace openwire{
 namespace commands{
 
-    /*
-     *
-     *  Command and marshalling code for OpenWire format for ${className}
-     *
-     *
-     *  NOTE!: This file is autogenerated - do not modify!
-     *         if you need to make a change, please see the Java Classes
-     *         in the activemq-openwire-generator module
-     *
-     */
-    class ActiveMQTopic : public ActiveMQDestination
+    class ActiveMQTopic : public ActiveMQDestination,
+                          public cms::Topic
     {
-    protected:
-
-
     public:
 
         const static unsigned char ID_ACTIVEMQTOPIC = 101;
@@ -57,6 +46,59 @@
         virtual ~ActiveMQTopic();
 
         virtual unsigned char getDataStructureType() const;
+
+    public:   // CMS Destination
+
+        /**
+         * Retrieve the Destination Type for this Destination
+         * @return The Destination Type
+         */
+        virtual cms::Destination::DestinationType getDestinationType(void) const;
+        
+        /**
+         * Converts the Destination Name into a String 
+         * @return string name
+         */
+        virtual std::string toString(void) const;
+
+        /**
+         * Converts the Destination to a String value representing the
+         * Provider specific name fot this destination, which is not
+         * necessarily equal to the User Supplied name of the Destination
+         * @return Provider specific Name
+         */
+        virtual std::string toProviderString(void) const;
+        
+        /**
+         * Creates a new instance of this destination type that is a
+         * copy of this one, and returns it.
+         * @returns cloned copy of this object
+         */
+        virtual cms::Destination* clone(void) const;
+      
+        /**
+         * Copies the contents of the given Destinastion object to this one.
+         * @param source The source Destination object.
+         */
+        virtual void copy( const cms::Destination& source );
+
+        /**
+         * Retrieve any properties that might be part of the destination
+         * that was specified.  This is a deviation from the JMS spec
+         * but necessary due to C++ restrictions.  
+         * @return const reference to a properties object.
+         */
+        virtual const activemq::util::Properties& getProperties(void) const;
+
+    public:  // CMS Topic
+
+        /**
+         * Gets the name of this topic.
+         * @return The topic name.
+         */
+        virtual std::string getTopicName(void) 
+            const throw( cms::CMSException );
+
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h?view=diff&rev=452542&r1=452541&r2=452542
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h Tue Oct  3 08:47:11 2006
@@ -42,7 +42,7 @@
         virtual int tightMarshal1( OpenWireFormat* format, 
                                    commands::DataStructure* command, 
                                    utils::BooleanStream* bs ) 
-                                       throw ( io::IOException ) {};
+                                       throw ( io::IOException ) { return 0; };
 
         /**
          * Tight Marhsal to the given stream
@@ -56,7 +56,7 @@
                                     commands::DataStructure* command, 
                                     io::DataOutputStream* ds, 
                                     utils::BooleanStream* bs ) 
-                                        throw ( io::IOException ) = {};
+                                        throw ( io::IOException ) {};
 
         /**
          * Tight Un-marhsal to the given stream



Mime
View raw message