IO refactor phase 1. Reduced dependencies, removed redundant classes.

Renamed pricipal APR classes in preparation for move to apr namespace.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469625 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 4 insertions, 23 deletions

diff --git a/cpp/test/client/client_test.cpp b/cpp/test/client/client_test.cpp
index e1c7d56573..2a1f1a9747 100644
--- a/cpp/test/client/client_test.cpp
+++ b/cpp/test/client/client_test.cpp
@@ -22,7 +22,7 @@
 #include "qpid/client/Connection.h"
 #include "qpid/client/Message.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/concurrent/Monitor.h"
 #include "qpid/framing/FieldTable.h"
 
 using namespace qpid::client;
@@ -65,7 +65,7 @@ int main(int argc, char**)
 	std::cout << "Bound queue to exchange." << std::endl;
 
 	//set up a message listener
-	MonitorImpl monitor;
+	Monitor monitor;
 	SimpleListener listener(&monitor);
 	string tag("MyTag");
 	channel.consume(queue, tag, &listener);
diff --git a/cpp/test/client/topic_publisher.cpp b/cpp/test/client/topic_publisher.cpp
index 9652c6450f..e53b70cc75 100644
--- a/cpp/test/client/topic_publisher.cpp
+++ b/cpp/test/client/topic_publisher.cpp
@@ -21,7 +21,7 @@
 #include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/Queue.h"
-#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/concurrent/Monitor.h"
 #include "unistd.h"
 #include <apr-1/apr_time.h>
 #include <cstdlib>
@@ -34,7 +34,7 @@ class Publisher : public MessageListener{
     Channel* const channel;
     const std::string controlTopic;
     const bool transactional;
-    MonitorImpl monitor;
+    Monitor monitor;
     int count;
     
     void waitForCompletion(int msgs);
diff --git a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp b/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
index 1c24076ee3..7acee7c8b9 100644
--- a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
+++ b/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
@@ -28,8 +28,6 @@ class ConfigurationTest : public CppUnit::TestCase
     CPPUNIT_TEST(testIsHelp);
     CPPUNIT_TEST(testPortLongForm);
     CPPUNIT_TEST(testPortShortForm);
-    CPPUNIT_TEST(testAcceptorLongForm);
-    CPPUNIT_TEST(testAcceptorShortForm);
     CPPUNIT_TEST(testVarious);
     CPPUNIT_TEST_SUITE_END();
 
@@ -59,29 +57,12 @@ class ConfigurationTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL(6789, conf.getPort());
     }
 
-    void testAcceptorLongForm() 
-    {
-        Configuration conf;
-        char* argv[] = {"ignore", "--acceptor", "blocking"};
-        conf.parse(3, argv);
-        CPPUNIT_ASSERT_EQUAL(string("blocking"), conf.getAcceptor());
-    }
-
-    void testAcceptorShortForm() 
-    {
-        Configuration conf;
-        char* argv[] = {"ignore", "-a", "blocking"};
-        conf.parse(3, argv);
-        CPPUNIT_ASSERT_EQUAL(string("blocking"), conf.getAcceptor());
-    }
-
     void testVarious() 
     {
         Configuration conf;
         char* argv[] = {"ignore", "-t", "--worker-threads", "10", "-a", "blocking"};
         conf.parse(6, argv);
         CPPUNIT_ASSERT_EQUAL(5672, conf.getPort());//default
-        CPPUNIT_ASSERT_EQUAL(string("blocking"), conf.getAcceptor());
         CPPUNIT_ASSERT_EQUAL(10, conf.getWorkerThreads());
         CPPUNIT_ASSERT(conf.isTrace());
         CPPUNIT_ASSERT(!conf.isHelp());