Renamed the following files for consistency:

broker/BrokerExchange.cpp -> Exchange.cpp
broker/BrokerExchange.h -> Exchange.h
broker/BrokerQueue.cpp -> Queue.cpp
broker/BrokerQueue.h -> Queue.h
client/ClientChannel.cpp -> Channel.cpp
client/ClientChannel.h -> Channel.h
client/ClientConnection.cpp -> Connection.cpp
client/ClientExchange.cpp -> Exchange.cpp
client/ClientExchange.h -> Exchange.h
client/ClientMessage.h -> Message.h
client/ClientQueue.cpp -> Queue.cpp
client/ClientQueue.h -> Queue.h


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

16 files changed, 46 insertions, 46 deletions

diff --git a/cpp/src/tests/BasicP2PTest.h b/cpp/src/tests/BasicP2PTest.h
index b80fff1171..3f0a3704f5 100644
--- a/cpp/src/tests/BasicP2PTest.h
+++ b/cpp/src/tests/BasicP2PTest.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "SimpleTestCaseBase.h"
diff --git a/cpp/src/tests/BasicPubSubTest.h b/cpp/src/tests/BasicPubSubTest.h
index b7ccba1a81..c3f8020b3a 100644
--- a/cpp/src/tests/BasicPubSubTest.h
+++ b/cpp/src/tests/BasicPubSubTest.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "SimpleTestCaseBase.h"
diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp
index e975ec1b12..612a9fc8bc 100644
--- a/cpp/src/tests/BrokerChannelTest.cpp
+++ b/cpp/src/tests/BrokerChannelTest.cpp
@@ -24,7 +24,7 @@
 // which is no longer exposed on Session (part of SemanticHandler.)
 // 
 #include "qpid/broker/BrokerChannel.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/FanOutExchange.h"
 #include "qpid/broker/Message.h"
 #include "qpid/broker/MessageDelivery.h"
diff --git a/cpp/src/tests/ClientChannelTest.cpp b/cpp/src/tests/ClientChannelTest.cpp
index 252b419299..9a982508d1 100644
--- a/cpp/src/tests/ClientChannelTest.cpp
+++ b/cpp/src/tests/ClientChannelTest.cpp
@@ -21,10 +21,10 @@
 #include <vector>
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
-#include "qpid/client/ClientQueue.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/BasicMessageChannel.h"
 #include "qpid/client/MessageMessageChannel.h"
@@ -44,7 +44,7 @@ const size_t FRAME_MAX = 256;
  * The test base defines the tests methods, derived classes
  * instantiate the channel in Basic or Message mode.
  */
-class ClientChannelTestBase : public CppUnit::TestCase  
+class ChannelTestBase : public CppUnit::TestCase  
 {
     struct Listener: public qpid::client::MessageListener {
         vector<Message> messages;
@@ -68,7 +68,7 @@ class ClientChannelTestBase : public CppUnit::TestCase
 
   public:
 
-    ClientChannelTestBase()
+    ChannelTestBase()
         : connection(FRAME_MAX),
           qname("testq"), data("hello"),
           queue(qname, true), exchange("", Exchange::DIRECT_EXCHANGE)
@@ -188,8 +188,8 @@ class ClientChannelTestBase : public CppUnit::TestCase
     }
 };
 
-class BasicClientChannelTest : public ClientChannelTestBase {
-    CPPUNIT_TEST_SUITE(BasicClientChannelTest);
+class BasicChannelTest : public ChannelTestBase {
+    CPPUNIT_TEST_SUITE(BasicChannelTest);
     CPPUNIT_TEST(testPublishGet);
     CPPUNIT_TEST(testGetNoContent);
     CPPUNIT_TEST(testConsumeCancel);
@@ -199,24 +199,24 @@ class BasicClientChannelTest : public ClientChannelTestBase {
     CPPUNIT_TEST_SUITE_END();
 
   public:
-    BasicClientChannelTest(){
+    BasicChannelTest(){
         channel.reset(new Channel(false, 500, Channel::AMQP_08));
     }
 };
 
-class MessageClientChannelTest : public ClientChannelTestBase {
-    CPPUNIT_TEST_SUITE(MessageClientChannelTest);
+class MessageChannelTest : public ChannelTestBase {
+    CPPUNIT_TEST_SUITE(MessageChannelTest);
     CPPUNIT_TEST(testPublishGet);
     CPPUNIT_TEST(testGetNoContent);
     CPPUNIT_TEST(testGetFragmentedMessage);
     CPPUNIT_TEST_SUITE_END();
   public:
-    MessageClientChannelTest() {
+    MessageChannelTest() {
         channel.reset(new Channel(false, 500, Channel::AMQP_09));
     }
 };
 
 // Make this test suite a plugin.
 CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(BasicClientChannelTest);
-CPPUNIT_TEST_SUITE_REGISTRATION(MessageClientChannelTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(BasicChannelTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(MessageChannelTest);
diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index 59941864e2..35fc5e0bdb 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "qpid/Exception.h"
-#include "qpid/broker/BrokerExchange.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/DeliverableMessage.h"
 #include "qpid/broker/DirectExchange.h"
 #include "qpid/broker/ExchangeRegistry.h"
diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp
index 79df8eade2..5ca4e6c216 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/cpp/src/tests/FramingTest.cpp
@@ -20,8 +20,8 @@
  */
 #include "InProcessBroker.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientExchange.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/Queue.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/Connector.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index 29f0d17cef..f2f1b3bf84 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "qpid/Exception.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/Deliverable.h"
 #include "qpid/broker/ExchangeRegistry.h"
 #include "qpid/broker/QueueRegistry.h"
diff --git a/cpp/src/tests/SimpleTestCaseBase.h b/cpp/src/tests/SimpleTestCaseBase.h
index ee1742a7f7..7f94fa7e1c 100644
--- a/cpp/src/tests/SimpleTestCaseBase.h
+++ b/cpp/src/tests/SimpleTestCaseBase.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "TestCase.h"
diff --git a/cpp/src/tests/TestCase.h b/cpp/src/tests/TestCase.h
index 71e1d1118c..07bdd68933 100644
--- a/cpp/src/tests/TestCase.h
+++ b/cpp/src/tests/TestCase.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 #include "TestOptions.h"
 
 
diff --git a/cpp/src/tests/client_test.cpp b/cpp/src/tests/client_test.cpp
index 4903312cd7..8cf43ce069 100644
--- a/cpp/src/tests/client_test.cpp
+++ b/cpp/src/tests/client_test.cpp
@@ -30,9 +30,9 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Time.h"
diff --git a/cpp/src/tests/echo_service.cpp b/cpp/src/tests/echo_service.cpp
index c4f1f0477a..7989ec8543 100644
--- a/cpp/src/tests/echo_service.cpp
+++ b/cpp/src/tests/echo_service.cpp
@@ -28,11 +28,11 @@
  */
 
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp
index fffae796dd..3feef7e876 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/cpp/src/tests/exception_test.cpp
@@ -23,9 +23,9 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 
 using namespace qpid::client;
 using namespace qpid::sys;
diff --git a/cpp/src/tests/interop_runner.cpp b/cpp/src/tests/interop_runner.cpp
index 1b87512857..5bfe88662a 100644
--- a/cpp/src/tests/interop_runner.cpp
+++ b/cpp/src/tests/interop_runner.cpp
@@ -22,11 +22,11 @@
 #include "qpid/Options.h"
 #include "qpid/Exception.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp
index 38882f19c3..9d5ea593fe 100644
--- a/cpp/src/tests/perftest.cpp
+++ b/cpp/src/tests/perftest.cpp
@@ -21,9 +21,9 @@
 
 #include "TestOptions.h"
 
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientExchange.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/Queue.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/QpidError.h"
diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp
index 38f5c76f54..d19b8f8b19 100644
--- a/cpp/src/tests/topic_listener.cpp
+++ b/cpp/src/tests/topic_listener.cpp
@@ -34,11 +34,11 @@
 
 #include "qpid/QpidError.h"
 #include "TestOptions.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
diff --git a/cpp/src/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp
index 5800f9225d..74fcf8b057 100644
--- a/cpp/src/tests/topic_publisher.cpp
+++ b/cpp/src/tests/topic_publisher.cpp
@@ -36,11 +36,11 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"