activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r747922 [2/2] - in /activemq/activemq-cpp/trunk: activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/ src/main/activemq/commands/
Date Wed, 25 Feb 2009 21:05:05 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.cpp Wed Feb 25
21:05:02 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/MessageDispatch.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatch.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGEDISPATCH_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGEDISPATCH_H_
 
@@ -24,19 +23,19 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ConsumerId.h>
+#include <activemq/commands/Message.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/Message.h>
-#include <activemq/commands/ConsumerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.cpp
Wed Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/MessageDispatchNotification.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageDispatchNotification.h Wed
Feb 25 21:05:02 2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGEDISPATCHNOTIFICATION_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGEDISPATCHNOTIFICATION_H_
 
@@ -24,19 +23,19 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ConsumerId.h>
 #include <activemq/commands/MessageId.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/ConsumerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.cpp Wed Feb 25 21:05:02
2009
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/MessageId.h>
-#include <apr_strings.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessageId.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGEID_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGEID_H_
 
@@ -24,18 +23,18 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
+#include <activemq/commands/ProducerId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
-#include <activemq/commands/ProducerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.cpp Wed Feb 25 21:05:02
2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/MessagePull.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/commands/MessagePull.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/MessagePull.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_MESSAGEPULL_H_
 #define _ACTIVEMQ_COMMANDS_MESSAGEPULL_H_
 
@@ -24,19 +23,19 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ConsumerId.h>
 #include <activemq/commands/MessageId.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/ConsumerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.cpp Wed Feb
25 21:05:02 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/NetworkBridgeFilter.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/NetworkBridgeFilter.h Wed Feb 25
21:05:02 2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_NETWORKBRIDGEFILTER_H_
 #define _ACTIVEMQ_COMMANDS_NETWORKBRIDGEFILTER_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/BaseDataStructure.h>
 #include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.cpp Wed Feb 25 21:05:02
2009
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/PartialCommand.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/PartialCommand.h>
 
 using namespace std;
 using namespace activemq;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/PartialCommand.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_PARTIALCOMMAND_H_
 #define _ACTIVEMQ_COMMANDS_PARTIALCOMMAND_H_
 
@@ -24,16 +23,16 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseDataStructure.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ProducerAck.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerAck.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_PRODUCERACK_H_
 #define _ACTIVEMQ_COMMANDS_PRODUCERACK_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/ProducerId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/ProducerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.cpp Wed Feb 25 21:05:02
2009
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/ProducerId.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
 #include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/ProducerId.h>
 
 using namespace std;
 using namespace activemq;
@@ -220,3 +220,11 @@
     this->copyDataStructure( &other );
 }
 
+////////////////////////////////////////////////////////////////////////////////
+const Pointer<SessionId>& ProducerId::getParentId() const {
+    if( this->parentId == NULL ) {
+        this->parentId.reset( new SessionId( this ) );
+    }
+    return this->parentId;
+}
+

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerId.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_PRODUCERID_H_
 #define _ACTIVEMQ_COMMANDS_PRODUCERID_H_
 
@@ -24,17 +23,18 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
+#include <activemq/commands/SessionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *
@@ -46,6 +46,10 @@
      *
      */
     class AMQCPP_API ProducerId : public BaseDataStructure, public decaf::lang::Comparable<ProducerId>
{
+    private:
+
+        mutable Pointer<SessionId> parentId;
+
     protected:
 
         std::string connectionId;
@@ -64,6 +68,12 @@
 
         ProducerId( const ProducerId& other );
 
+        ProducerId( const SessionId& sessionId, long long consumerId ) {
+            this->connectionId = sessionId.getConnectionId();
+            this->sessionId = sessionId.getValue();
+            this->value = consumerId;
+        }
+
         virtual ~ProducerId();
 
         /**
@@ -102,6 +112,8 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
+        const Pointer<SessionId>& getParentId() const;
+
         virtual const std::string& getConnectionId() const;
         virtual std::string& getConnectionId();
         virtual void setConnectionId( const std::string& connectionId );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ProducerInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ProducerInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_PRODUCERINFO_H_
 #define _ACTIVEMQ_COMMANDS_PRODUCERINFO_H_
 
@@ -24,19 +23,19 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/commands/BrokerId.h>
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/ProducerId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
-#include <activemq/commands/ProducerId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/RemoveInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_REMOVEINFO_H_
 #define _ACTIVEMQ_COMMANDS_REMOVEINFO_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/commands/DataStructure.h>
-#include <decaf/lang/Pointer.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.cpp Wed
Feb 25 21:05:02 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/RemoveSubscriptionInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/RemoveSubscriptionInfo.h Wed Feb
25 21:05:02 2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_REMOVESUBSCRIPTIONINFO_H_
 #define _ACTIVEMQ_COMMANDS_REMOVESUBSCRIPTIONINFO_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/commands/ConnectionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ReplayCommand.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ReplayCommand.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_REPLAYCOMMAND_H_
 #define _ACTIVEMQ_COMMANDS_REPLAYCOMMAND_H_
 
@@ -24,16 +23,16 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/Response.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/Response.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_RESPONSE_H_
 #define _ACTIVEMQ_COMMANDS_RESPONSE_H_
 
@@ -24,16 +23,16 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.cpp Wed Feb 25 21:05:02
2009
@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/ConnectionId.h>
+#include <activemq/commands/ConsumerId.h>
+#include <activemq/commands/ProducerId.h>
+#include <activemq/commands/SessionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
 #include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/SessionId.h>
 
 using namespace std;
 using namespace activemq;
@@ -51,6 +54,24 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+SessionId::SessionId( const ConnectionId* connectionId, long long sessionId ) {
+    this->connectionId = connectionId->getValue();
+    this->value = sessionId;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+SessionId::SessionId( const ProducerId* producerId ) {
+    this->connectionId = producerId->getConnectionId();
+    this->value = producerId->getSessionId();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+SessionId::SessionId( const ConsumerId* consumerId ) {
+    this->connectionId = consumerId->getConnectionId();
+    this->value = consumerId->getSessionId();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 SessionId::~SessionId() {
 }
 
@@ -198,3 +219,11 @@
     this->copyDataStructure( &other );
 }
 
+////////////////////////////////////////////////////////////////////////////////
+const Pointer<ConnectionId>& SessionId::getParentId() const {
+    if( this->parentId == NULL ) {
+        this->parentId.reset( new ConnectionId( this ) );
+    }
+    return this->parentId;
+}
+

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionId.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_SESSIONID_H_
 #define _ACTIVEMQ_COMMANDS_SESSIONID_H_
 
@@ -24,17 +23,21 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
+#include <activemq/commands/ConnectionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    class ProducerId;
+    class ConsumerId;
+
+    using decaf::lang::Pointer;
 
     /*
      *
@@ -46,6 +49,10 @@
      *
      */
     class AMQCPP_API SessionId : public BaseDataStructure, public decaf::lang::Comparable<SessionId>
{
+    private:
+
+        mutable Pointer<ConnectionId> parentId;
+
     protected:
 
         std::string connectionId;
@@ -63,6 +70,12 @@
 
         SessionId( const SessionId& other );
 
+        SessionId( const ConnectionId* connectionId, long long sessionId );
+
+        SessionId( const ProducerId* producerId );
+
+        SessionId( const ConsumerId* consumerId );
+
         virtual ~SessionId();
 
         /**
@@ -101,6 +114,8 @@
          */
         virtual bool equals( const DataStructure* value ) const;
 
+        const Pointer<ConnectionId>& getParentId() const;
+
         virtual const std::string& getConnectionId() const;
         virtual std::string& getConnectionId();
         virtual void setConnectionId( const std::string& connectionId );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.cpp Wed Feb 25 21:05:02
2009
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/SessionInfo.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/SessionInfo.h>
 
 using namespace std;
 using namespace activemq;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SessionInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_SESSIONINFO_H_
 #define _ACTIVEMQ_COMMANDS_SESSIONINFO_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
+#include <activemq/commands/SessionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/SessionId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.cpp Wed Feb 25 21:05:02
2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/ShutdownInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/ShutdownInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_SHUTDOWNINFO_H_
 #define _ACTIVEMQ_COMMANDS_SHUTDOWNINFO_H_
 
@@ -24,16 +23,16 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.cpp Wed Feb 25
21:05:02 2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/SubscriptionInfo.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <activemq/commands/SubscriptionInfo.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/SubscriptionInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_SUBSCRIPTIONINFO_H_
 #define _ACTIVEMQ_COMMANDS_SUBSCRIPTIONINFO_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/ActiveMQDestination.h>
+#include <activemq/commands/BaseDataStructure.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
-#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.cpp Wed Feb 25 21:05:02
2009
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
+#include <activemq/commands/TransactionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <apr_strings.h>
 #include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
-#include <activemq/commands/TransactionId.h>
 
 using namespace std;
 using namespace activemq;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionId.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_TRANSACTIONID_H_
 #define _ACTIVEMQ_COMMANDS_TRANSACTIONID_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/BaseDataStructure.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseDataStructure.h>
 #include <vector>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.cpp Wed Feb 25
21:05:02 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/TransactionInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/TransactionInfo.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_TRANSACTIONINFO_H_
 #define _ACTIVEMQ_COMMANDS_TRANSACTIONINFO_H_
 
@@ -24,18 +23,18 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
+#include <activemq/commands/BaseCommand.h>
 #include <activemq/commands/ConnectionId.h>
+#include <activemq/commands/TransactionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
-#include <activemq/commands/BaseCommand.h>
 #include <vector>
-#include <activemq/commands/TransactionId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.cpp Wed Feb 25
21:05:02 2009
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/commands/XATransactionId.h>
-#include <apr_strings.h>
+#include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
+#include <apr_strings.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h?rev=747922&r1=747921&r2=747922&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/commands/XATransactionId.h Wed Feb 25 21:05:02
2009
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 #ifndef _ACTIVEMQ_COMMANDS_XATRANSACTIONID_H_
 #define _ACTIVEMQ_COMMANDS_XATRANSACTIONID_H_
 
@@ -24,17 +23,17 @@
 #pragma warning( disable : 4290 )
 #endif
 
-#include <decaf/lang/Pointer.h>
-#include <decaf/lang/Comparable.h>
+#include <activemq/commands/TransactionId.h>
 #include <activemq/util/Config.h>
+#include <decaf/lang/Comparable.h>
+#include <decaf/lang/Pointer.h>
 #include <string>
 #include <vector>
-#include <activemq/commands/TransactionId.h>
 
 namespace activemq{
 namespace commands{
 
-     using decaf::lang::Pointer;
+    using decaf::lang::Pointer;
 
     /*
      *



Mime
View raw message