activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r475502 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire: commands/ marshal/ marshal/v2/
Date Thu, 16 Nov 2006 00:12:12 GMT
Author: tabish
Date: Wed Nov 15 16:12:11 2006
New Revision: 475502

URL: http://svn.apache.org/viewvc?view=rev&rev=475502
Log:
Updates for planned Openwire Support

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/WireFormatInfo.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
Wed Nov 15 16:12:11 2006
@@ -290,17 +290,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char ConsumerInfo::getPriority() const {
+const unsigned char ConsumerInfo::getPriority() const {
     return priority;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char ConsumerInfo::getPriority() {
+unsigned char ConsumerInfo::getPriority() {
     return priority;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setPriority(char priority ) {
+void ConsumerInfo::setPriority(unsigned char priority ) {
     this->priority = priority;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ConsumerInfo.h
Wed Nov 15 16:12:11 2006
@@ -61,7 +61,7 @@
         bool noLocal;
         bool exclusive;
         bool retroactive;
-        char priority;
+        unsigned char priority;
         std::vector<BrokerId*> brokerPath;
         BooleanExpression* additionalPredicate;
         bool networkSubscription;
@@ -142,9 +142,9 @@
         virtual bool isRetroactive();
         virtual void setRetroactive( bool retroactive );
 
-        virtual const char getPriority() const;
-        virtual char getPriority();
-        virtual void setPriority( char priority );
+        virtual const unsigned char getPriority() const;
+        virtual unsigned char getPriority();
+        virtual void setPriority( unsigned char priority );
 
         virtual const std::vector<BrokerId*> getBrokerPath() const;
         virtual std::vector<BrokerId*> getBrokerPath();

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
Wed Nov 15 16:12:11 2006
@@ -128,17 +128,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char DestinationInfo::getOperationType() const {
+const unsigned char DestinationInfo::getOperationType() const {
     return operationType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char DestinationInfo::getOperationType() {
+unsigned char DestinationInfo::getOperationType() {
     return operationType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setOperationType(char operationType ) {
+void DestinationInfo::setOperationType(unsigned char operationType ) {
     this->operationType = operationType;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/DestinationInfo.h
Wed Nov 15 16:12:11 2006
@@ -51,7 +51,7 @@
 
         ConnectionId* connectionId;
         ActiveMQDestination* destination;
-        char operationType;
+        unsigned char operationType;
         long long timeout;
         std::vector<BrokerId*> brokerPath;
 
@@ -93,9 +93,9 @@
         virtual ActiveMQDestination* getDestination();
         virtual void setDestination( ActiveMQDestination* destination );
 
-        virtual const char getOperationType() const;
-        virtual char getOperationType();
-        virtual void setOperationType( char operationType );
+        virtual const unsigned char getOperationType() const;
+        virtual unsigned char getOperationType();
+        virtual void setOperationType( unsigned char operationType );
 
         virtual const long long getTimeout() const;
         virtual long long getTimeout();

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
Wed Nov 15 16:12:11 2006
@@ -100,17 +100,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char JournalTransaction::getType() const {
+const unsigned char JournalTransaction::getType() const {
     return type;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char JournalTransaction::getType() {
+unsigned char JournalTransaction::getType() {
     return type;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void JournalTransaction::setType(char type ) {
+void JournalTransaction::setType(unsigned char type ) {
     this->type = type;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/JournalTransaction.h
Wed Nov 15 16:12:11 2006
@@ -48,7 +48,7 @@
     protected:
 
         TransactionId* transactionId;
-        char type;
+        unsigned char type;
         bool wasPrepared;
 
     public:
@@ -85,9 +85,9 @@
         virtual TransactionId* getTransactionId();
         virtual void setTransactionId( TransactionId* transactionId );
 
-        virtual const char getType() const;
-        virtual char getType();
-        virtual void setType( char type );
+        virtual const unsigned char getType() const;
+        virtual unsigned char getType();
+        virtual void setType( unsigned char type );
 
         virtual const bool getWasPrepared() const;
         virtual bool getWasPrepared();

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.cpp
Wed Nov 15 16:12:11 2006
@@ -324,17 +324,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char Message::getPriority() const {
+const unsigned char Message::getPriority() const {
     return priority;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char Message::getPriority() {
+unsigned char Message::getPriority() {
     return priority;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setPriority(char priority ) {
+void Message::setPriority(unsigned char priority ) {
     this->priority = priority;
 }
 
@@ -384,32 +384,32 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::vector<char> Message::getContent() const {
+const std::vector<unsigned char> Message::getContent() const {
     return content;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<char> Message::getContent() {
+std::vector<unsigned char> Message::getContent() {
     return content;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setContent(std::vector<char> content ) {
+void Message::setContent(std::vector<unsigned char> content ) {
     this->content = content;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::vector<char> Message::getMarshalledProperties() const {
+const std::vector<unsigned char> Message::getMarshalledProperties() const {
     return marshalledProperties;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<char> Message::getMarshalledProperties() {
+std::vector<unsigned char> Message::getMarshalledProperties() {
     return marshalledProperties;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Message::setMarshalledProperties(std::vector<char> marshalledProperties ) {
+void Message::setMarshalledProperties(std::vector<unsigned char> marshalledProperties
) {
     this->marshalledProperties = marshalledProperties;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/Message.h
Wed Nov 15 16:12:11 2006
@@ -67,12 +67,12 @@
         std::string correlationId;
         bool persistent;
         long long expiration;
-        char priority;
+        unsigned char priority;
         ActiveMQDestination* replyTo;
         long long timestamp;
         std::string type;
-        std::vector<char> content;
-        std::vector<char> marshalledProperties;
+        std::vector<unsigned char> content;
+        std::vector<unsigned char> marshalledProperties;
         DataStructure* dataStructure;
         ConsumerId* targetConsumerId;
         bool compressed;
@@ -157,9 +157,9 @@
         virtual long long getExpiration();
         virtual void setExpiration( long long expiration );
 
-        virtual const char getPriority() const;
-        virtual char getPriority();
-        virtual void setPriority( char priority );
+        virtual const unsigned char getPriority() const;
+        virtual unsigned char getPriority();
+        virtual void setPriority( unsigned char priority );
 
         virtual const ActiveMQDestination* getReplyTo() const;
         virtual ActiveMQDestination* getReplyTo();
@@ -173,13 +173,13 @@
         virtual std::string& getType();
         virtual void setType( const std::string& type );
 
-        virtual const std::vector<char> getContent() const;
-        virtual std::vector<char> getContent();
-        virtual void setContent( std::vector<char> content );
-
-        virtual const std::vector<char> getMarshalledProperties() const;
-        virtual std::vector<char> getMarshalledProperties();
-        virtual void setMarshalledProperties( std::vector<char> marshalledProperties
);
+        virtual const std::vector<unsigned char> getContent() const;
+        virtual std::vector<unsigned char> getContent();
+        virtual void setContent( std::vector<unsigned char> content );
+
+        virtual const std::vector<unsigned char> getMarshalledProperties() const;
+        virtual std::vector<unsigned char> getMarshalledProperties();
+        virtual void setMarshalledProperties( std::vector<unsigned char> marshalledProperties
);
 
         virtual const DataStructure* getDataStructure() const;
         virtual DataStructure* getDataStructure();

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.cpp
Wed Nov 15 16:12:11 2006
@@ -150,17 +150,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char MessageAck::getAckType() const {
+const unsigned char MessageAck::getAckType() const {
     return ackType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char MessageAck::getAckType() {
+unsigned char MessageAck::getAckType() {
     return ackType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessageAck::setAckType(char ackType ) {
+void MessageAck::setAckType(unsigned char ackType ) {
     this->ackType = ackType;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/MessageAck.h
Wed Nov 15 16:12:11 2006
@@ -54,7 +54,7 @@
         ActiveMQDestination* destination;
         TransactionId* transactionId;
         ConsumerId* consumerId;
-        char ackType;
+        unsigned char ackType;
         MessageId* firstMessageId;
         MessageId* lastMessageId;
         int messageCount;
@@ -101,9 +101,9 @@
         virtual ConsumerId* getConsumerId();
         virtual void setConsumerId( ConsumerId* consumerId );
 
-        virtual const char getAckType() const;
-        virtual char getAckType();
-        virtual void setAckType( char ackType );
+        virtual const unsigned char getAckType() const;
+        virtual unsigned char getAckType();
+        virtual void setAckType( unsigned char ackType );
 
         virtual const MessageId* getFirstMessageId() const;
         virtual MessageId* getFirstMessageId();

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
Wed Nov 15 16:12:11 2006
@@ -94,17 +94,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::vector<char> PartialCommand::getData() const {
+const std::vector<unsigned char> PartialCommand::getData() const {
     return data;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<char> PartialCommand::getData() {
+std::vector<unsigned char> PartialCommand::getData() {
     return data;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::setData(std::vector<char> data ) {
+void PartialCommand::setData(std::vector<unsigned char> data ) {
     this->data = data;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/PartialCommand.h
Wed Nov 15 16:12:11 2006
@@ -47,7 +47,7 @@
     protected:
 
         int commandId;
-        std::vector<char> data;
+        std::vector<unsigned char> data;
 
     public:
 
@@ -83,9 +83,9 @@
         virtual int getCommandId();
         virtual void setCommandId( int commandId );
 
-        virtual const std::vector<char> getData() const;
-        virtual std::vector<char> getData();
-        virtual void setData( std::vector<char> data );
+        virtual const std::vector<unsigned char> getData() const;
+        virtual std::vector<unsigned char> getData();
+        virtual void setData( std::vector<unsigned char> data );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
Wed Nov 15 16:12:11 2006
@@ -118,17 +118,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const char TransactionInfo::getType() const {
+const unsigned char TransactionInfo::getType() const {
     return type;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char TransactionInfo::getType() {
+unsigned char TransactionInfo::getType() {
     return type;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void TransactionInfo::setType(char type ) {
+void TransactionInfo::setType(unsigned char type ) {
     this->type = type;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/TransactionInfo.h
Wed Nov 15 16:12:11 2006
@@ -50,7 +50,7 @@
 
         ConnectionId* connectionId;
         TransactionId* transactionId;
-        char type;
+        unsigned char type;
 
     public:
 
@@ -90,9 +90,9 @@
         virtual TransactionId* getTransactionId();
         virtual void setTransactionId( TransactionId* transactionId );
 
-        virtual const char getType() const;
-        virtual char getType();
-        virtual void setType( char type );
+        virtual const unsigned char getType() const;
+        virtual unsigned char getType();
+        virtual void setType( unsigned char type );
 
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/WireFormatInfo.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/WireFormatInfo.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/WireFormatInfo.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/WireFormatInfo.h
Wed Nov 15 16:12:11 2006
@@ -176,7 +176,7 @@
          * Get the Magic field
          * @return const reference to a std::vector<char>
          */
-        const std::vector<char>& getMagic() const {
+        const std::vector<unsigned char>& getMagic() const {
             return magic;
         }
         
@@ -184,7 +184,7 @@
          * Sets the value of the magic field
          * @param magic - const std::vector<char>
          */
-        void setMagic( const std::vector<char>& magic ) {
+        void setMagic( const std::vector<unsigned char>& magic ) {
             this->magic = magic;
         }
 
@@ -192,7 +192,7 @@
          * Get the marshalledProperties field
          * @return const reference to a std::vector<char>
          */
-        const std::vector<char>& getMarshalledProperties() const {
+        const std::vector<unsigned char>& getMarshalledProperties() const {
             return magic;
         }
         
@@ -200,7 +200,7 @@
          * Sets the value of the marshalledProperties field
          * @param magic - const std::vector<char>
          */
-        void setMarshalledProperties( const std::vector<char>& magic ) {
+        void setMarshalledProperties( const std::vector<unsigned char>& magic )
{
             this->magic = magic;
         }
 
@@ -217,8 +217,8 @@
 //            'M'&0xFF,
 //            'Q'&0xFF };
         
-        std::vector<char> magic;
-        std::vector<char> marshalledProperties;
+        std::vector<unsigned char> magic;
+        std::vector<unsigned char> marshalledProperties;
     
         int version;
         bool stackTraceEnabled;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
Wed Nov 15 16:12:11 2006
@@ -95,32 +95,32 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::vector<char> XATransactionId::getGlobalTransactionId() const {
+const std::vector<unsigned char> XATransactionId::getGlobalTransactionId() const {
     return globalTransactionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<char> XATransactionId::getGlobalTransactionId() {
+std::vector<unsigned char> XATransactionId::getGlobalTransactionId() {
     return globalTransactionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::setGlobalTransactionId(std::vector<char> globalTransactionId
) {
+void XATransactionId::setGlobalTransactionId(std::vector<unsigned char> globalTransactionId
) {
     this->globalTransactionId = globalTransactionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::vector<char> XATransactionId::getBranchQualifier() const {
+const std::vector<unsigned char> XATransactionId::getBranchQualifier() const {
     return branchQualifier;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::vector<char> XATransactionId::getBranchQualifier() {
+std::vector<unsigned char> XATransactionId::getBranchQualifier() {
     return branchQualifier;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void XATransactionId::setBranchQualifier(std::vector<char> branchQualifier ) {
+void XATransactionId::setBranchQualifier(std::vector<unsigned char> branchQualifier
) {
     this->branchQualifier = branchQualifier;
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/XATransactionId.h
Wed Nov 15 16:12:11 2006
@@ -47,8 +47,8 @@
     protected:
 
         int formatId;
-        std::vector<char> globalTransactionId;
-        std::vector<char> branchQualifier;
+        std::vector<unsigned char> globalTransactionId;
+        std::vector<unsigned char> branchQualifier;
 
     public:
 
@@ -84,13 +84,13 @@
         virtual int getFormatId();
         virtual void setFormatId( int formatId );
 
-        virtual const std::vector<char> getGlobalTransactionId() const;
-        virtual std::vector<char> getGlobalTransactionId();
-        virtual void setGlobalTransactionId( std::vector<char> globalTransactionId
);
-
-        virtual const std::vector<char> getBranchQualifier() const;
-        virtual std::vector<char> getBranchQualifier();
-        virtual void setBranchQualifier( std::vector<char> branchQualifier );
+        virtual const std::vector<unsigned char> getGlobalTransactionId() const;
+        virtual std::vector<unsigned char> getGlobalTransactionId();
+        virtual void setGlobalTransactionId( std::vector<unsigned char> globalTransactionId
);
+
+        virtual const std::vector<unsigned char> getBranchQualifier() const;
+        virtual std::vector<unsigned char> getBranchQualifier();
+        virtual void setBranchQualifier( std::vector<unsigned char> branchQualifier
);
 
     };
 

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=475502&r1=475501&r2=475502
==============================================================================
--- 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
Wed Nov 15 16:12:11 2006
@@ -104,19 +104,19 @@
          * @param bs - boolean stream to unmarshal from.
          * @returns the unmarshalled vector of chars.
          */
-        virtual std::vector<char> tightUnmarshalByteArray( 
+        virtual std::vector<unsigned char> tightUnmarshalByteArray( 
             io::DataInputStream* dataIn, 
             utils::BooleanStream* bs ) 
-                { return std::vector<char>(); }
+                { return std::vector<unsigned char>(); }
 
         /**
          * Loose Unmarshal an array of char
          * @param dataIn - the DataInputStream to Un-Marshal from
          * @returns the unmarshalled vector of chars.
          */
-        virtual std::vector<char> looseUnmarshalByteArray( 
+        virtual std::vector<unsigned char> looseUnmarshalByteArray( 
             io::DataInputStream* dataIn )    
-            { return std::vector<char>(); }
+            { return std::vector<unsigned char>(); }
 
         /**
          * Tight Unmarshal a fixed size array from that data input stream
@@ -126,10 +126,10 @@
          * @param size - size of the const array to unmarshal
          * @returns the unmarshalled vector of chars.
          */
-        virtual std::vector<char> tightUnmarshalConstByteArray( 
+        virtual std::vector<unsigned char> tightUnmarshalConstByteArray( 
             io::DataInputStream* dataIn, 
             utils::BooleanStream* bs, 
-            int size ) { return std::vector<char>(); }
+            int size ) { return std::vector<unsigned char>(); }
 
         /**
          * Tight Unmarshal a fixed size array from that data input stream
@@ -139,9 +139,9 @@
          * @param size - size of the const array to unmarshal
          * @returns the unmarshalled vector of chars.
          */
-        virtual std::vector<char> looseUnmarshalConstByteArray( 
+        virtual std::vector<unsigned char> looseUnmarshalConstByteArray( 
             io::DataInputStream* dataIn, 
-            int size ) { return std::vector<char>(); }
+            int size ) { return std::vector<unsigned char>(); }
 
         /**
          * Performs Tight Unmarshalling of String Objects
@@ -414,6 +414,23 @@
                                               commands::DataStructure* error, 
                                               io::DataOutputStream* dataOut ) {}
         
+        template<typename T>
+        int tightMarshalObjectArray1( OpenWireFormat* wireFormat, 
+                                      std::vector<T*>, 
+                                      utils::BooleanStream* bs )
+        { return 0; }
+        
+        template<typename T>
+        void tightMarshalObjectArray2( OpenWireFormat* wireFormat, 
+                                       std::vector<T*>, 
+                                       io::DataOutputStream* dataOut, 
+                                       utils::BooleanStream* bs ) {}
+
+        template<typename T>
+        void looseMarshalObjectArray( OpenWireFormat* wireFormat, 
+                                      std::vector<T*>, 
+                                      io::DataOutputStream* dataOut ) {}
+                                      
     };
 
 }}}}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
Wed Nov 15 16:12:11 2006
@@ -149,11 +149,11 @@
     tightMarshalString2( info->getType(), dataOut, bs );
     if( bs->readBoolean() ) {
         dataOut->write( info->getContent().size() );
-        dataOut->write( (const unsigned char*)&(info->getContent()[0]), info->getContent().size()
);
+        dataOut->write( &info->getContent()[0], info->getContent().size() );
     }
     if( bs->readBoolean() ) {
         dataOut->write( info->getMarshalledProperties().size() );
-        dataOut->write( (const unsigned char*)&(info->getMarshalledProperties()[0]),
info->getMarshalledProperties().size() );
+        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size()
);
     }
     tightMarshalNestedObject2( wireFormat, info->getDataStructure(), dataOut, bs );
     tightMarshalCachedObject2( wireFormat, info->getTargetConsumerId(), dataOut, bs );
@@ -243,12 +243,12 @@
     dataOut->write( info->getContent().size() != 0 );
     if( info->getContent().size() != 0 ) {
         dataOut->write( info->getContent().size() );
-        dataOut->write( (const unsigned char*)&(info->getContent()[0]), info->getContent().size()
);
+        dataOut->write( &info->getContent()[0], info->getContent().size() );
     }
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
         dataOut->write( info->getMarshalledProperties().size() );
-        dataOut->write( (const unsigned char*)&(info->getMarshalledProperties()[0]),
info->getMarshalledProperties().size() );
+        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size()
);
     }
     looseMarshalNestedObject( wireFormat, info->getDataStructure(), dataOut );
     looseMarshalCachedObject( wireFormat, info->getTargetConsumerId(), dataOut );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
Wed Nov 15 16:12:11 2006
@@ -78,7 +78,7 @@
     dataOut->write( info->getCommandId() );
     if( bs->readBoolean() ) {
         dataOut->write( info->getData().size() );
-        dataOut->write( (const unsigned char*)&(info->getData()[0]), info->getData().size()
);
+        dataOut->write( &info->getData()[0], info->getData().size() );
     }
 }
 
@@ -101,7 +101,7 @@
     dataOut->write( info->getData().size() != 0 );
     if( info->getData().size() != 0 ) {
         dataOut->write( info->getData().size() );
-        dataOut->write( (const unsigned char*)&(info->getData()[0]), info->getData().size()
);
+        dataOut->write( &info->getData()[0], info->getData().size() );
     }
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
Wed Nov 15 16:12:11 2006
@@ -81,11 +81,11 @@
 
     WireFormatInfo* info =
         dynamic_cast<WireFormatInfo*>( dataStructure );
-    dataOut->write( &info->getMagic()[0], 0, 8 );
+    dataOut->write( &info->getMagic()[0], 8 );
     dataOut->write( info->getVersion() );
     if( bs->readBoolean() ) {
         dataOut->write( info->getMarshalledProperties().size() );
-        dataOut->write( (const unsigned char*)&(info->getMarshalledProperties()[0]),
info->getMarshalledProperties().size() );
+        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size()
);
     }
     info->afterMarshall( wireFormat );
 }
@@ -109,12 +109,12 @@
     info->beforeMarshall( wireFormat );
     BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
 
-    dataOut->write( &info->getMagic()[0], 0, 8 );
+    dataOut->write( &info->getMagic()[0], 8 );
     dataOut->write( info->getVersion() );
     dataOut->write( info->getMarshalledProperties().size() != 0 );
     if( info->getMarshalledProperties().size() != 0 ) {
         dataOut->write( info->getMarshalledProperties().size() );
-        dataOut->write( (const unsigned char*)&(info->getMarshalledProperties()[0]),
info->getMarshalledProperties().size() );
+        dataOut->write( &info->getMarshalledProperties()[0], info->getMarshalledProperties().size()
);
     }
     info->afterMarshall( wireFormat );
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp?view=diff&rev=475502&r1=475501&r2=475502
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
Wed Nov 15 16:12:11 2006
@@ -81,11 +81,11 @@
     dataOut->write( info->getFormatId() );
     if( bs->readBoolean() ) {
         dataOut->write( info->getGlobalTransactionId().size() );
-        dataOut->write( (const unsigned char*)&(info->getGlobalTransactionId()[0]),
info->getGlobalTransactionId().size() );
+        dataOut->write( &info->getGlobalTransactionId()[0], info->getGlobalTransactionId().size()
);
     }
     if( bs->readBoolean() ) {
         dataOut->write( info->getBranchQualifier().size() );
-        dataOut->write( (const unsigned char*)&(info->getBranchQualifier()[0]),
info->getBranchQualifier().size() );
+        dataOut->write( &info->getBranchQualifier()[0], info->getBranchQualifier().size()
);
     }
 }
 
@@ -109,12 +109,12 @@
     dataOut->write( info->getGlobalTransactionId().size() != 0 );
     if( info->getGlobalTransactionId().size() != 0 ) {
         dataOut->write( info->getGlobalTransactionId().size() );
-        dataOut->write( (const unsigned char*)&(info->getGlobalTransactionId()[0]),
info->getGlobalTransactionId().size() );
+        dataOut->write( &info->getGlobalTransactionId()[0], info->getGlobalTransactionId().size()
);
     }
     dataOut->write( info->getBranchQualifier().size() != 0 );
     if( info->getBranchQualifier().size() != 0 ) {
         dataOut->write( info->getBranchQualifier().size() );
-        dataOut->write( (const unsigned char*)&(info->getBranchQualifier()[0]),
info->getBranchQualifier().size() );
+        dataOut->write( &info->getBranchQualifier()[0], info->getBranchQualifier().size()
);
     }
 }
 



Mime
View raw message