activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r382103 [2/2] - /incubator/activemq/trunk/openwire-cpp/src/command/
Date Wed, 01 Mar 2006 17:52:43 GMT
Modified: incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/MessageId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define MessageId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
+#include "command/AbstractCommand.hpp"
+    
 #include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
 
-#include "command/AbstractCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +51,8 @@
 {
 private:
     p<ProducerId> producerId ;
-    long producerSequenceId ;
-    long brokerSequenceId ;
+    long long producerSequenceId ;
+    long long brokerSequenceId ;
 
 public:
     const static int TYPE = 110;
@@ -65,15 +61,16 @@
     MessageId() ;
     virtual ~MessageId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ProducerId> getProducerId() ;
     virtual void setProducerId(p<ProducerId> producerId) ;
 
-    virtual long getProducerSequenceId() ;
-    virtual void setProducerSequenceId(long producerSequenceId) ;
+    virtual long long getProducerSequenceId() ;
+    virtual void setProducerSequenceId(long long producerSequenceId) ;
 
-    virtual long getBrokerSequenceId() ;
-    virtual void setBrokerSequenceId(long brokerSequenceId) ;
+    virtual long long getBrokerSequenceId() ;
+    virtual void setBrokerSequenceId(long long brokerSequenceId) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.cpp Wed Mar  1 09:52:38 2006
@@ -30,9 +30,9 @@
  */
 ProducerId::ProducerId()
 {
-    this->connectionId = NULL ;
-    this->value = NULL ;
-    this->sessionId = NULL ;
+    this->connectionId = 0 ;
+    this->value = 0 ;
+    this->sessionId = 0 ;
 }
 
 ProducerId::~ProducerId()
@@ -51,23 +51,23 @@
 }
 
         
-long ProducerId::getValue()
+long long ProducerId::getValue()
 {
     return value ;
 }
 
-void ProducerId::setValue(long value)
+void ProducerId::setValue(long long value)
 {
     this->value = value ;
 }
 
         
-long ProducerId::getSessionId()
+long long ProducerId::getSessionId()
 {
     return sessionId ;
 }
 
-void ProducerId::setSessionId(long sessionId)
+void ProducerId::setSessionId(long long sessionId)
 {
     this->sessionId = sessionId ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define ProducerId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +50,8 @@
 {
 private:
     p<string> connectionId ;
-    long value ;
-    long sessionId ;
+    long long value ;
+    long long sessionId ;
 
 public:
     const static int TYPE = 123;
@@ -65,15 +60,16 @@
     ProducerId() ;
     virtual ~ProducerId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getConnectionId() ;
     virtual void setConnectionId(p<string> connectionId) ;
 
-    virtual long getValue() ;
-    virtual void setValue(long value) ;
+    virtual long long getValue() ;
+    virtual void setValue(long long value) ;
 
-    virtual long getSessionId() ;
-    virtual void setSessionId(long sessionId) ;
+    virtual long long getSessionId() ;
+    virtual void setSessionId(long long sessionId) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.cpp Wed Mar  1 09:52:38
2006
@@ -30,9 +30,9 @@
  */
 ProducerInfo::ProducerInfo()
 {
-    this->producerId = NULL ;
-    this->destination = NULL ;
-    this->brokerPath = NULL ;
+    this->producerId = 0 ;
+    this->destination = 0 ;
+    this->brokerPath = 0 ;
 }
 
 ProducerInfo::~ProducerInfo()
@@ -51,23 +51,23 @@
 }
 
         
-ActiveMQDestination ProducerInfo::getDestination()
+p<ActiveMQDestination> ProducerInfo::getDestination()
 {
     return destination ;
 }
 
-void ProducerInfo::setDestination(ActiveMQDestination destination)
+void ProducerInfo::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }
 
         
-BrokerId[] ProducerInfo::getBrokerPath()
+ap<BrokerId> ProducerInfo::getBrokerPath()
 {
     return brokerPath ;
 }
 
-void ProducerInfo::setBrokerPath(BrokerId[] brokerPath)
+void ProducerInfo::setBrokerPath(ap<BrokerId> brokerPath)
 {
     this->brokerPath = brokerPath ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ProducerInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,13 @@
 #define ProducerInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
+    
 #include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/ActiveMQDestination.hpp"
+#include "command/BrokerId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +36,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +53,8 @@
 {
 private:
     p<ProducerId> producerId ;
-    ActiveMQDestination destination ;
-    BrokerId[] brokerPath ;
+    p<ActiveMQDestination> destination ;
+    ap<BrokerId> brokerPath ;
 
 public:
     const static int TYPE = 6;
@@ -65,15 +63,16 @@
     ProducerInfo() ;
     virtual ~ProducerInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ProducerId> getProducerId() ;
     virtual void setProducerId(p<ProducerId> producerId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
-    virtual BrokerId[] getBrokerPath() ;
-    virtual void setBrokerPath(BrokerId[] brokerPath) ;
+    virtual ap<BrokerId> getBrokerPath() ;
+    virtual void setBrokerPath(ap<BrokerId> brokerPath) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 RemoveInfo::RemoveInfo()
 {
-    this->objectId = NULL ;
+    this->objectId = 0 ;
 }
 
 RemoveInfo::~RemoveInfo()
@@ -38,12 +38,12 @@
 }
 
         
-DataStructure RemoveInfo::getObjectId()
+p<IDataStructure> RemoveInfo::getObjectId()
 {
     return objectId ;
 }
 
-void RemoveInfo::setObjectId(DataStructure objectId)
+void RemoveInfo::setObjectId(p<IDataStructure> objectId)
 {
     this->objectId = objectId ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveInfo.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define RemoveInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+    
+#include "command/IDataStructure.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +50,7 @@
 class RemoveInfo : public BaseCommand
 {
 private:
-    DataStructure objectId ;
+    p<IDataStructure> objectId ;
 
 public:
     const static int TYPE = 12;
@@ -63,9 +59,10 @@
     RemoveInfo() ;
     virtual ~RemoveInfo() ;
 
+    virtual int getCommandType() ;
 
-    virtual DataStructure getObjectId() ;
-    virtual void setObjectId(DataStructure objectId) ;
+    virtual p<IDataStructure> getObjectId() ;
+    virtual void setObjectId(p<IDataStructure> objectId) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.cpp Wed Mar 
1 09:52:38 2006
@@ -30,9 +30,9 @@
  */
 RemoveSubscriptionInfo::RemoveSubscriptionInfo()
 {
-    this->connectionId = NULL ;
-    this->subcriptionName = NULL ;
-    this->clientId = NULL ;
+    this->connectionId = 0 ;
+    this->subcriptionName = 0 ;
+    this->clientId = 0 ;
 }
 
 RemoveSubscriptionInfo::~RemoveSubscriptionInfo()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/RemoveSubscriptionInfo.hpp Wed Mar 
1 09:52:38 2006
@@ -18,16 +18,11 @@
 #define RemoveSubscriptionInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+    
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -65,6 +61,7 @@
     RemoveSubscriptionInfo() ;
     virtual ~RemoveSubscriptionInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Response.cpp Wed Mar  1 09:52:38 2006
@@ -30,7 +30,7 @@
  */
 Response::Response()
 {
-    this->correlationId = NULL ;
+    this->correlationId = 0 ;
 }
 
 Response::~Response()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/Response.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define Response_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+    
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +58,7 @@
     Response() ;
     virtual ~Response() ;
 
+    virtual int getCommandType() ;
 
     virtual short getCorrelationId() ;
     virtual void setCorrelationId(short correlationId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionId.cpp Wed Mar  1 09:52:38 2006
@@ -30,8 +30,8 @@
  */
 SessionId::SessionId()
 {
-    this->connectionId = NULL ;
-    this->value = NULL ;
+    this->connectionId = 0 ;
+    this->value = 0 ;
 }
 
 SessionId::~SessionId()
@@ -50,12 +50,12 @@
 }
 
         
-long SessionId::getValue()
+long long SessionId::getValue()
 {
     return value ;
 }
 
-void SessionId::setValue(long value)
+void SessionId::setValue(long long value)
 {
     this->value = value ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionId.hpp Wed Mar  1 09:52:38 2006
@@ -18,16 +18,10 @@
 #define SessionId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,7 +50,7 @@
 {
 private:
     p<string> connectionId ;
-    long value ;
+    long long value ;
 
 public:
     const static int TYPE = 121;
@@ -64,12 +59,13 @@
     SessionId() ;
     virtual ~SessionId() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getConnectionId() ;
     virtual void setConnectionId(p<string> connectionId) ;
 
-    virtual long getValue() ;
-    virtual void setValue(long value) ;
+    virtual long long getValue() ;
+    virtual void setValue(long long value) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.cpp Wed Mar  1 09:52:38
2006
@@ -30,7 +30,7 @@
  */
 SessionInfo::SessionInfo()
 {
-    this->sessionId = NULL ;
+    this->sessionId = 0 ;
 }
 
 SessionInfo::~SessionInfo()

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SessionInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,11 @@
 #define SessionInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
+    
 #include "command/SessionId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -63,6 +59,7 @@
     SessionInfo() ;
     virtual ~SessionInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<SessionId> getSessionId() ;
     virtual void setSessionId(p<SessionId> sessionId) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ShutdownInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,10 @@
 #define ShutdownInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+    
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -62,6 +57,7 @@
     ShutdownInfo() ;
     virtual ~ShutdownInfo() ;
 
+    virtual int getCommandType() ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.cpp Wed Mar  1 09:52:38
2006
@@ -30,10 +30,10 @@
  */
 SubscriptionInfo::SubscriptionInfo()
 {
-    this->clientId = NULL ;
-    this->destination = NULL ;
-    this->selector = NULL ;
-    this->subcriptionName = NULL ;
+    this->clientId = 0 ;
+    this->destination = 0 ;
+    this->selector = 0 ;
+    this->subcriptionName = 0 ;
 }
 
 SubscriptionInfo::~SubscriptionInfo()
@@ -52,12 +52,12 @@
 }
 
         
-ActiveMQDestination SubscriptionInfo::getDestination()
+p<ActiveMQDestination> SubscriptionInfo::getDestination()
 {
     return destination ;
 }
 
-void SubscriptionInfo::setDestination(ActiveMQDestination destination)
+void SubscriptionInfo::setDestination(p<ActiveMQDestination> destination)
 {
     this->destination = destination ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/SubscriptionInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,11 @@
 #define SubscriptionInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+#include "command/ActiveMQDestination.hpp"
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +34,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,7 +51,7 @@
 {
 private:
     p<string> clientId ;
-    ActiveMQDestination destination ;
+    p<ActiveMQDestination> destination ;
     p<string> selector ;
     p<string> subcriptionName ;
 
@@ -66,12 +62,13 @@
     SubscriptionInfo() ;
     virtual ~SubscriptionInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<string> getClientId() ;
     virtual void setClientId(p<string> clientId) ;
 
-    virtual ActiveMQDestination getDestination() ;
-    virtual void setDestination(ActiveMQDestination destination) ;
+    virtual p<ActiveMQDestination> getDestination() ;
+    virtual void setDestination(p<ActiveMQDestination> destination) ;
 
     virtual p<string> getSelector() ;
     virtual void setSelector(p<string> selector) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/TransactionId.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,10 @@
 #define TransactionId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -62,6 +57,7 @@
     TransactionId() ;
     virtual ~TransactionId() ;
 
+    virtual int getCommandType() ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.cpp Wed Mar  1 09:52:38
2006
@@ -30,9 +30,9 @@
  */
 TransactionInfo::TransactionInfo()
 {
-    this->connectionId = NULL ;
-    this->transactionId = NULL ;
-    this->type = NULL ;
+    this->connectionId = 0 ;
+    this->transactionId = 0 ;
+    this->type = 0 ;
 }
 
 TransactionInfo::~TransactionInfo()
@@ -62,12 +62,12 @@
 }
 
         
-byte TransactionInfo::getType()
+char TransactionInfo::getType()
 {
     return type ;
 }
 
-void TransactionInfo::setType(byte type)
+void TransactionInfo::setType(char type)
 {
     this->type = type ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/TransactionInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,12 @@
 #define TransactionInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
 #include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
+    
 #include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
+#include "command/TransactionId.hpp"
 
-#include "command/BaseCommand.hpp"
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +35,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -56,7 +53,7 @@
 private:
     p<ConnectionId> connectionId ;
     p<TransactionId> transactionId ;
-    byte type ;
+    char type ;
 
 public:
     const static int TYPE = 7;
@@ -65,6 +62,7 @@
     TransactionInfo() ;
     virtual ~TransactionInfo() ;
 
+    virtual int getCommandType() ;
 
     virtual p<ConnectionId> getConnectionId() ;
     virtual void setConnectionId(p<ConnectionId> connectionId) ;
@@ -72,8 +70,8 @@
     virtual p<TransactionId> getTransactionId() ;
     virtual void setTransactionId(p<TransactionId> transactionId) ;
 
-    virtual byte getType() ;
-    virtual void setType(byte type) ;
+    virtual char getType() ;
+    virtual void setType(char type) ;
 
 
 } ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.cpp Wed Mar  1 09:52:38
2006
@@ -30,13 +30,13 @@
  */
 WireFormatInfo::WireFormatInfo()
 {
-    this->magic = NULL ;
-    this->version = NULL ;
-    this->cacheEnabled = NULL ;
-    this->stackTraceEnabled = NULL ;
-    this->tcpNoDelayEnabled = NULL ;
-    this->prefixPacketSize = NULL ;
-    this->tightEncodingEnabled = NULL ;
+    this->magic = 0 ;
+    this->version = 0 ;
+    this->cacheEnabled = 0 ;
+    this->stackTraceEnabled = 0 ;
+    this->tcpNoDelayEnabled = 0 ;
+    this->prefixPacketSize = 0 ;
+    this->tightEncodingEnabled = 0 ;
 }
 
 WireFormatInfo::~WireFormatInfo()
@@ -44,12 +44,12 @@
 }
 
         
-byte[] WireFormatInfo::getMagic()
+ap<char> WireFormatInfo::getMagic()
 {
     return magic ;
 }
 
-void WireFormatInfo::setMagic(byte[] magic)
+void WireFormatInfo::setMagic(ap<char> magic)
 {
     this->magic = magic ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/WireFormatInfo.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,10 @@
 #define WireFormatInfo_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/AbstractCommand.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -54,7 +49,7 @@
 class WireFormatInfo : public AbstractCommand
 {
 private:
-    byte[] magic ;
+    ap<char> magic ;
     int version ;
     bool cacheEnabled ;
     bool stackTraceEnabled ;
@@ -69,9 +64,10 @@
     WireFormatInfo() ;
     virtual ~WireFormatInfo() ;
 
+    virtual int getCommandType() ;
 
-    virtual byte[] getMagic() ;
-    virtual void setMagic(byte[] magic) ;
+    virtual ap<char> getMagic() ;
+    virtual void setMagic(ap<char> magic) ;
 
     virtual int getVersion() ;
     virtual void setVersion(int version) ;

Modified: incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.cpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.cpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.cpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.cpp Wed Mar  1 09:52:38
2006
@@ -30,9 +30,9 @@
  */
 XATransactionId::XATransactionId()
 {
-    this->formatId = NULL ;
-    this->globalTransactionId = NULL ;
-    this->branchQualifier = NULL ;
+    this->formatId = 0 ;
+    this->globalTransactionId = 0 ;
+    this->branchQualifier = 0 ;
 }
 
 XATransactionId::~XATransactionId()
@@ -51,23 +51,23 @@
 }
 
         
-byte[] XATransactionId::getGlobalTransactionId()
+ap<char> XATransactionId::getGlobalTransactionId()
 {
     return globalTransactionId ;
 }
 
-void XATransactionId::setGlobalTransactionId(byte[] globalTransactionId)
+void XATransactionId::setGlobalTransactionId(ap<char> globalTransactionId)
 {
     this->globalTransactionId = globalTransactionId ;
 }
 
         
-byte[] XATransactionId::getBranchQualifier()
+ap<char> XATransactionId::getBranchQualifier()
 {
     return branchQualifier ;
 }
 
-void XATransactionId::setBranchQualifier(byte[] branchQualifier)
+void XATransactionId::setBranchQualifier(ap<char> branchQualifier)
 {
     this->branchQualifier = branchQualifier ;
 }

Modified: incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp?rev=382103&r1=382102&r2=382103&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/XATransactionId.hpp Wed Mar  1 09:52:38
2006
@@ -18,16 +18,10 @@
 #define XATransactionId_hpp_
 
 #include <string>
-
-/* we could cut this down  - for now include all possible headers */
-#include "command/BaseCommand.hpp"
-#include "command/BrokerId.hpp"
-#include "command/ConnectionId.hpp"
-#include "command/ConsumerId.hpp"
-#include "command/ProducerId.hpp"
-#include "command/SessionId.hpp"
-
 #include "command/TransactionId.hpp"
+    
+
+#include "util/ifr/ap"
 #include "util/ifr/p"
 
 namespace apache
@@ -39,6 +33,7 @@
       namespace command
       {
         using namespace ifr;
+        using namespace std;
         using namespace apache::activemq::client;
 
 /*
@@ -55,8 +50,8 @@
 {
 private:
     int formatId ;
-    byte[] globalTransactionId ;
-    byte[] branchQualifier ;
+    ap<char> globalTransactionId ;
+    ap<char> branchQualifier ;
 
 public:
     const static int TYPE = 112;
@@ -65,15 +60,16 @@
     XATransactionId() ;
     virtual ~XATransactionId() ;
 
+    virtual int getCommandType() ;
 
     virtual int getFormatId() ;
     virtual void setFormatId(int formatId) ;
 
-    virtual byte[] getGlobalTransactionId() ;
-    virtual void setGlobalTransactionId(byte[] globalTransactionId) ;
+    virtual ap<char> getGlobalTransactionId() ;
+    virtual void setGlobalTransactionId(ap<char> globalTransactionId) ;
 
-    virtual byte[] getBranchQualifier() ;
-    virtual void setBranchQualifier(byte[] branchQualifier) ;
+    virtual ap<char> getBranchQualifier() ;
+    virtual void setBranchQualifier(ap<char> branchQualifier) ;
 
 
 } ;



Mime
View raw message