activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r771473 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ActiveMQDestination.cpp commands/ActiveMQDestination.h wireformat/stomp/marshal/Marshaler.cpp wireformat/stomp/marshal/MarshalerHelper.cpp
Date Mon, 04 May 2009 22:24:27 GMT
Author: tabish
Date: Mon May  4 22:24:27 2009
New Revision: 771473

URL: http://svn.apache.org/viewvc?rev=771473&view=rev
Log:
More Stomp updates related to creation of destinations from and to stomp.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/Marshaler.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/MarshalerHelper.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp?rev=771473&r1=771472&r2=771473&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.cpp
Mon May  4 22:24:27 2009
@@ -190,16 +190,16 @@
     }
 
     switch( type ) {
-        case ActiveMQDestination::ACTIVEMQ_QUEUE:
+        case cms::Destination::QUEUE:
             result.reset( new ActiveMQQueue( name ) );
             return result;
-        case ActiveMQDestination::ACTIVEMQ_TOPIC:
+        case cms::Destination::TOPIC:
             result.reset( new ActiveMQTopic( name ) );
             return result;
-        case ActiveMQDestination::ACTIVEMQ_TEMPORARY_QUEUE:
+        case cms::Destination::TEMPORARY_QUEUE:
             result.reset( new ActiveMQTempQueue( name ) );
             return result;
-        case ActiveMQDestination::ACTIVEMQ_TEMPORARY_TOPIC:
+        case cms::Destination::TEMPORARY_TOPIC:
             result.reset( new ActiveMQTempTopic( name ) );
             return result;
         default:

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h?rev=771473&r1=771472&r2=771473&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQDestination.h
Mon May  4 22:24:27 2009
@@ -39,15 +39,6 @@
     using decaf::lang::Pointer;
 
     class AMQCPP_API ActiveMQDestination : public BaseDataStructure {
-    public:
-
-        enum DESTINATION_TYPE_IDS {
-            ACTIVEMQ_TOPIC = 1,
-            ACTIVEMQ_TEMPORARY_TOPIC = 2,
-            ACTIVEMQ_QUEUE = 3,
-            ACTIVEMQ_TEMPORARY_QUEUE = 4
-        };
-
     protected:
 
         struct DestinationFilter{

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/Marshaler.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/Marshaler.cpp?rev=771473&r1=771472&r2=771473&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/Marshaler.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/Marshaler.cpp
Mon May  4 22:24:27 2009
@@ -408,6 +408,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<StompFrame> Marshaler::marshalRemoveSubscriptionInfo( const Pointer<Command>&
command ) {
 
+    std::cout << "Marshalling a RemoveSubscriptionInfo command" << std::endl;
+
     Pointer<RemoveSubscriptionInfo> info = command.dynamicCast<RemoveSubscriptionInfo>();
     Pointer<StompFrame> frame( new StompFrame() );
     frame->setCommand( StompCommandConstants::UNSUBSCRIBE );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/MarshalerHelper.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/MarshalerHelper.cpp?rev=771473&r1=771472&r2=771473&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/MarshalerHelper.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/stomp/marshal/MarshalerHelper.cpp
Mon May  4 22:24:27 2009
@@ -149,9 +149,9 @@
 
         switch( destination->getDestinationType() ) {
 
-            case ActiveMQDestination::ACTIVEMQ_TOPIC:
+            case cms::Destination::TOPIC:
                 return std::string( "/topic/" ) + destination->getPhysicalName();
-            case ActiveMQDestination::ACTIVEMQ_TEMPORARY_TOPIC:
+            case cms::Destination::TEMPORARY_TOPIC:
 
                 if( destination->getPhysicalName().find( "/remote-temp-topic/" ) == 0
) {
                     return destination->getPhysicalName();
@@ -159,7 +159,7 @@
                     return std::string( "/temp-topic/" ) + destination->getPhysicalName();
                 }
 
-            case ActiveMQDestination::ACTIVEMQ_TEMPORARY_QUEUE:
+            case cms::Destination::TEMPORARY_QUEUE:
 
                 if( destination->getPhysicalName().find( "/remote-temp-queue/" ) == 0
) {
                     return destination->getPhysicalName();
@@ -185,20 +185,20 @@
 
     if( destination.find( "/queue/" ) == 0 ) {
         dest = destination.substr( 7 );
-        type = ActiveMQDestination::ACTIVEMQ_QUEUE;
+        type = cms::Destination::QUEUE;
     } else if( destination.find( "/topic/" ) == 0 ) {
         dest = destination.substr( 7 );
-        type = ActiveMQDestination::ACTIVEMQ_TOPIC;
+        type = cms::Destination::TOPIC;
     } else if( destination.find( "/temp-topic/" ) == 0 ) {
         dest = destination.substr( 12 );
-        type = ActiveMQDestination::ACTIVEMQ_TEMPORARY_TOPIC;
+        type = cms::Destination::TEMPORARY_TOPIC;
     } else if( destination.find( "/temp-queue/" ) == 0 ) {
         dest = destination.substr( 12 );
-        type = ActiveMQDestination::ACTIVEMQ_TEMPORARY_QUEUE;
+        type = cms::Destination::TEMPORARY_QUEUE;
     } else if( destination.find( "/remote-temp-topic/" ) == 0 ) {
-        type = ActiveMQDestination::ACTIVEMQ_TEMPORARY_TOPIC;
+        type = cms::Destination::TEMPORARY_TOPIC;
     } else if( destination.find( "/remote-temp-queue/" ) == 0 ) {
-        type = ActiveMQDestination::ACTIVEMQ_TEMPORARY_QUEUE;
+        type = cms::Destination::TEMPORARY_QUEUE;
     }
 
     return ActiveMQDestination::createDestination( type, dest );



Mime
View raw message