activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r733927 [2/22] - in /activemq/activemq-cpp/trunk/src: main/ main/activemq/connector/openwire/ main/activemq/connector/openwire/commands/ main/activemq/connector/openwire/marshal/ main/activemq/connector/openwire/utils/ main/activemq/connect...
Date Mon, 12 Jan 2009 22:07:40 GMT
Modified: activemq/activemq-cpp/trunk/src/main/activemq/library/ActiveMQCPP.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/library/ActiveMQCPP.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/library/ActiveMQCPP.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/library/ActiveMQCPP.cpp Mon Jan 12 14:07:09 2009
@@ -22,7 +22,7 @@
 #include <activemq/transport/TransportRegistry.h>
 
 #include <activemq/wireformat/stomp/StompWireFormatFactory.h>
-#include <activemq/connector/openwire/OpenWireFormatFactory.h>
+#include <activemq/wireformat/openwire/OpenWireFormatFactory.h>
 
 #include <activemq/transport/mock/MockTransportFactory.h>
 #include <activemq/transport/tcp/TcpTransportFactory.h>
@@ -64,7 +64,7 @@
     // with the WireFormat Registry
 
     WireFormatRegistry::getInstance().registerFactory(
-        "openwire", new connector::openwire::OpenWireFormatFactory() );
+        "openwire", new wireformat::openwire::OpenWireFormatFactory() );
     WireFormatRegistry::getInstance().registerFactory(
         "stomp", new wireformat::stomp::StompWireFormatFactory() );
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/mock/MockTransportFactory.cpp Mon Jan 12 14:07:09 2009
@@ -16,8 +16,8 @@
  */
 
 #include <activemq/transport/mock/MockTransportFactory.h>
-#include <activemq/connector/stomp/StompResponseBuilder.h>
-#include <activemq/connector/openwire/OpenWireResponseBuilder.h>
+#include <activemq/wireformat/stomp/StompResponseBuilder.h>
+#include <activemq/wireformat/openwire/OpenWireResponseBuilder.h>
 #include <activemq/transport/Transport.h>
 #include <activemq/transport/mock/MockTransport.h>
 
@@ -43,9 +43,9 @@
         MockTransport::ResponseBuilder* builder = NULL;
 
         if( wireFormat == "stomp" ) {
-            builder = new connector::stomp::StompResponseBuilder();
+            builder = new wireformat::stomp::StompResponseBuilder();
         } else if( wireFormat == "openwire" ) {
-            builder = new connector::openwire::OpenWireResponseBuilder();
+            builder = new wireformat::openwire::OpenWireResponseBuilder();
         }
 
         return new MockTransport( builder, true );

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.cpp Mon Jan 12 14:07:09 2009
@@ -17,6 +17,7 @@
 
 #include "TcpTransport.h"
 
+#include <decaf/lang/Integer.h>
 #include <decaf/net/SocketFactory.h>
 #include <activemq/transport/IOTransport.h>
 #include <activemq/transport/TransportFactory.h>
@@ -27,76 +28,49 @@
 using namespace activemq::transport;
 using namespace activemq::transport::tcp;
 using namespace activemq::exceptions;
+using namespace decaf;
 using namespace decaf::net;
 using namespace decaf::io;
 using namespace decaf::lang;
 
 ////////////////////////////////////////////////////////////////////////////////
-TcpTransport::TcpTransport( const decaf::util::Properties& properties,
-                            Transport* next,
-                            const bool own )
-:
-    TransportFilter( next, own ),
+TcpTransport::TcpTransport( const decaf::net::URI& uri,
+                            const decaf::util::Properties& properties,
+                            Transport* next, const bool own )
+:   TransportFilter( next, own ),
     socket( NULL ),
     loggingInputStream( NULL ),
     loggingOutputStream( NULL ),
     bufferedInputStream( NULL ),
     bufferedOutputStream( NULL )
 {
-    try{
-
-        if( !properties.hasProperty( "transport.uri" ) ) {
-            throw ActiveMQException(
-                __FILE__, __LINE__,
-                "TcpTransport::TcpTransport - "
-                "No URI set for this transport to connect to.");
-        }
-
-        // Create the IO device we will be communicating over the
-        // wire with.  This may need to change if we add more types
-        // of sockets, such as SSL.
-        socket = SocketFactory::createSocket(
-            properties.getProperty( "transport.uri" ), properties );
-
-        // Cast it to an IO transport so we can wire up the socket
-        // input and output streams.
-        IOTransport* ioTransport = dynamic_cast<IOTransport*>( next );
-        if( ioTransport == NULL ){
-            throw ActiveMQException(
-                __FILE__, __LINE__,
-                "TcpTransport::TcpTransport - "
-                "transport must be of type IOTransport");
-        }
-
-        InputStream* inputStream = socket->getInputStream();
-        OutputStream* outputStream = socket->getOutputStream();
-
-        // If tcp tracing was enabled, wrap the iostreams with logging streams
-        if( properties.getProperty( "transport.tcpTracingEnabled", "false" ) == "true" ) {
-            loggingInputStream = new LoggingInputStream( inputStream );
-            loggingOutputStream = new LoggingOutputStream( outputStream );
-
-            inputStream = loggingInputStream;
-            outputStream = loggingOutputStream;
-        }
-
-        // Now wrap the input/output streams with buffered streams
-        bufferedInputStream = new BufferedInputStream(inputStream);
-        bufferedOutputStream = new BufferedOutputStream(outputStream);
+    this->initialize( uri, properties );
+}
 
-        // Give the IOTransport the streams.
-        ioTransport->setInputStream( bufferedInputStream );
-        ioTransport->setOutputStream( bufferedOutputStream );
+////////////////////////////////////////////////////////////////////////////////
+TcpTransport::TcpTransport( const decaf::util::Properties& properties,
+                            Transport* next, const bool own )
+:   TransportFilter( next, own ),
+    socket( NULL ),
+    loggingInputStream( NULL ),
+    loggingOutputStream( NULL ),
+    bufferedInputStream( NULL ),
+    bufferedOutputStream( NULL )
+{
+    if( !properties.hasProperty( "transport.uri" ) ) {
+        throw ActiveMQException(
+            __FILE__, __LINE__,
+            "TcpTransport::TcpTransport - "
+            "No URI set for this transport to connect to.");
     }
-    AMQ_CATCH_RETHROW( ActiveMQException )
-    AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
-    AMQ_CATCHALL_THROW( ActiveMQException )
+
+    this->initialize( URI( properties.getProperty( "transport.uri" ) ), properties );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 TcpTransport::~TcpTransport() {
 
-    try{
+    try {
 
         try{
             close();
@@ -135,8 +109,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 void TcpTransport::close() throw( cms::CMSException ) {
 
-    try
-    {
+    try {
+
         // Close the socket.
         if( socket != NULL ) {
             socket->close();
@@ -149,3 +123,49 @@
     AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
     AMQ_CATCHALL_THROW( ActiveMQException )
 }
+
+////////////////////////////////////////////////////////////////////////////////
+void TcpTransport::initialize( const decaf::net::URI& uri,
+                               const decaf::util::Properties& properties ) {
+
+    try {
+
+        // Create the IO device we will be communicating over the
+        // wire with.  This may need to change if we add more types
+        // of sockets, such as SSL.
+        socket = SocketFactory::createSocket( uri.getAuthority(), properties );
+
+        // Cast it to an IO transport so we can wire up the socket
+        // input and output streams.
+        IOTransport* ioTransport = dynamic_cast<IOTransport*>( next );
+        if( ioTransport == NULL ){
+            throw ActiveMQException(
+                __FILE__, __LINE__,
+                "TcpTransport::TcpTransport - "
+                "transport must be of type IOTransport");
+        }
+
+        InputStream* inputStream = socket->getInputStream();
+        OutputStream* outputStream = socket->getOutputStream();
+
+        // If tcp tracing was enabled, wrap the iostreams with logging streams
+        if( properties.getProperty( "transport.tcpTracingEnabled", "false" ) == "true" ) {
+            loggingInputStream = new LoggingInputStream( inputStream );
+            loggingOutputStream = new LoggingOutputStream( outputStream );
+
+            inputStream = loggingInputStream;
+            outputStream = loggingOutputStream;
+        }
+
+        // Now wrap the input/output streams with buffered streams
+        bufferedInputStream = new BufferedInputStream(inputStream);
+        bufferedOutputStream = new BufferedOutputStream(outputStream);
+
+        // Give the IOTransport the streams.
+        ioTransport->setInputStream( bufferedInputStream );
+        ioTransport->setOutputStream( bufferedOutputStream );
+    }
+    AMQ_CATCH_RETHROW( ActiveMQException )
+    AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
+    AMQ_CATCHALL_THROW( ActiveMQException )
+}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.h?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransport.h Mon Jan 12 14:07:09 2009
@@ -21,6 +21,7 @@
 #include <activemq/util/Config.h>
 #include <activemq/transport/TransportFilter.h>
 #include <decaf/net/Socket.h>
+#include <decaf/net/URI.h>
 #include <decaf/util/Properties.h>
 #include <activemq/io/LoggingInputStream.h>
 #include <activemq/io/LoggingOutputStream.h>
@@ -63,6 +64,18 @@
                       Transport* next,
                       const bool own = true );
 
+        /**
+         * Constructor
+         * @param uri - The URI containing the host to connect to.
+         * @param properties the configuration properties for this transport
+         * @param next the next transport in the chain
+         * @param own indicates if this transport owns the next.
+         */
+        TcpTransport( const decaf::net::URI& uri,
+                      const decaf::util::Properties& properties,
+                      Transport* next,
+                      const bool own = true );
+
         virtual ~TcpTransport();
 
         /**
@@ -71,6 +84,11 @@
          */
         virtual void close() throw( cms::CMSException );
 
+    private:
+
+        void initialize( const decaf::net::URI& uri,
+                         const decaf::util::Properties& properties );
+
     };
 
 }}}

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/tcp/TcpTransportFactory.cpp Mon Jan 12 14:07:09 2009
@@ -33,7 +33,7 @@
     throw ( exceptions::ActiveMQException ) {
 
     try {
-        return new TcpTransport( properties, new IOTransport() );
+        return new TcpTransport( location, properties, new IOTransport() );
     }
     AMQ_CATCH_RETHROW( ActiveMQException )
     AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/stomp/StompResponseBuilder.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/stomp/StompResponseBuilder.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/stomp/StompResponseBuilder.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/stomp/StompResponseBuilder.cpp Mon Jan 12 14:07:09 2009
@@ -50,11 +50,12 @@
 void StompResponseBuilder::buildIncomingCommands(
     const transport::Command* command, decaf::util::Queue<transport::Command*>& queue ){
 
-    const commands::ConnectCommand* connectCommand =
-        dynamic_cast<const commands::ConnectCommand*>( command );
+    const connector::stomp::commands::ConnectCommand* connectCommand =
+        dynamic_cast<const connector::stomp::commands::ConnectCommand*>( command );
 
     if( connectCommand != NULL ) {
-        commands::ConnectedCommand* resp = new commands::ConnectedCommand();
+        connector::stomp::commands::ConnectedCommand* resp =
+            new connector::stomp::commands::ConnectedCommand();
         resp->setCorrelationId( connectCommand->getCommandId() );
 
         if( connectCommand->getClientId() == NULL ) {

Modified: activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp Mon Jan 12 14:07:09 2009
@@ -101,13 +101,13 @@
         checkResult( apr_socket_create(
             &socketHandle, socketAddress->family, SOCK_STREAM, APR_PROTO_TCP, apr_pool.getAprPool() ) );
 
-        // To make blocking-with-timeout sockets, we have to set it to 
-        // 'APR_SO_NONBLOCK==1(on) and timeout>0'. On Unix, we have no 
-        // problem to specify 'APR_SO_NONBLOCK==0(off) and timeout>0'. 
-        // Unfortunatelly, we have a problem on Windows. Setting the 
-        // mode to 'APR_SO_NONBLOCK==0(off) and timeout>0' causes 
-        // blocking-with-system-timeout sockets on Windows. 
-        // 
+        // To make blocking-with-timeout sockets, we have to set it to
+        // 'APR_SO_NONBLOCK==1(on) and timeout>0'. On Unix, we have no
+        // problem to specify 'APR_SO_NONBLOCK==0(off) and timeout>0'.
+        // Unfortunatelly, we have a problem on Windows. Setting the
+        // mode to 'APR_SO_NONBLOCK==0(off) and timeout>0' causes
+        // blocking-with-system-timeout sockets on Windows.
+        //
         // http://dev.ariel-networks.com/apr/apr-tutorial/html/apr-tutorial-13.html
 
         // If we have a connection timeout specified, temporarily set the socket to
@@ -115,7 +115,7 @@
         // to blocking mode right after we connect.
         apr_socket_opt_set( socketHandle, APR_SO_NONBLOCK, (timeout>0)?1:0 );
         apr_socket_timeout_set( socketHandle, timeout );
-	
+
         // Connect to the broker.
         checkResult(apr_socket_connect( socketHandle, socketAddress ));
 

Modified: activemq/activemq-cpp/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/Makefile.am?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/test/Makefile.am Mon Jan 12 14:07:09 2009
@@ -40,24 +40,17 @@
   activemq/connector/stomp/StompFrameTest.cpp \
   activemq/connector/stomp/StompDestinationTest.cpp \
   activemq/connector/stomp/StompSessionManagerTest.cpp \
-  activemq/connector/openwire/OpenWireFormatTest.cpp \
-  activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp \
-  activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp \
-  activemq/connector/openwire/utils/HexTableTest.cpp \
-  activemq/connector/openwire/utils/BooleanStreamTest.cpp \
-  activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp \
-  activemq/connector/openwire/utils/MessagePropertyInterceptorTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQMapMessageTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQMessageTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp \
-  activemq/connector/openwire/commands/ActiveMQTopicTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQQueueTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQTempTopicTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQTempQueueTest.cpp \
-  activemq/connector/openwire/commands/ActiveMQTextMessageTest.cpp \
-  activemq/connector/openwire/commands/BrokerIdTest.cpp \
-  activemq/connector/openwire/commands/BrokerInfoTest.cpp \
+  activemq/commands/ActiveMQBytesMessageTest.cpp \
+  activemq/commands/ActiveMQMapMessageTest.cpp \
+  activemq/commands/ActiveMQMessageTest.cpp \
+  activemq/commands/ActiveMQDestinationTest2.cpp \
+  activemq/commands/ActiveMQTopicTest.cpp \
+  activemq/commands/ActiveMQQueueTest.cpp \
+  activemq/commands/ActiveMQTempTopicTest.cpp \
+  activemq/commands/ActiveMQTempQueueTest.cpp \
+  activemq/commands/ActiveMQTextMessageTest.cpp \
+  activemq/commands/BrokerIdTest.cpp \
+  activemq/commands/BrokerInfoTest.cpp \
   activemq/core/ActiveMQConnectionFactoryTest.cpp \
   activemq/core/ActiveMQConnectionTest.cpp \
   activemq/core/ActiveMQSessionTest.cpp \
@@ -78,6 +71,13 @@
   activemq/util/MemoryUsageTest.cpp \
   activemq/util/LongSequenceGeneratorTest.cpp \
   activemq/wireformat/WireFormatRegistryTest.cpp \
+  activemq/wireformat/openwire/OpenWireFormatTest.cpp \
+  activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp \
+  activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp \
+  activemq/wireformat/openwire/utils/HexTableTest.cpp \
+  activemq/wireformat/openwire/utils/BooleanStreamTest.cpp \
+  activemq/wireformat/openwire/utils/OpenwireStringSupportTest.cpp \
+  activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.cpp \
   decaf/internal/util/ByteArrayAdapterTest.cpp \
   decaf/internal/nio/ByteArrayPerspectiveTest.cpp \
   decaf/internal/nio/ByteArrayBufferTest.cpp \
@@ -160,24 +160,17 @@
   activemq/connector/stomp/StompFrameTest.h \
   activemq/connector/stomp/StompDestinationTest.h \
   activemq/connector/stomp/StompSessionManagerTest.h \
-  activemq/connector/openwire/OpenWireFormatTest.h \
-  activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.h \
-  activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h \
-  activemq/connector/openwire/utils/HexTableTest.h \
-  activemq/connector/openwire/utils/BooleanStreamTest.h \
-  activemq/connector/openwire/utils/OpenwireStringSupportTest.h \
-  activemq/connector/openwire/utils/MessagePropertyInterceptorTest.h \
-  activemq/connector/openwire/commands/ActiveMQBytesMessageTest.h \
-  activemq/connector/openwire/commands/ActiveMQMapMessageTest.h \
-  activemq/connector/openwire/commands/ActiveMQMessageTest.h \
-  activemq/connector/openwire/commands/ActiveMQDestinationTest2.h \
-  activemq/connector/openwire/commands/ActiveMQTopicTest.h \
-  activemq/connector/openwire/commands/ActiveMQQueueTest.h \
-  activemq/connector/openwire/commands/ActiveMQTempTopicTest.h \
-  activemq/connector/openwire/commands/ActiveMQTempQueueTest.h \
-  activemq/connector/openwire/commands/ActiveMQTextMessageTest.h \
-  activemq/connector/openwire/commands/BrokerIdTest.h \
-  activemq/connector/openwire/commands/BrokerInfoTest.h \
+  activemq/commands/ActiveMQBytesMessageTest.h \
+  activemq/commands/ActiveMQMapMessageTest.h \
+  activemq/commands/ActiveMQMessageTest.h \
+  activemq/commands/ActiveMQDestinationTest2.h \
+  activemq/commands/ActiveMQTopicTest.h \
+  activemq/commands/ActiveMQQueueTest.h \
+  activemq/commands/ActiveMQTempTopicTest.h \
+  activemq/commands/ActiveMQTempQueueTest.h \
+  activemq/commands/ActiveMQTextMessageTest.h \
+  activemq/commands/BrokerIdTest.h \
+  activemq/commands/BrokerInfoTest.h \
   activemq/core/ActiveMQConnectionFactoryTest.h \
   activemq/core/ActiveMQConnectionTest.h \
   activemq/core/ActiveMQSessionTest.h \
@@ -198,6 +191,13 @@
   activemq/util/MemoryUsageTest.h \
   activemq/util/LongSequenceGeneratorTest.h \
   activemq/wireformat/WireFormatRegistryTest.h \
+  activemq/wireformat/openwire/OpenWireFormatTest.h \
+  activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h \
+  activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h \
+  activemq/wireformat/openwire/utils/HexTableTest.h \
+  activemq/wireformat/openwire/utils/BooleanStreamTest.h \
+  activemq/wireformat/openwire/utils/OpenwireStringSupportTest.h \
+  activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.h \
   decaf/internal/util/ByteArrayAdapterTest.h \
   decaf/internal/nio/ByteArrayPerspectiveTest.h \
   decaf/internal/nio/ByteArrayBufferTest.h \
@@ -253,9 +253,9 @@
   decaf/util/concurrent/atomic/AtomicIntegerTest.h \
   decaf/nio/BufferTest.h  
 
-## include activemq/connector/openwire/marshal/v1/srcmakefile.mk
-## include activemq/connector/openwire/marshal/v2/srcmakefile.mk
-## include activemq/connector/openwire/marshal/v3/srcmakefile.mk
+## include activemq/wireformat/openwire/marshal/v1/srcmakefile.mk
+## include activemq/wireformat/openwire/marshal/v2/srcmakefile.mk
+## include activemq/wireformat/openwire/marshal/v3/srcmakefile.mk
 
 ## Compile this as part of make check
 check_PROGRAMS = activemq-test

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,15 +18,12 @@
 #include "ActiveMQBytesMessageTest.h"
 
 #include <decaf/util/UUID.h>
-#include <activemq/connector/openwire/commands/ActiveMQBytesMessage.h>
+#include <activemq/commands/ActiveMQBytesMessage.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQBytesMessageTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h Mon Jan 12 14:07:09 2009
@@ -15,31 +15,29 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQBytesMessageTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQBytesMessageTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQBytesMessageTest() {}
         virtual ~ActiveMQBytesMessageTest() {}
 
-        void test();        
+        void test();
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQBYTESMESSAGETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQBytesMessageTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp Mon Jan 12 14:07:09 2009
@@ -24,10 +24,7 @@
 using namespace decaf::util;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQDestinationTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h Mon Jan 12 14:07:09 2009
@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQDESTINATIONTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQDESTINATIONTEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQDESTINATIONTEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQDESTINATIONTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQDestinationTest : public CppUnit::TestFixture {
@@ -90,6 +88,6 @@
 
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQDESTINATIONTEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQDESTINATIONTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQDestinationTest2.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.cpp Mon Jan 12 14:07:09 2009
@@ -17,15 +17,12 @@
 
 #include "ActiveMQMapMessageTest.h"
 
-#include <activemq/connector/openwire/commands/ActiveMQMapMessage.h>
+#include <activemq/commands/ActiveMQMapMessage.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQMapMessageTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMapMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.h Mon Jan 12 14:07:09 2009
@@ -15,31 +15,29 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQMapMessageTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQMapMessageTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQMapMessageTest() {}
         virtual ~ActiveMQMapMessageTest() {}
-        
+
         virtual void test();
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQMAPMESSAGETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMapMessageTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp Mon Jan 12 14:07:09 2009
@@ -17,15 +17,12 @@
 
 #include "ActiveMQMessageTest.h"
 
-#include <activemq/connector/openwire/commands/ActiveMQMessage.h>
+#include <activemq/commands/ActiveMQMessage.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQMessageTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h Mon Jan 12 14:07:09 2009
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMESSAGETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMESSAGETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQMESSAGETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQMESSAGETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -24,23 +24,21 @@
 #include <activemq/core/ActiveMQAckHandler.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQMessageTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQMessageTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
         class MyAckHandler : public core::ActiveMQAckHandler {
         public:
-        
+
             MyAckHandler() {
                 this->wasAcked = false;
             }
-            
+
             /**
              * Method called to acknowledge the message passed
              * @param message Message to Acknowlegde
@@ -48,26 +46,26 @@
              */
             virtual void acknowledgeMessage( const core::ActiveMQMessage* message )
                 throw ( cms::CMSException ) {
-                    
+
                 this->wasAcked = true;
             }
-            
+
             /**
              * Public indicator that we have received an ack
              */
             bool wasAcked;
-            
+
         };
 
     public:
-    
+
         ActiveMQMessageTest() {}
         virtual ~ActiveMQMessageTest() {}
-        
+
         virtual void test();
-        
+
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQMESSAGETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQMESSAGETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQMessageTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp Mon Jan 12 14:07:09 2009
@@ -19,20 +19,16 @@
 
 #include <decaf/util/UUID.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQQueue.h>
+#include <activemq/commands/ActiveMQQueue.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
-void ActiveMQQueueTest::test()
-{
-    ActiveMQQueue myQueue;
+void ActiveMQQueueTest::test() {
 
+    ActiveMQQueue myQueue;
     CPPUNIT_ASSERT( myQueue.getDestinationType() == cms::Destination::QUEUE );
 }

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h Mon Jan 12 14:07:09 2009
@@ -15,33 +15,31 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQQUEUETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQQUEUETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQQUEUETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQQUEUETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQQueueTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQQueueTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQQueueTest() {}
         virtual ~ActiveMQQueueTest() {}
 
         void test();
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQQUEUETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQQUEUETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQQueueTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,20 +18,17 @@
 #include "ActiveMQTempQueueTest.h"
 
 #include <decaf/util/UUID.h>
-#include <activemq/connector/openwire/commands/ActiveMQTempQueue.h>
+#include <activemq/commands/ActiveMQTempQueue.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQTempQueueTest::test()
 {
     ActiveMQTempQueue myQueue;
-    
+
     CPPUNIT_ASSERT( myQueue.getDestinationType() == cms::Destination::TEMPORARY_QUEUE );
 }

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h Mon Jan 12 14:07:09 2009
@@ -15,33 +15,31 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQTempQueueTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQTempQueueTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQTempQueueTest() {}
         virtual ~ActiveMQTempQueueTest() {}
-        
+
         void test();
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQTEMPQUEUETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempQueueTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,15 +18,12 @@
 #include "ActiveMQTempTopicTest.h"
 
 #include <decaf/util/UUID.h>
-#include <activemq/connector/openwire/commands/ActiveMQTempTopic.h>
+#include <activemq/commands/ActiveMQTempTopic.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQTempTopicTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h Mon Jan 12 14:07:09 2009
@@ -15,33 +15,31 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQTempTopicTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQTempTopicTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQTempTopicTest() {}
         virtual ~ActiveMQTempTopicTest() {}
-        
+
         void test();
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQTEMPTOPICTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTempTopicTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp Mon Jan 12 14:07:09 2009
@@ -17,15 +17,12 @@
 
 #include "ActiveMQTextMessageTest.h"
 
-#include <activemq/connector/openwire/commands/ActiveMQTextMessage.h>
+#include <activemq/commands/ActiveMQTextMessage.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQTextMessageTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTextMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h Mon Jan 12 14:07:09 2009
@@ -15,32 +15,30 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWORE_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWORE_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQTextMessageTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQTextMessageTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQTextMessageTest() {}
         virtual ~ActiveMQTextMessageTest() {}
-        
+
         void test();
-        
+
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWORE_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQTEXTMESSAGETEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTextMessageTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,20 +18,17 @@
 #include "ActiveMQTopicTest.h"
 
 #include <decaf/util/UUID.h>
-#include <activemq/connector/openwire/commands/ActiveMQTopic.h>
+#include <activemq/commands/ActiveMQTopic.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void ActiveMQTopicTest::test()
 {
     ActiveMQTopic myQueue;
-    
+
     CPPUNIT_ASSERT( myQueue.getDestinationType() == cms::Destination::TOPIC );
 }

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h Mon Jan 12 14:07:09 2009
@@ -15,34 +15,32 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTOPICTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTOPICTEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_ACTIVEMQTOPICTEST_H_
+#define _ACTIVEMQ_COMMANDS_ACTIVEMQTOPICTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/commands/ActiveMQDestination.h>
+#include <activemq/commands/ActiveMQDestination.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class ActiveMQTopicTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( ActiveMQTopicTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         ActiveMQTopicTest() {}
         virtual ~ActiveMQTopicTest() {}
-        
+
         void test();
-        
+
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_ACTIVEMQTOPICTEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_ACTIVEMQTOPICTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/ActiveMQTopicTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp Mon Jan 12 14:07:09 2009
@@ -17,14 +17,11 @@
 
 #include "BrokerIdTest.h"
 
-#include <activemq/connector/openwire/commands/BrokerId.h>
+#include <activemq/commands/BrokerId.h>
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void BrokerIdTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerIdTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h Mon Jan 12 14:07:09 2009
@@ -15,32 +15,30 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERIDTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERIDTEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_BROKERIDTEST_H_
+#define _ACTIVEMQ_COMMANDS_BROKERIDTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class BrokerIdTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( BrokerIdTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         BrokerIdTest() {}
         virtual ~BrokerIdTest() {}
-        
+
         virtual void test();
-        
+
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERIDTEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_BROKERIDTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerIdTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.cpp Mon Jan 12 14:07:09 2009
@@ -17,35 +17,32 @@
 
 #include "BrokerInfoTest.h"
 
-#include <activemq/connector/openwire/commands/BrokerInfo.h>
+#include <activemq/commands/BrokerInfo.h>
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::commands;
+using namespace activemq::commands;
 
 ////////////////////////////////////////////////////////////////////////////////
 void BrokerInfoTest::test()
 {
     BrokerInfo myCommand;
-    
+
     CPPUNIT_ASSERT( myCommand.getDataStructureType() == BrokerInfo::ID_BROKERINFO );
-    
+
     myCommand.setBrokerName( "BrokerName" );
     myCommand.setBrokerURL( "http://www.example.com" );
     myCommand.setCommandId( 37 );
     myCommand.setMasterBroker( true );
 
-    BrokerInfo* copy = 
+    BrokerInfo* copy =
         dynamic_cast<BrokerInfo*>( myCommand.cloneDataStructure() );
-    
+
     CPPUNIT_ASSERT( copy != NULL );
     CPPUNIT_ASSERT( copy->getBrokerName() == myCommand.getBrokerName() );
     CPPUNIT_ASSERT( copy->getBrokerURL() == myCommand.getBrokerURL() );
     CPPUNIT_ASSERT( copy->getCommandId() == myCommand.getCommandId() );
     CPPUNIT_ASSERT( copy->isMasterBroker() == myCommand.isMasterBroker() );
-    
+
     delete copy;
 }

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/BrokerInfoTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.h Mon Jan 12 14:07:09 2009
@@ -15,32 +15,30 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERINFOTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERINFOTEST_H_
+#ifndef _ACTIVEMQ_COMMANDS_BROKERINFOTEST_H_
+#define _ACTIVEMQ_COMMANDS_BROKERINFOTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
-namespace openwire{
 namespace commands{
 
     class BrokerInfoTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( BrokerInfoTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         BrokerInfoTest() {}
         virtual ~BrokerInfoTest() {}
-    
+
         virtual void test();
-        
+
     };
 
-}}}}
+}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_COMMANDS_BROKERINFOTEST_H_*/
+#endif /*_ACTIVEMQ_COMMANDS_BROKERINFOTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/commands/BrokerInfoTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=733927&r1=733926&r2=733927&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 Mon Jan 12 14:07:09 2009
@@ -21,7 +21,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/stomp/StompResponseBuilder.h>
+#include <activemq/wireformat/stomp/StompResponseBuilder.h>
 #include <activemq/connector/stomp/StompConnector.h>
 #include <activemq/transport/Command.h>
 #include <activemq/connector/stomp/commands/ConnectedCommand.h>

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=733927&r1=733926&r2=733927&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 Mon Jan 12 14:07:09 2009
@@ -22,7 +22,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <activemq/connector/stomp/StompSessionManager.h>
-#include <activemq/connector/stomp/StompResponseBuilder.h>
+#include <activemq/wireformat/stomp/StompResponseBuilder.h>
 #include <activemq/connector/stomp/StompConnector.h>
 #include <activemq/connector/stomp/StompTopic.h>
 #include <activemq/connector/stomp/StompQueue.h>

Modified: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/WireFormatRegistryTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/WireFormatRegistryTest.cpp?rev=733927&r1=733926&r2=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/wireformat/WireFormatRegistryTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/WireFormatRegistryTest.cpp Mon Jan 12 14:07:09 2009
@@ -19,7 +19,7 @@
 
 #include <activemq/wireformat/WireFormatRegistry.h>
 
-#include <activemq/connector/openwire/OpenWireFormatFactory.h>
+#include <activemq/wireformat/openwire/OpenWireFormatFactory.h>
 
 using namespace activemq;
 using namespace activemq::wireformat;
@@ -30,7 +30,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 void WireFormatRegistryTest::test() {
 
-    connector::openwire::OpenWireFormatFactory factory;
+    wireformat::openwire::OpenWireFormatFactory factory;
 
     WireFormatRegistry& registry = WireFormatRegistry::getInstance();
 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,7 +18,7 @@
 #include "OpenWireFormatTest.h"
 
 #include <decaf/util/Properties.h>
-#include <activemq/connector/openwire/OpenWireFormat.h>
+#include <activemq/wireformat/openwire/OpenWireFormat.h>
 
 using namespace std;
 using namespace activemq;
@@ -27,8 +27,8 @@
 using namespace decaf::lang;
 using namespace decaf::util;
 using namespace activemq::exceptions;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
+using namespace activemq::wireformat;
+using namespace activemq::wireformat::openwire;
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormatTest::test()

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h Mon Jan 12 14:07:09 2009
@@ -15,31 +15,31 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIREFORMATTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIREFORMATTEST_H_
+#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_OPENWIREFORMATTEST_H_
+#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_OPENWIREFORMATTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 namespace activemq{
-namespace connector{
+namespace wireformat{
 namespace openwire{
 
     class OpenWireFormatTest : public CppUnit::TestFixture {
-        
+
         CPPUNIT_TEST_SUITE( OpenWireFormatTest );
         CPPUNIT_TEST( test );
         CPPUNIT_TEST_SUITE_END();
 
     public:
-    
+
         OpenWireFormatTest() {}
         virtual ~OpenWireFormatTest() {}
-        
+
         virtual void test();
-        
+
     };
 
 }}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIREFORMATTEST_H_*/
+#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_OPENWIREFORMATTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/OpenWireFormatTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp Mon Jan 12 14:07:09 2009
@@ -18,9 +18,9 @@
 #include "BaseDataStreamMarshallerTest.h"
 
 #include <activemq/util/PrimitiveMap.h>
-#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
-#include <activemq/connector/openwire/OpenWireFormatFactory.h>
-#include <activemq/connector/openwire/utils/BooleanStream.h>
+#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>
+#include <activemq/wireformat/openwire/OpenWireFormatFactory.h>
+#include <activemq/wireformat/openwire/utils/BooleanStream.h>
 #include <decaf/util/Properties.h>
 #include <decaf/io/ByteArrayOutputStream.h>
 #include <decaf/io/DataOutputStream.h>
@@ -33,10 +33,10 @@
 using namespace decaf::io;
 using namespace decaf::util;
 using namespace activemq::exceptions;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::utils;
-using namespace activemq::connector::openwire::marshal;
+using namespace activemq::wireformat;
+using namespace activemq::wireformat::openwire;
+using namespace activemq::wireformat::openwire::utils;
+using namespace activemq::wireformat::openwire::marshal;
 
 ////////////////////////////////////////////////////////////////////////////////
 void BaseDataStreamMarshallerTest::setUp(){

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h Mon Jan 12 14:07:09 2009
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_
+#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_
+#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
-#include <activemq/connector/openwire/commands/DataStructure.h>
+#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>
+#include <activemq/commands/DataStructure.h>
 
 namespace activemq{
-namespace connector{
+namespace wireformat{
 namespace openwire{
 namespace marshal{
 
@@ -376,4 +376,4 @@
 
 }}}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_*/
+#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_BASEDATASTREAMMARSHALLERTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp Mon Jan 12 14:07:09 2009
@@ -19,16 +19,16 @@
 
 #include <activemq/util/PrimitiveMap.h>
 #include <activemq/util/PrimitiveList.h>
-#include <activemq/connector/openwire/marshal/PrimitiveMapMarshaller.h>
+#include <activemq/wireformat/openwire/marshal/PrimitiveMapMarshaller.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::util;
 using namespace decaf::io;
 using namespace decaf::lang::exceptions;
-using namespace activemq::connector;
-using namespace activemq::connector::openwire;
-using namespace activemq::connector::openwire::marshal;
+using namespace activemq::wireformat;
+using namespace activemq::wireformat::openwire;
+using namespace activemq::wireformat::openwire::marshal;
 
 ////////////////////////////////////////////////////////////////////////////////
 void PrimitiveMapMarshallerTest::test() {

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h (from r732499, activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.h)
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h?p2=activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h&p1=activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.h&r1=732499&r2=733927&rev=733927&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/PrimitiveMapMarshallerTest.h (original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h Mon Jan 12 14:07:09 2009
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-#ifndef _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_
-#define _ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_
+#ifndef _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_
+#define _ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <activemq/util/PrimitiveMap.h>
 
 namespace activemq{
-namespace connector{
+namespace wireformat{
 namespace openwire{
 namespace marshal{
 
@@ -61,4 +61,4 @@
 
 }}}}
 
-#endif /*_ACTIVEMQ_CONNECTOR_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_*/
+#endif /*_ACTIVEMQ_WIREFORMAT_OPENWIRE_MARSHAL_PRIMITIVEMAPMARSHALLERTEST_H_*/

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-cpp/trunk/src/test/activemq/wireformat/openwire/marshal/PrimitiveMapMarshallerTest.h
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message