activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r548743 - in /activemq/activemq-cpp/trunk/src: main/activemq/connector/openwire/ main/activemq/connector/stomp/ main/activemq/transport/ test/activemq/connector/stomp/ test/activemq/core/
Date Tue, 19 Jun 2007 14:42:33 GMT
Author: tabish
Date: Tue Jun 19 07:42:32 2007
New Revision: 548743

URL: http://svn.apache.org/viewvc?view=rev&rev=548743
Log:
https://issues.apache.org/activemq/browse/AMQCPP-130

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
Tue Jun 19 07:42:32 2007
@@ -25,17 +25,9 @@
 namespace openwire{
 
     class OpenWireResponseBuilder : public transport::MockTransport::ResponseBuilder{
-
-    private:
-
-        std::string sessionId;
-
     public:
 
-        OpenWireResponseBuilder( const std::string& sessionId ){
-            this->sessionId = sessionId;
-        }
-
+        OpenWireResponseBuilder(){}
         virtual ~OpenWireResponseBuilder(){}
 
         virtual transport::Response* buildResponse( const transport::Command* command );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
Tue Jun 19 07:42:32 2007
@@ -20,7 +20,10 @@
 #include <activemq/connector/stomp/commands/ConnectCommand.h>
 #include <activemq/connector/stomp/commands/ConnectedCommand.h>
 
+#include <activemq/util/Guid.h>
+
 using namespace activemq;
+using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::connector::stomp;
 using namespace activemq::transport;
@@ -51,7 +54,7 @@
         resp->setCorrelationId( connectCommand->getCommandId() );
 
         if( connectCommand->getClientId() == NULL ) {
-            resp->setSessionId( sessionId );
+            resp->setSessionId( Guid::createGUIDString() );
         } else {
             resp->setSessionId( connectCommand->getClientId() );
         }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h Tue
Jun 19 07:42:32 2007
@@ -25,17 +25,9 @@
 namespace stomp{
 
     class StompResponseBuilder : public transport::MockTransport::ResponseBuilder{
-
-    private:
-
-        std::string sessionId;
-
     public:
 
-        StompResponseBuilder( const std::string& sessionId ){
-            this->sessionId = sessionId;
-        }
-
+        StompResponseBuilder(){}
         virtual ~StompResponseBuilder(){}
 
         virtual transport::Response* buildResponse( const transport::Command* cmd );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp Tue Jun
19 07:42:32 2007
@@ -43,13 +43,9 @@
     MockTransport::ResponseBuilder* builder = NULL;
 
     if( wireFormat == "stomp" ) {
-        builder = new connector::stomp::StompResponseBuilder(
-            properties.getProperty(
-                "transport.sessionId", "testSessionId" ) );
+        builder = new connector::stomp::StompResponseBuilder();
     } else if( wireFormat == "openwire" ) {
-        builder = new connector::openwire::OpenWireResponseBuilder(
-            properties.getProperty(
-                "transport.sessionId", "testSessionId" ) );
+        builder = new connector::openwire::OpenWireResponseBuilder();
     }
 
     return new MockTransport( builder, true );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp Tue
Jun 19 07:42:32 2007
@@ -16,6 +16,7 @@
  */
 
 #include "StompConnectorTest.h"
+#include <activemq/transport/TransportFactoryMap.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::stomp::StompConnectorTest );
 
@@ -23,18 +24,11 @@
 using namespace activemq;
 using namespace activemq::connector;
 using namespace activemq::connector::stomp;
+using namespace activemq::transport;
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testSessions()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
-    util::Properties properties;
-
-    // Using a pointer for the connector so we ensure the proper destruction
-    // order of objects - connector before the transport.
-    StompConnector* connector = new StompConnector( &transport, properties );
-
     connector->start();
 
     SessionInfo* info1 = connector->createSession( cms::Session::AUTO_ACKNOWLEDGE );
@@ -57,23 +51,11 @@
     delete info2;
     delete info3;
     delete info4;
-
-    // Delete the connector here - this assures the propery order
-    // of destruction.
-    delete connector;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testConsumers()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
-    util::Properties properties;
-
-    // Using a pointer for the connector so we ensure the proper destruction
-    // order of objects - connector before the transport.
-    StompConnector* connector = new StompConnector( &transport, properties );
-
     connector->start();
 
     SessionInfo* info1 = connector->createSession( cms::Session::AUTO_ACKNOWLEDGE );
@@ -121,23 +103,11 @@
     delete info2;
     delete info3;
     delete info4;
-
-    // Delete the connector here - this assures the propery order
-    // of destruction.
-    delete connector;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testProducers()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
-    util::Properties properties;
-
-    // Using a pointer for the connector so we ensure the proper destruction
-    // order of objects - connector before the transport.
-    StompConnector* connector = new StompConnector( &transport, properties );
-
     connector->start();
 
     SessionInfo* info1 = connector->createSession( cms::Session::AUTO_ACKNOWLEDGE );
@@ -173,23 +143,11 @@
     delete info2;
     delete info3;
     delete info4;
-
-    // Delete the connector here - this assures the propery order
-    // of destruction.
-    delete connector;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testCommand()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
-    util::Properties properties;
-
-    // Using a pointer for the connector so we ensure the proper destruction
-    // order of objects - connector before the transport.
-    StompConnector* connector = new StompConnector( &transport, properties );
-
     connector->start();
 
     StompTopic dest1( "dummy.topic" );
@@ -223,7 +181,7 @@
 
     commands::TextMessageCommand* msg =
         new commands::TextMessageCommand( frame ); // deleted by listener
-    transport.fireCommand( msg );
+    transport->fireCommand( msg );
 
     CPPUNIT_ASSERT( listener.consumers.size() == 2 );
     for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
@@ -242,7 +200,7 @@
     frame->setBody( (unsigned char*)buffer, 12 );
 
     msg = new commands::TextMessageCommand( frame ); // deleted by listener
-    transport.fireCommand( msg );
+    transport->fireCommand( msg );
 
     CPPUNIT_ASSERT( listener.consumers.size() == 2 );
     for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
@@ -259,26 +217,17 @@
     delete info2;
     delete info3;
     delete info4;
-
-    // Delete the connector here - this assures the propery order
-    // of destruction.
-    delete connector;
 }
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testSendingCommands()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
-    util::Properties properties;
-    StompConnector* connector =
-        new StompConnector( &transport, properties );
     connector->start();
 
     StompTopic dest1( "dummy.topic.1" );
 
     MyCommandListener cmdListener;
-    transport.setOutgoingCommandListener( &cmdListener );
+    transport->setOutgoingCommandListener( &cmdListener );
 
     SessionInfo* info1 = connector->createSession( cms::Session::AUTO_ACKNOWLEDGE );
     ConsumerInfo* cinfo1 = connector->createConsumer( &dest1, info1, "" );
@@ -305,32 +254,59 @@
     delete info1;
     delete info2;
 
-    delete connector;
     CPPUNIT_ASSERT( cmdListener.cmd != NULL );
 }
 
+////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testException()
 {
-    std::string connectionId = "testConnectionId";
-    StompResponseBuilder responseBuilder("testConnectionId");
-    transport::MockTransport transport( &responseBuilder );
     MyExceptionListener exListener;
-    util::Properties properties;
-
-    // Using a pointer for the connector so we ensure the proper destruction
-    // order of objects - connector before the transport.
-    StompConnector* connector = new StompConnector( &transport, properties );
 
     connector->setExceptionListener(&exListener);
-
     connector->start();
 
-    // Initiate an exception from the transport.
-    transport.fireException( exceptions::ActiveMQException(__FILE__, __LINE__, "test") );
+    // Initiate an exception from the transport->
+    transport->fireException(
+        exceptions::ActiveMQException(__FILE__, __LINE__, "test") );
 
     CPPUNIT_ASSERT( exListener.num == 1 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompConnectorTest::setUp() {
+
+    this->connectionId = "testConnectionId";
+
+    activemq::util::Properties properties;
+
+    // Default to Stomp
+    properties.setProperty( "wireFormat", "stomp" );
+    properties.setProperty( "client-id", connectionId );
+
+    transport::TransportFactory* factory =
+        transport::TransportFactoryMap::getInstance().lookup( "mock" );
+    if( factory == NULL ){
+        CPPUNIT_ASSERT( false );
+    }
+
+    // Create the transport->
+    this->transport =
+        dynamic_cast<MockTransport*>( factory->createTransport( properties ) );
+    if( transport == NULL ){
+        CPPUNIT_ASSERT( false );
+    }
+
+    // Using a pointer for the connector so we ensure the proper destruction
+    // order of objects - connector before the transport.
+    this->connector = new StompConnector( transport, properties );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompConnectorTest::tearDown() {
+
+    // Clear this before we go down so it doesn't notif an non-existant client.
+    transport->setOutgoingCommandListener( NULL );
 
-    // Delete the connector here - this assures the propery order
-    // of destruction.
     delete connector;
+    delete transport;
 }

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h Tue
Jun 19 07:42:32 2007
@@ -50,10 +50,19 @@
         CPPUNIT_TEST( testException );
         CPPUNIT_TEST_SUITE_END();
 
+    private:
+
+        StompConnector* connector;
+        transport::MockTransport* transport;
+        std::string connectionId;
+
     public:
 
         StompConnectorTest() {}
         virtual ~StompConnectorTest() {}
+
+        void setUp();
+        void tearDown();
 
         class MyExceptionListener : public cms::ExceptionListener{
             public:

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
Tue Jun 19 07:42:32 2007
@@ -18,3 +18,347 @@
 #include "StompSessionManagerTest.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( activemq::connector::stomp::StompSessionManagerTest );
+
+#include <activemq/transport/TransportFactoryMap.h>
+
+using namespace activemq;
+using namespace activemq::transport;
+using namespace activemq::connector;
+using namespace activemq::connector::stomp;
+using namespace std;
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::testSessions()
+{
+    SessionInfo* info1 = manager->createSession( cms::Session::AUTO_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info1->getAckMode() == cms::Session::AUTO_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info1->getConnectionId() == connectionId );
+
+    SessionInfo* info2 = manager->createSession( cms::Session::DUPS_OK_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info2->getAckMode() == cms::Session::DUPS_OK_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info2->getConnectionId() == connectionId );
+
+    SessionInfo* info3 = manager->createSession( cms::Session::CLIENT_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info3->getAckMode() == cms::Session::CLIENT_ACKNOWLEDGE );
+    CPPUNIT_ASSERT( info3->getConnectionId() == connectionId );
+
+    SessionInfo* info4 = manager->createSession( cms::Session::SESSION_TRANSACTED );
+    CPPUNIT_ASSERT( info4->getAckMode() == cms::Session::SESSION_TRANSACTED );
+    CPPUNIT_ASSERT( info4->getConnectionId() == connectionId );
+
+    delete info1;
+    delete info2;
+    delete info3;
+    delete info4;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::testConsumers()
+{
+    SessionInfo* info1 = manager->createSession( cms::Session::AUTO_ACKNOWLEDGE );
+    std::string sel1 = "";
+    StompTopic dest1( "dummy.topic.1" );
+    ConsumerInfo* cinfo1 = manager->createConsumer( &dest1, info1, sel1 );
+    manager->startConsumer( cinfo1 );
+    CPPUNIT_ASSERT( cinfo1->getSessionInfo() == info1 );
+    CPPUNIT_ASSERT( cinfo1->getDestination()->toProviderString() == dest1.toProviderString()
);
+    CPPUNIT_ASSERT( cinfo1->getMessageSelector() == sel1 );
+
+    SessionInfo* info2 = manager->createSession( cms::Session::DUPS_OK_ACKNOWLEDGE );
+    std::string sel2 = "mysel2";
+    StompTopic dest2( "dummy.topic.2" );
+    ConsumerInfo* cinfo2 = manager->createConsumer( &dest2, info2, sel2 );
+    manager->startConsumer( cinfo2 );
+    CPPUNIT_ASSERT( cinfo2->getSessionInfo() == info2 );
+    CPPUNIT_ASSERT( cinfo2->getDestination()->toProviderString() == dest2.toProviderString()
);
+    CPPUNIT_ASSERT( cinfo2->getMessageSelector() == sel2 );
+
+    SessionInfo* info3 = manager->createSession( cms::Session::CLIENT_ACKNOWLEDGE );
+    std::string sel3 = "mysel3";
+    StompQueue dest3( "dummy.queue.1" );
+    ConsumerInfo* cinfo3 = manager->createConsumer( &dest3, info3, sel3 );
+    manager->startConsumer( cinfo3 );
+    CPPUNIT_ASSERT( cinfo3->getSessionInfo() == info3 );
+    CPPUNIT_ASSERT( cinfo3->getDestination()->toProviderString() == dest3.toProviderString()
);
+    CPPUNIT_ASSERT( cinfo3->getMessageSelector() == sel3 );
+
+    SessionInfo* info4 = manager->createSession( cms::Session::SESSION_TRANSACTED );
+    std::string sel4 = "";
+    StompTopic dest4( "dummy.queue.2" );
+    ConsumerInfo* cinfo4 = manager->createConsumer( &dest4, info4, sel4 );
+    manager->startConsumer( cinfo4 );
+    CPPUNIT_ASSERT( cinfo4->getSessionInfo() == info4 );
+    CPPUNIT_ASSERT( cinfo4->getDestination()->toProviderString() == dest4.toProviderString()
);
+    CPPUNIT_ASSERT( cinfo4->getMessageSelector() == sel4 );
+
+    delete info1;
+    delete info2;
+    delete info3;
+    delete info4;
+
+    delete cinfo1;
+    delete cinfo2;
+    delete cinfo3;
+    delete cinfo4;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::testCommand()
+{
+    StompTopic dest1( "dummy.topic" );
+    StompTopic dest2( "dummy.topic2" );
+
+    SessionInfo* info1 = manager->createSession( cms::Session::AUTO_ACKNOWLEDGE );
+    ConsumerInfo* cinfo1 = manager->createConsumer( &dest1, info1, "" );
+    manager->startConsumer( cinfo1 );
+
+    SessionInfo* info2 = manager->createSession( cms::Session::DUPS_OK_ACKNOWLEDGE );
+    ConsumerInfo* cinfo2 = manager->createConsumer( &dest1, info2, "" );
+    manager->startConsumer( cinfo2 );
+
+    SessionInfo* info3 = manager->createSession( cms::Session::CLIENT_ACKNOWLEDGE );
+    ConsumerInfo* cinfo3 = manager->createConsumer( &dest2, info3, "" );
+    manager->startConsumer( cinfo3 );
+
+    SessionInfo* info4 = manager->createSession( cms::Session::SESSION_TRANSACTED );
+    ConsumerInfo* cinfo4 = manager->createConsumer( &dest2, info4, "" );
+    manager->startConsumer( cinfo4 );
+
+    MyMessageListener listener;
+    manager->setConsumerMessageListener( &listener );
+
+    commands::TextMessageCommand* msg = new commands::TextMessageCommand();
+    msg->setCMSDestination( &dest1 );
+    msg->setText( "hello world" );
+    manager->onStompCommand( msg );
+
+    CPPUNIT_ASSERT( listener.consumers.size() == 2 );
+    for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
+        CPPUNIT_ASSERT( listener.consumers[ix] == cinfo1 ||
+            listener.consumers[ix] == cinfo2 );
+    }
+
+    // Clean up the consumers list
+    listener.consumers.clear();
+
+    msg = new commands::TextMessageCommand();
+    msg->setCMSDestination( &dest2 );
+    msg->setText( "hello world" );
+    manager->onStompCommand( msg );
+
+    CPPUNIT_ASSERT( listener.consumers.size() == 2 );
+    for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
+        CPPUNIT_ASSERT( listener.consumers[ix] == cinfo3 ||
+            listener.consumers[ix] == cinfo4 );
+    }
+
+    delete info1;
+    delete info2;
+    delete info3;
+    delete info4;
+
+    delete cinfo1;
+    delete cinfo2;
+    delete cinfo3;
+    delete cinfo4;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::testSendingCommands(){
+
+    StompTopic dest1( "dummy.topic.1" );
+
+    MyCommandListener cmdListener;
+    transport->setOutgoingCommandListener( &cmdListener );
+
+    SessionInfo* info1 = manager->createSession( cms::Session::AUTO_ACKNOWLEDGE );
+    ConsumerInfo* cinfo1 = manager->createConsumer( &dest1, info1, "" );
+    manager->startConsumer( cinfo1 );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+
+    cmdListener.cmd = NULL;
+
+    SessionInfo* info2 = manager->createSession( cms::Session::DUPS_OK_ACKNOWLEDGE );
+    ConsumerInfo* cinfo2 = manager->createConsumer( &dest1, info2, "" );
+    manager->startConsumer( cinfo2 );
+    CPPUNIT_ASSERT( cmdListener.cmd == NULL );
+
+    cmdListener.cmd = NULL;
+
+    manager->removeConsumer( cinfo1 );
+    CPPUNIT_ASSERT( cmdListener.cmd == NULL );
+
+    cmdListener.cmd = NULL;
+
+    manager->removeConsumer( cinfo2 );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+
+    delete info1;
+    delete info2;
+
+    delete cinfo1;
+    delete cinfo2;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::testSubscribeOptions(){
+
+    MyProperty retroactive =
+        std::make_pair( "activemq.retroactive", "true" );
+    MyProperty prefetchSize =
+        std::make_pair( "activemq.prefetchSize", "1000" );
+    MyProperty maxPendingMsgLimit =
+        std::make_pair( "activemq.maximumPendingMessageLimit", "0" );
+    MyProperty noLocal =
+        std::make_pair( "activemq.noLocal", "true" );
+    MyProperty dispatchAsync =
+        std::make_pair( "activemq.dispatchAsync", "true" );
+    MyProperty selector =
+        std::make_pair( "selector", "test" );
+    MyProperty exclusive =
+        std::make_pair( "activemq.exclusive", "true" );
+    MyProperty priority =
+        std::make_pair( "activemq.priority", "1" );
+
+    SessionInfo* session = NULL;
+    ConsumerInfo* consumer = NULL;
+
+    MyCommandListener cmdListener;
+    transport->setOutgoingCommandListener( &cmdListener );
+
+    session = manager->createSession( cms::Session::AUTO_ACKNOWLEDGE );
+
+    cmdListener.expected.clear();
+    StompTopic dest1( "dummy.topic.1" );
+
+    consumer = manager->createConsumer( &dest1, session, "" );
+    manager->startConsumer( consumer );
+    CPPUNIT_ASSERT( consumer != NULL );
+    CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
+
+    manager->removeConsumer( consumer );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+    delete consumer;
+    cmdListener.cmd = NULL;
+    cmdListener.subscribe = NULL;
+
+    cmdListener.expected.clear();
+    cmdListener.expected.push_back( retroactive );
+    StompTopic dest2( "dummy.topic.1?consumer.retroactive=true" );
+
+    consumer = manager->createConsumer( &dest2, session, "" );
+    manager->startConsumer( consumer );
+    CPPUNIT_ASSERT( consumer != NULL );
+    CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
+
+    manager->removeConsumer( consumer );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+    delete consumer;
+    cmdListener.cmd = NULL;
+    cmdListener.subscribe = NULL;
+
+    cmdListener.expected.clear();
+    cmdListener.expected.push_back( retroactive );
+    cmdListener.expected.push_back( prefetchSize );
+    cmdListener.expected.push_back( maxPendingMsgLimit );
+    cmdListener.expected.push_back( noLocal );
+    cmdListener.expected.push_back( dispatchAsync );
+    cmdListener.expected.push_back( selector );
+    cmdListener.expected.push_back( exclusive );
+    cmdListener.expected.push_back( priority );
+    StompTopic dest3(
+        std::string( "dummy.topic.1?" ) +
+        "consumer.retroactive=" + retroactive.second + "&" +
+        "consumer.prefetchSize=" + prefetchSize.second + "&" +
+        "consumer.maximumPendingMessageLimit=" + maxPendingMsgLimit.second + "&" +
+        "consumer.noLocal=" + noLocal.second + "&" +
+        "consumer.dispatchAsync=" + dispatchAsync.second + "&" +
+        "consumer.selector=" + selector.second + "&" +
+        "consumer.exclusive=" + exclusive.second + "&" +
+        "consumer.priority=" + priority.second );
+
+    consumer = manager->createConsumer( &dest3, session, "" );
+    manager->startConsumer( consumer );
+    CPPUNIT_ASSERT( consumer != NULL );
+    CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
+
+    manager->removeConsumer( consumer );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+    delete consumer;
+    cmdListener.cmd = NULL;
+    cmdListener.subscribe = NULL;
+
+    cmdListener.expected.clear();
+    cmdListener.expected.push_back( retroactive );
+    cmdListener.expected.push_back( prefetchSize );
+    cmdListener.expected.push_back( maxPendingMsgLimit );
+    cmdListener.expected.push_back( noLocal );
+    cmdListener.expected.push_back( dispatchAsync );
+    cmdListener.expected.push_back( selector );
+    cmdListener.expected.push_back( exclusive );
+    cmdListener.expected.push_back( priority );
+    StompTopic dest4(
+        std::string( "dummy.topic.1?" ) +
+        "consumer.retroactive=" + retroactive.second + "&" +
+        "consumer.prefetchSize=" + prefetchSize.second + "&" +
+        "consumer.maximumPendingMessageLimit=" + maxPendingMsgLimit.second + "&" +
+        "consumer.dispatchAsync=" + dispatchAsync.second + "&" +
+        "consumer.selector=" + selector.second + "&" +
+        "consumer.exclusive=" + exclusive.second + "&" +
+        "consumer.priority=" + priority.second );
+
+    consumer = manager->createConsumer( &dest4, session, "", true );
+    manager->startConsumer( consumer );
+    CPPUNIT_ASSERT( consumer != NULL );
+    CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
+
+    manager->removeConsumer( consumer );
+    CPPUNIT_ASSERT( cmdListener.cmd != NULL );
+    delete consumer;
+    cmdListener.cmd = NULL;
+    cmdListener.subscribe = NULL;
+
+    // Done
+    delete session;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::setUp() {
+
+    this->connectionId = "testConnectionId";
+
+    activemq::util::Properties properties;
+
+    // Default to Stomp
+    properties.setProperty( "wireFormat", "stomp" );
+    properties.setProperty( "client-id", connectionId );
+
+    transport::TransportFactory* factory =
+        transport::TransportFactoryMap::getInstance().lookup( "mock" );
+    if( factory == NULL ){
+        CPPUNIT_ASSERT( false );
+    }
+
+    // Create the transport.
+    this->transport =
+        dynamic_cast<MockTransport*>( factory->createTransport( properties ) );
+    if( transport == NULL ){
+        CPPUNIT_ASSERT( false );
+    }
+
+    // Using a pointer for the connector so we ensure the proper destruction
+    // order of objects - connector before the transport.
+    this->connector = new StompConnector( transport, properties );
+    this->manager = new StompSessionManager( connectionId, NULL, transport );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void StompSessionManagerTest::tearDown() {
+
+    // Clear this before we go down so it doesn't notif an non-existant client.
+    transport->setOutgoingCommandListener( NULL );
+
+    delete manager;
+    delete connector;
+    delete transport;
+}

Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
(original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
Tue Jun 19 07:42:32 2007
@@ -48,9 +48,19 @@
         CPPUNIT_TEST( testSubscribeOptions );
         CPPUNIT_TEST_SUITE_END();
 
+    private:
+
+        StompConnector* connector;
+        StompSessionManager* manager;
+        transport::MockTransport* transport;
+        std::string connectionId;
+
     public:
 
-        typedef std::pair< std::string, std::string > MyProperty;
+        typedef std::pair<std::string, std::string> MyProperty;
+
+        void setUp();
+        void tearDown();
 
         class MyCommandListener : public transport::CommandListener{
         public:
@@ -59,7 +69,7 @@
             commands::SubscribeCommand* subscribe;
 
             // Properties that should be in an command
-            std::vector< MyProperty > expected;
+            std::vector<MyProperty> expected;
 
         public:
 
@@ -107,356 +117,11 @@
 
         virtual ~StompSessionManagerTest() {}
 
-        void testSessions()
-        {
-            std::string connectionId = "testConnectionId";
-            StompResponseBuilder responseBuilder("testConnectionId");
-            transport::MockTransport transport( &responseBuilder );
-            util::Properties properties;
-
-            // Using a pointer for the connector so we ensure the proper destruction
-            // order of objects - connector before the transport.
-            StompConnector* connector = new StompConnector( &transport, properties );
-            StompSessionManager manager( connectionId, NULL, &transport );
-
-            SessionInfo* info1 = manager.createSession( cms::Session::AUTO_ACKNOWLEDGE );
-            CPPUNIT_ASSERT( info1->getAckMode() == cms::Session::AUTO_ACKNOWLEDGE );
-            CPPUNIT_ASSERT( info1->getConnectionId() == connectionId );
-
-            SessionInfo* info2 = manager.createSession( cms::Session::DUPS_OK_ACKNOWLEDGE
);
-            CPPUNIT_ASSERT( info2->getAckMode() == cms::Session::DUPS_OK_ACKNOWLEDGE );
-            CPPUNIT_ASSERT( info2->getConnectionId() == connectionId );
-
-            SessionInfo* info3 = manager.createSession( cms::Session::CLIENT_ACKNOWLEDGE
);
-            CPPUNIT_ASSERT( info3->getAckMode() == cms::Session::CLIENT_ACKNOWLEDGE );
-            CPPUNIT_ASSERT( info3->getConnectionId() == connectionId );
-
-            SessionInfo* info4 = manager.createSession( cms::Session::SESSION_TRANSACTED
);
-            CPPUNIT_ASSERT( info4->getAckMode() == cms::Session::SESSION_TRANSACTED );
-            CPPUNIT_ASSERT( info4->getConnectionId() == connectionId );
-
-            delete info1;
-            delete info2;
-            delete info3;
-            delete info4;
-
-            delete connector;
-        }
-
-        void testConsumers()
-        {
-            std::string connectionId = "testConnectionId";
-            StompResponseBuilder responseBuilder("testConnectionId");
-            transport::MockTransport transport( &responseBuilder );
-            util::Properties properties;
-
-            // Using a pointer for the connector so we ensure the proper destruction
-            // order of objects - connector before the transport.
-            StompConnector* connector = new StompConnector( &transport, properties );
-            StompSessionManager manager( connectionId, NULL, &transport );
-
-            SessionInfo* info1 = manager.createSession( cms::Session::AUTO_ACKNOWLEDGE );
-            std::string sel1 = "";
-            StompTopic dest1( "dummy.topic.1" );
-            ConsumerInfo* cinfo1 = manager.createConsumer( &dest1, info1, sel1 );
-            manager.startConsumer( cinfo1 );
-            CPPUNIT_ASSERT( cinfo1->getSessionInfo() == info1 );
-            CPPUNIT_ASSERT( cinfo1->getDestination()->toProviderString() == dest1.toProviderString()
);
-            CPPUNIT_ASSERT( cinfo1->getMessageSelector() == sel1 );
-
-            SessionInfo* info2 = manager.createSession( cms::Session::DUPS_OK_ACKNOWLEDGE
);
-            std::string sel2 = "mysel2";
-            StompTopic dest2( "dummy.topic.2" );
-            ConsumerInfo* cinfo2 = manager.createConsumer( &dest2, info2, sel2 );
-            manager.startConsumer( cinfo2 );
-            CPPUNIT_ASSERT( cinfo2->getSessionInfo() == info2 );
-            CPPUNIT_ASSERT( cinfo2->getDestination()->toProviderString() == dest2.toProviderString()
);
-            CPPUNIT_ASSERT( cinfo2->getMessageSelector() == sel2 );
-
-            SessionInfo* info3 = manager.createSession( cms::Session::CLIENT_ACKNOWLEDGE
);
-            std::string sel3 = "mysel3";
-            StompQueue dest3( "dummy.queue.1" );
-            ConsumerInfo* cinfo3 = manager.createConsumer( &dest3, info3, sel3 );
-            manager.startConsumer( cinfo3 );
-            CPPUNIT_ASSERT( cinfo3->getSessionInfo() == info3 );
-            CPPUNIT_ASSERT( cinfo3->getDestination()->toProviderString() == dest3.toProviderString()
);
-            CPPUNIT_ASSERT( cinfo3->getMessageSelector() == sel3 );
-
-            SessionInfo* info4 = manager.createSession( cms::Session::SESSION_TRANSACTED
);
-            std::string sel4 = "";
-            StompTopic dest4( "dummy.queue.2" );
-            ConsumerInfo* cinfo4 = manager.createConsumer( &dest4, info4, sel4 );
-            manager.startConsumer( cinfo4 );
-            CPPUNIT_ASSERT( cinfo4->getSessionInfo() == info4 );
-            CPPUNIT_ASSERT( cinfo4->getDestination()->toProviderString() == dest4.toProviderString()
);
-            CPPUNIT_ASSERT( cinfo4->getMessageSelector() == sel4 );
-
-            delete info1;
-            delete info2;
-            delete info3;
-            delete info4;
-
-            delete cinfo1;
-            delete cinfo2;
-            delete cinfo3;
-            delete cinfo4;
-
-            delete connector;
-        }
-
-        void testCommand()
-        {
-            std::string connectionId = "testConnectionId";
-            StompResponseBuilder responseBuilder("testConnectionId");
-            transport::MockTransport transport( &responseBuilder );
-            util::Properties properties;
-
-            // Using a pointer for the connector so we ensure the proper destruction
-            // order of objects - connector before the transport.
-            StompConnector* connector = new StompConnector( &transport, properties );
-            StompSessionManager manager( connectionId, NULL, &transport );
-
-            StompTopic dest1( "dummy.topic" );
-            StompTopic dest2( "dummy.topic2" );
-
-            SessionInfo* info1 = manager.createSession( cms::Session::AUTO_ACKNOWLEDGE );
-            ConsumerInfo* cinfo1 = manager.createConsumer( &dest1, info1, "" );
-            manager.startConsumer( cinfo1 );
-
-            SessionInfo* info2 = manager.createSession( cms::Session::DUPS_OK_ACKNOWLEDGE
);
-            ConsumerInfo* cinfo2 = manager.createConsumer( &dest1, info2, "" );
-            manager.startConsumer( cinfo2 );
-
-            SessionInfo* info3 = manager.createSession( cms::Session::CLIENT_ACKNOWLEDGE
);
-            ConsumerInfo* cinfo3 = manager.createConsumer( &dest2, info3, "" );
-            manager.startConsumer( cinfo3 );
-
-            SessionInfo* info4 = manager.createSession( cms::Session::SESSION_TRANSACTED
);
-            ConsumerInfo* cinfo4 = manager.createConsumer( &dest2, info4, "" );
-            manager.startConsumer( cinfo4 );
-
-            MyMessageListener listener;
-            manager.setConsumerMessageListener( &listener );
-
-            commands::TextMessageCommand* msg = new commands::TextMessageCommand();
-            msg->setCMSDestination( &dest1 );
-            msg->setText( "hello world" );
-            manager.onStompCommand( msg );
-
-            CPPUNIT_ASSERT( listener.consumers.size() == 2 );
-            for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
-                CPPUNIT_ASSERT( listener.consumers[ix] == cinfo1 ||
-                    listener.consumers[ix] == cinfo2 );
-            }
-
-            // Clean up the consumers list
-            listener.consumers.clear();
-
-            msg = new commands::TextMessageCommand();
-            msg->setCMSDestination( &dest2 );
-            msg->setText( "hello world" );
-            manager.onStompCommand( msg );
-
-            CPPUNIT_ASSERT( listener.consumers.size() == 2 );
-            for( unsigned int ix=0; ix<listener.consumers.size(); ++ix ){
-                CPPUNIT_ASSERT( listener.consumers[ix] == cinfo3 ||
-                    listener.consumers[ix] == cinfo4 );
-            }
-
-            delete info1;
-            delete info2;
-            delete info3;
-            delete info4;
-
-            delete cinfo1;
-            delete cinfo2;
-            delete cinfo3;
-            delete cinfo4;
-
-            delete connector;
-        }
-
-        void testSendingCommands(){
-
-            std::string connectionId = "testConnectionId";
-            StompResponseBuilder responseBuilder("testConnectionId");
-            transport::MockTransport transport( &responseBuilder );
-            util::Properties properties;
-
-            // Using a pointer for the connector so we ensure the proper destruction
-            // order of objects - connector before the transport.
-            StompConnector* connector = new StompConnector( &transport, properties );
-            StompSessionManager manager( connectionId, NULL, &transport );
-
-            StompTopic dest1( "dummy.topic.1" );
-
-            MyCommandListener cmdListener;
-            transport.setOutgoingCommandListener( &cmdListener );
-
-            SessionInfo* info1 = manager.createSession( cms::Session::AUTO_ACKNOWLEDGE );
-            ConsumerInfo* cinfo1 = manager.createConsumer( &dest1, info1, "" );
-            manager.startConsumer( cinfo1 );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-
-            cmdListener.cmd = NULL;
-
-            SessionInfo* info2 = manager.createSession( cms::Session::DUPS_OK_ACKNOWLEDGE
);
-            ConsumerInfo* cinfo2 = manager.createConsumer( &dest1, info2, "" );
-            manager.startConsumer( cinfo2 );
-            CPPUNIT_ASSERT( cmdListener.cmd == NULL );
-
-            cmdListener.cmd = NULL;
-
-            manager.removeConsumer( cinfo1 );
-            CPPUNIT_ASSERT( cmdListener.cmd == NULL );
-
-            cmdListener.cmd = NULL;
-
-            manager.removeConsumer( cinfo2 );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-
-            delete info1;
-            delete info2;
-
-            delete cinfo1;
-            delete cinfo2;
-
-            delete connector;
-        }
-
-        void testSubscribeOptions(){
-
-            std::string connectionId = "testConnectionId";
-            StompResponseBuilder responseBuilder("testConnectionId");
-            transport::MockTransport transport( &responseBuilder );
-            util::Properties properties;
-
-            // Using a pointer for the connector so we ensure the proper destruction
-            // order of objects - connector before the transport.
-            StompConnector* connector = new StompConnector( &transport, properties );
-            StompSessionManager manager( connectionId, NULL, &transport );
-
-            MyProperty retroactive =
-                std::make_pair( "activemq.retroactive", "true" );
-            MyProperty prefetchSize =
-                std::make_pair( "activemq.prefetchSize", "1000" );
-            MyProperty maxPendingMsgLimit =
-                std::make_pair( "activemq.maximumPendingMessageLimit", "0" );
-            MyProperty noLocal =
-                std::make_pair( "activemq.noLocal", "true" );
-            MyProperty dispatchAsync =
-                std::make_pair( "activemq.dispatchAsync", "true" );
-            MyProperty selector =
-                std::make_pair( "selector", "test" );
-            MyProperty exclusive =
-                std::make_pair( "activemq.exclusive", "true" );
-            MyProperty priority =
-                std::make_pair( "activemq.priority", "1" );
-
-            SessionInfo* session = NULL;
-            ConsumerInfo* consumer = NULL;
-
-            MyCommandListener cmdListener;
-            transport.setOutgoingCommandListener( &cmdListener );
-
-            session = manager.createSession( cms::Session::AUTO_ACKNOWLEDGE );
-
-            cmdListener.expected.clear();
-            StompTopic dest1( "dummy.topic.1" );
-
-            consumer = manager.createConsumer( &dest1, session, "" );
-            manager.startConsumer( consumer );
-            CPPUNIT_ASSERT( consumer != NULL );
-            CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
-
-            manager.removeConsumer( consumer );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-            delete consumer;
-            cmdListener.cmd = NULL;
-            cmdListener.subscribe = NULL;
-
-            cmdListener.expected.clear();
-            cmdListener.expected.push_back( retroactive );
-            StompTopic dest2( "dummy.topic.1?consumer.retroactive=true" );
-
-            consumer = manager.createConsumer( &dest2, session, "" );
-            manager.startConsumer( consumer );
-            CPPUNIT_ASSERT( consumer != NULL );
-            CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
-
-            manager.removeConsumer( consumer );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-            delete consumer;
-            cmdListener.cmd = NULL;
-            cmdListener.subscribe = NULL;
-
-            cmdListener.expected.clear();
-            cmdListener.expected.push_back( retroactive );
-            cmdListener.expected.push_back( prefetchSize );
-            cmdListener.expected.push_back( maxPendingMsgLimit );
-            cmdListener.expected.push_back( noLocal );
-            cmdListener.expected.push_back( dispatchAsync );
-            cmdListener.expected.push_back( selector );
-            cmdListener.expected.push_back( exclusive );
-            cmdListener.expected.push_back( priority );
-            StompTopic dest3(
-                std::string( "dummy.topic.1?" ) +
-                "consumer.retroactive=" + retroactive.second + "&" +
-                "consumer.prefetchSize=" + prefetchSize.second + "&" +
-                "consumer.maximumPendingMessageLimit=" + maxPendingMsgLimit.second + "&"
+
-                "consumer.noLocal=" + noLocal.second + "&" +
-                "consumer.dispatchAsync=" + dispatchAsync.second + "&" +
-                "consumer.selector=" + selector.second + "&" +
-                "consumer.exclusive=" + exclusive.second + "&" +
-                "consumer.priority=" + priority.second );
-
-            consumer = manager.createConsumer( &dest3, session, "" );
-            manager.startConsumer( consumer );
-            CPPUNIT_ASSERT( consumer != NULL );
-            CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
-
-            manager.removeConsumer( consumer );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-            delete consumer;
-            cmdListener.cmd = NULL;
-            cmdListener.subscribe = NULL;
-
-            cmdListener.expected.clear();
-            cmdListener.expected.push_back( retroactive );
-            cmdListener.expected.push_back( prefetchSize );
-            cmdListener.expected.push_back( maxPendingMsgLimit );
-            cmdListener.expected.push_back( noLocal );
-            cmdListener.expected.push_back( dispatchAsync );
-            cmdListener.expected.push_back( selector );
-            cmdListener.expected.push_back( exclusive );
-            cmdListener.expected.push_back( priority );
-            StompTopic dest4(
-                std::string( "dummy.topic.1?" ) +
-                "consumer.retroactive=" + retroactive.second + "&" +
-                "consumer.prefetchSize=" + prefetchSize.second + "&" +
-                "consumer.maximumPendingMessageLimit=" + maxPendingMsgLimit.second + "&"
+
-                "consumer.dispatchAsync=" + dispatchAsync.second + "&" +
-                "consumer.selector=" + selector.second + "&" +
-                "consumer.exclusive=" + exclusive.second + "&" +
-                "consumer.priority=" + priority.second );
-
-            consumer = manager.createConsumer( &dest4, session, "", true );
-            manager.startConsumer( consumer );
-            CPPUNIT_ASSERT( consumer != NULL );
-            CPPUNIT_ASSERT( cmdListener.subscribe != NULL );
-
-            manager.removeConsumer( consumer );
-            CPPUNIT_ASSERT( cmdListener.cmd != NULL );
-            delete consumer;
-            cmdListener.cmd = NULL;
-            cmdListener.subscribe = NULL;
-
-            // Done
-            delete session;
-
-            delete connector;
-
-        }
+        void testSessions();
+        void testConsumers();
+        void testCommand();
+        void testSendingCommands();
+        void testSubscribeOptions();
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp?view=diff&rev=548743&r1=548742&r2=548743
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp Tue Jun
19 07:42:32 2007
@@ -31,7 +31,6 @@
 #include <activemq/util/Properties.h>
 #include <activemq/transport/MockTransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
-#include <activemq/transport/TransportFactoryMapRegistrar.h>
 #include <activemq/connector/stomp/StompConsumerInfo.h>
 #include <activemq/connector/stomp/StompProducerInfo.h>
 #include <activemq/connector/stomp/StompTransactionInfo.h>



Mime
View raw message