activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r730541 - in /activemq/activemq-cpp/trunk/src: main/ main/activemq/connector/openwire/ main/activemq/connector/stomp/ main/activemq/support/ main/activemq/transport/ main/activemq/transport/mock/ test/activemq/connector/stomp/ test/activemq...
Date Thu, 01 Jan 2009 13:08:57 GMT
Author: tabish
Date: Thu Jan  1 05:08:56 2009
New Revision: 730541

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

Begin restructuring the Transports folder and classes for organize for more varieties of Transports.
 Move MockTransport into its own folder.

Added:
    activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/
    activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp   (contents,
props changed)
      - copied, changed from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h   (contents,
props changed)
      - copied, changed from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
  (contents, props changed)
      - copied, changed from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h  
(contents, props changed)
      - copied, changed from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h
Removed:
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h
Modified:
    activemq/activemq-cpp/trunk/src/main/Makefile.am
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp
    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/support/InitDirector.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/ActiveMQConnectionFactoryTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h

Modified: activemq/activemq-cpp/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/Makefile.am?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Thu Jan  1 05:08:56 2009
@@ -72,8 +72,8 @@
     activemq/transport/TransportFilter.cpp \
     activemq/transport/IOTransportFactory.cpp \
     activemq/transport/IOTransport.cpp \
-    activemq/transport/MockTransport.cpp \
-    activemq/transport/MockTransportFactory.cpp \
+    activemq/transport/mock/MockTransport.cpp \
+    activemq/transport/mock/MockTransportFactory.cpp \
     activemq/transport/filters/ResponseCorrelator.cpp \
     activemq/transport/filters/ResponseCorrelatorFactory.cpp \
     activemq/transport/filters/AsyncSendTransport.cpp \
@@ -271,8 +271,8 @@
     activemq/transport/CommandIOException.h \
     activemq/transport/IOTransportFactory.h \
     activemq/transport/IOTransport.h \
-    activemq/transport/MockTransport.h \
-    activemq/transport/MockTransportFactory.h \
+    activemq/transport/mock/MockTransport.h \
+    activemq/transport/mock/MockTransportFactory.h \
     activemq/transport/filters/FutureResponse.h \
     activemq/transport/filters/ResponseCorrelator.h \
     activemq/transport/filters/ResponseCorrelatorFactory.h \

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp
Thu Jan  1 05:08:56 2009
@@ -39,6 +39,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 
 ////////////////////////////////////////////////////////////////////////////////
 Response* OpenWireResponseBuilder::buildResponse(

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
Thu Jan  1 05:08:56 2009
@@ -19,13 +19,14 @@
 #define ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIRERESPONSEBUILDER_H_
 
 #include <activemq/util/Config.h>
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 
 namespace activemq{
 namespace connector{
 namespace openwire{
 
-    class AMQCPP_API OpenWireResponseBuilder : public transport::MockTransport::ResponseBuilder{
+    class AMQCPP_API OpenWireResponseBuilder :
+        public transport::mock::MockTransport::ResponseBuilder{
     public:
 
         OpenWireResponseBuilder() {}

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
Thu Jan  1 05:08:56 2009
@@ -28,6 +28,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::stomp;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 using namespace decaf;
 using namespace decaf::util;
 

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h Thu
Jan  1 05:08:56 2009
@@ -18,7 +18,7 @@
 #ifndef _ACTIVEMQ_CONNECTOR_STOMP_STOMPRESPONSEBUILDER_H_
 #define _ACTIVEMQ_CONNECTOR_STOMP_STOMPRESPONSEBUILDER_H_
 
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/util/Config.h>
 
 namespace activemq{
@@ -26,7 +26,7 @@
 namespace stomp{
 
     class AMQCPP_API StompResponseBuilder :
-        public transport::MockTransport::ResponseBuilder{
+        public transport::mock::MockTransport::ResponseBuilder{
     public:
 
         StompResponseBuilder() {}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/support/InitDirector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/support/InitDirector.cpp?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/support/InitDirector.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/support/InitDirector.cpp Thu Jan  1 05:08:56
2009
@@ -19,7 +19,7 @@
 #include <decaf/util/logging/LogWriter.h>
 #include <decaf/lang/Runtime.h>
 #include <activemq/transport/IOTransportFactory.h>
-#include <activemq/transport/MockTransportFactory.h>
+#include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/transport/filters/AsyncSendTransportFactory.h>
 #include <activemq/transport/filters/TcpTransportFactory.h>
 #include <activemq/transport/filters/LoggingTransportFactory.h>
@@ -45,7 +45,7 @@
         transport::filters::LoggingTransportFactory::getInstance();
         transport::filters::ResponseCorrelatorFactory::getInstance();
         transport::IOTransportFactory::getInstance();
-        transport::MockTransportFactory::getInstance();
+        transport::mock::MockTransportFactory::getInstance();
     }
 
     refCount++;

Copied: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp (from
r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp?p2=activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp&p1=activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp&r1=730408&r2=730541&rev=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp Thu Jan
 1 05:08:56 2009
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/exceptions/ActiveMQException.h>
 
 using namespace activemq;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 using namespace activemq::exceptions;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h (from
r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h?p2=activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h&p1=activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h&r1=730408&r2=730541&rev=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h Thu Jan 
1 05:08:56 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_TANSPORT_MOCKTRANSPORT_H_
-#define _ACTIVEMQ_TANSPORT_MOCKTRANSPORT_H_
+#ifndef _ACTIVEMQ_TANSPORT_MOCK_MOCKTRANSPORT_H_
+#define _ACTIVEMQ_TANSPORT_MOCK_MOCKTRANSPORT_H_
 
 #include <activemq/util/Config.h>
 #include <activemq/exceptions/ActiveMQException.h>
@@ -38,6 +38,7 @@
 
 namespace activemq{
 namespace transport{
+namespace mock{
 
     /**
      * The MockTransport defines a base level Transport class that is intended to
@@ -285,6 +286,6 @@
 
     };
 
-}}
+}}}
 
-#endif /*ACTIVEMQ_TANSPORT_MOCKTRANSPORT_H_*/
+#endif /*_ACTIVEMQ_TANSPORT_MOCK_MOCKTRANSPORT_H_*/

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransport.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
(from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp?p2=activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp&p1=activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp&r1=730408&r2=730541&rev=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
Thu Jan  1 05:08:56 2009
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-#include "MockTransportFactory.h"
+#include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/connector/stomp/StompResponseBuilder.h>
 #include <activemq/connector/openwire/OpenWireResponseBuilder.h>
 #include <activemq/transport/Transport.h>
-#include <activemq/transport/MockTransport.h>
-#include <activemq/transport/MockTransportFactory.h>
+#include <activemq/transport/mock/MockTransport.h>
+#include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/transport/TransportFactoryMapRegistrar.h>
 
 using namespace activemq;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 using namespace activemq::exceptions;
 using namespace decaf::util;
 using namespace decaf::lang;

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h
(from r730408, activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h?p2=activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h&p1=activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h&r1=730408&r2=730541&rev=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h Thu
Jan  1 05:08:56 2009
@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_TRANSPORT_MOCKTRANSPORTFACTORY_H_
-#define _ACTIVEMQ_TRANSPORT_MOCKTRANSPORTFACTORY_H_
+#ifndef _ACTIVEMQ_TRANSPORT_MOCK_MOCKTRANSPORTFACTORY_H_
+#define _ACTIVEMQ_TRANSPORT_MOCK_MOCKTRANSPORTFACTORY_H_
 
 #include <activemq/util/Config.h>
 #include <activemq/transport/TransportFactory.h>
 
 namespace activemq{
 namespace transport{
+namespace mock{
 
     /**
      * Manufactures MockTransports, which are objects that
@@ -50,6 +51,6 @@
 
     };
 
-}}
+}}}
 
-#endif /*_ACTIVEMQ_TRANSPORT_MOCKTRANSPORTFACTORY_H_*/
+#endif /*_ACTIVEMQ_TRANSPORT_MOCK_MOCKTRANSPORTFACTORY_H_*/

Propchange: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.cpp Thu
Jan  1 05:08:56 2009
@@ -24,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::stomp;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 
 ////////////////////////////////////////////////////////////////////////////////
 void StompConnectorTest::testSessions()

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h Thu
Jan  1 05:08:56 2009
@@ -29,7 +29,7 @@
 #include <activemq/connector/stomp/commands/BytesMessageCommand.h>
 #include <activemq/connector/stomp/StompTopic.h>
 #include <activemq/connector/stomp/StompQueue.h>
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/util/Config.h>
 
 #include <decaf/io/ByteArrayOutputStream.h>
@@ -53,7 +53,7 @@
     private:
 
         StompConnector* connector;
-        transport::MockTransport* transport;
+        transport::mock::MockTransport* transport;
         std::string connectionId;
 
     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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp
Thu Jan  1 05:08:56 2009
@@ -21,6 +21,7 @@
 
 using namespace activemq;
 using namespace activemq::transport;
+using namespace activemq::transport::mock;
 using namespace activemq::connector;
 using namespace activemq::connector::stomp;
 using namespace std;

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
(original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompSessionManagerTest.h
Thu Jan  1 05:08:56 2009
@@ -26,7 +26,7 @@
 #include <activemq/connector/stomp/StompConnector.h>
 #include <activemq/connector/stomp/StompTopic.h>
 #include <activemq/connector/stomp/StompQueue.h>
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/connector/stomp/commands/TextMessageCommand.h>
 #include <activemq/connector/stomp/commands/SubscribeCommand.h>
 #include <activemq/transport/CommandListener.h>
@@ -52,7 +52,7 @@
 
         StompConnector* connector;
         StompSessionManager* manager;
-        transport::MockTransport* transport;
+        transport::mock::MockTransport* transport;
         std::string connectionId;
 
     public:

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp Thu
Jan  1 05:08:56 2009
@@ -17,14 +17,12 @@
 
 #include "ActiveMQConnectionFactoryTest.h"
 
+#include <cms/Connection.h>
 #include <decaf/util/concurrent/Concurrent.h>
 #include <decaf/util/concurrent/Mutex.h>
 #include <decaf/lang/Thread.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/core/ActiveMQConnection.h>
-#include <cms/Connection.h>
-#include <activemq/transport/TransportFactoryMapRegistrar.h>
-#include <activemq/transport/MockTransportFactory.h>
 #include <activemq/connector/Connector.h>
 #include <memory>
 

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?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp Thu Jan
 1 05:08:56 2009
@@ -22,12 +22,12 @@
 #include <decaf/lang/Thread.h>
 #include <decaf/util/Properties.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConnectionData.h>
 #include <activemq/connector/stomp/StompConnector.h>
 #include <activemq/connector/openwire/OpenWireConnector.h>
-#include <activemq/transport/MockTransportFactory.h>
+#include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
 #include <activemq/connector/stomp/StompConsumerInfo.h>
 #include <activemq/connector/stomp/StompProducerInfo.h>
@@ -71,8 +71,8 @@
             CPPUNIT_ASSERT( false );
         }
 
-        transport::MockTransport* dTransport =
-            dynamic_cast< transport::MockTransport*>( transport );
+        transport::mock::MockTransport* dTransport =
+            dynamic_cast< transport::mock::MockTransport*>( transport );
 
         CPPUNIT_ASSERT( dTransport != NULL );
 
@@ -209,8 +209,8 @@
             CPPUNIT_ASSERT( false );
         }
 
-        transport::MockTransport* dTransport =
-            dynamic_cast< transport::MockTransport*>( transport );
+        transport::mock::MockTransport* dTransport =
+            dynamic_cast< transport::mock::MockTransport*>( transport );
 
         CPPUNIT_ASSERT( dTransport != NULL );
 
@@ -266,8 +266,8 @@
             CPPUNIT_ASSERT( false );
         }
 
-        transport::MockTransport* dTransport =
-            dynamic_cast< transport::MockTransport*>( transport );
+        transport::mock::MockTransport* dTransport =
+            dynamic_cast< transport::mock::MockTransport*>( transport );
 
         CPPUNIT_ASSERT( dTransport != NULL );
 

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp Thu Jan  1
05:08:56 2009
@@ -18,7 +18,7 @@
 #include "ActiveMQSessionTest.h"
 
 #include <decaf/lang/Thread.h>
-#include <activemq/transport/MockTransportFactory.h>
+#include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/transport/TransportFactoryMap.h>
 #include <activemq/transport/TransportFactoryMapRegistrar.h>
 #include <activemq/connector/ConsumerInfo.h>
@@ -497,7 +497,7 @@
             factory.createConnection() );
 
         // Get the Transport and make sure we got a dummy Transport
-        dTransport = transport::MockTransport::getInstance();
+        dTransport = transport::mock::MockTransport::getInstance();
         CPPUNIT_ASSERT( dTransport != NULL );
 
         connection->setExceptionListener( &exListener );

Modified: activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h?rev=730541&r1=730540&r2=730541&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h Thu Jan  1 05:08:56
2009
@@ -27,7 +27,7 @@
 #include <decaf/util/concurrent/Concurrent.h>
 #include <decaf/util/concurrent/Mutex.h>
 #include <activemq/core/ActiveMQConnection.h>
-#include <activemq/transport/MockTransport.h>
+#include <activemq/transport/mock/MockTransport.h>
 #include <activemq/util/Config.h>
 
 namespace activemq{
@@ -109,7 +109,7 @@
         };
 
         ActiveMQConnection* connection;
-        transport::MockTransport* dTransport;
+        transport::mock::MockTransport* dTransport;
         MyExceptionListener exListener;
 
     public:    // CPPUNIT Method Overrides.



Mime
View raw message