qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r579340 - in /incubator/qpid/trunk/qpid/cpp: examples/ src/ src/qpid/broker/ src/qpid/client/ src/tests/
Date Tue, 25 Sep 2007 18:16:08 GMT
Author: aconway
Date: Tue Sep 25 11:16:02 2007
New Revision: 579340

URL: http://svn.apache.org/viewvc?rev=579340&view=rev
Log:
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

Added:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.h
      - copied unchanged from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h
      - copied, changed from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.h
Removed:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.h
Modified:
    incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp
    incubator/qpid/trunk/qpid/cpp/examples/topic_listener.cpp
    incubator/qpid/trunk/qpid/cpp/examples/topic_publisher.cpp
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h
    incubator/qpid/trunk/qpid/cpp/src/tests/BasicP2PTest.h
    incubator/qpid/trunk/qpid/cpp/src/tests/BasicPubSubTest.h
    incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/SimpleTestCaseBase.h
    incubator/qpid/trunk/qpid/cpp/src/tests/TestCase.h
    incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/exception_test.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/interop_runner.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp

Modified: incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/create_queue.cpp Tue Sep 25 11:16:02 2007
@@ -35,11 +35,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/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"

Modified: incubator/qpid/trunk/qpid/cpp/examples/topic_listener.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/topic_listener.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/topic_listener.cpp Tue Sep 25 11:16:02 2007
@@ -35,11 +35,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/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"

Modified: incubator/qpid/trunk/qpid/cpp/examples/topic_publisher.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/topic_publisher.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/topic_publisher.cpp Tue Sep 25 11:16:02 2007
@@ -35,11 +35,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/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Sep 25 11:16:02 2007
@@ -140,8 +140,8 @@
   qpid/broker/Broker.cpp \
   qpid/broker/BrokerAdapter.cpp \
   qpid/broker/BrokerSingleton.cpp \
-  qpid/broker/BrokerExchange.cpp \
-  qpid/broker/BrokerQueue.cpp \
+  qpid/broker/Exchange.cpp \
+  qpid/broker/Queue.cpp \
   qpid/broker/Connection.cpp \
   qpid/broker/ConnectionHandler.cpp \
   qpid/broker/ConnectionFactory.cpp \
@@ -191,10 +191,10 @@
 libqpidclient_la_LIBADD = libqpidcommon.la
 libqpidclient_la_SOURCES =			\
   $(rgen_client_cpp) 				\
-  qpid/client/ClientConnection.cpp		\
-  qpid/client/ClientChannel.cpp			\
-  qpid/client/ClientExchange.cpp		\
-  qpid/client/ClientQueue.cpp			\
+  qpid/client/Connection.cpp		\
+  qpid/client/Channel.cpp			\
+  qpid/client/Exchange.cpp		\
+  qpid/client/Queue.cpp			\
   qpid/client/ConnectionImpl.cpp		\
   qpid/client/Connector.cpp			\
   qpid/client/Demux.cpp				\
@@ -225,8 +225,8 @@
   qpid/shared_ptr.h \
   qpid/broker/Broker.h \
   qpid/broker/BrokerAdapter.h \
-  qpid/broker/BrokerExchange.h \
-  qpid/broker/BrokerQueue.h \
+  qpid/broker/Exchange.h \
+  qpid/broker/Queue.h \
   qpid/broker/BrokerSingleton.h \
   qpid/broker/Connection.h \
   qpid/broker/ConnectionFactory.h \
@@ -288,10 +288,10 @@
   qpid/client/AckMode.h \
   qpid/client/BlockingQueue.h \
   qpid/client/ChainableFrameHandler.h	\
-  qpid/client/ClientChannel.h \
-  qpid/client/ClientExchange.h \
-  qpid/client/ClientMessage.h \
-  qpid/client/ClientQueue.h \
+  qpid/client/Channel.h \
+  qpid/client/Exchange.h \
+  qpid/client/Message.h \
+  qpid/client/Queue.h \
   qpid/client/Completion.h \
   qpid/client/CompletionTracker.h \
   qpid/client/Connection.h \

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h Tue Sep 25 11:16:02 2007
@@ -21,7 +21,7 @@
 #ifndef _Deliverable_
 #define _Deliverable_
 
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
     namespace broker {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h Tue Sep 25 11:16:02 2007
@@ -22,7 +22,7 @@
 #define _DeliverableMessage_
 
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Message.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp Tue Sep 25 11:16:02 2007
@@ -21,7 +21,7 @@
 #include "DeliveryRecord.h"
 #include "DeliverableMessage.h"
 #include "SemanticState.h"
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/log/Statement.h"
 
 using namespace qpid::broker;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h Tue Sep 25 11:16:02 2007
@@ -26,7 +26,7 @@
 #include <vector>
 #include <ostream>
 #include "qpid/framing/AccumulatedAck.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Consumer.h"
 #include "DeliveryId.h"
 #include "Message.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h Tue Sep 25 11:16:02 2007
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.cpp Tue Sep 25 11:16:02 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "ExchangeRegistry.h"
 
 using namespace qpid::broker;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Tue Sep 25 11:16:02 2007
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerExchange_h
-#define _broker_BrokerExchange_h
+#ifndef _broker_Exchange_h
+#define _broker_Exchange_h
 
 /*
  *
@@ -24,7 +24,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "MessageStore.h"
 #include "PersistableExchange.h"
 #include "qpid/framing/FieldTable.h"
@@ -80,4 +80,4 @@
 }
 
 
-#endif  /*!_broker_BrokerExchange_h*/
+#endif  /*!_broker_Exchange.cpp_h*/

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Tue Sep 25 11:16:02 2007
@@ -23,7 +23,7 @@
  */
 
 #include <map>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "MessageStore.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h Tue Sep 25 11:16:02 2007
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Tue Sep 25 11:16:02 2007
@@ -22,10 +22,10 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageDelivery.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageDelivery.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageDelivery.cpp Tue Sep 25 11:16:02 2007
@@ -22,7 +22,7 @@
 
 #include "DeliveryToken.h"
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/BasicDeliverBody.h"
 #include "qpid/framing/BasicGetOkBody.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Tue Sep 25 11:16:02 2007
@@ -22,7 +22,7 @@
 #define _MessageStoreModule_
 
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveryManager.h"
 #include "qpid/sys/Module.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Tue Sep 25 11:16:02 2007
@@ -23,7 +23,7 @@
 
 #include <set>
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Tue Sep 25 11:16:02 2007
@@ -22,8 +22,8 @@
 #include <boost/format.hpp>
 
 #include "qpid/log/Statement.h"
-#include "BrokerQueue.h"
-#include "BrokerExchange.h"
+#include "Queue.h"
+#include "Exchange.h"
 #include "DeliverableMessage.h"
 #include "MessageStore.h"
 #include "qpid/sys/Monitor.h"

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Tue Sep 25 11:16:02 2007
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerQueue_h
-#define _broker_BrokerQueue_h
+#ifndef _broker_Queue_h
+#define _broker_Queue_h
 
 /*
  *
@@ -189,4 +189,4 @@
 }
 
 
-#endif  /*!_broker_BrokerQueue_h*/
+#endif  /*!_broker_Queue_h*/

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h Tue Sep 25 11:16:02 2007
@@ -23,7 +23,7 @@
 
 #include <map>
 #include "qpid/sys/Mutex.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h Tue Sep 25 11:16:02 2007
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h Tue Sep 25 11:16:02 2007
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Tue Sep 25 11:16:02 2007
@@ -21,7 +21,7 @@
 #include "RecoveryManagerImpl.h"
 
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveredEnqueue.h"
 #include "RecoveredDequeue.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Tue Sep 25 11:16:02 2007
@@ -21,7 +21,7 @@
 
 #include "SessionState.h"
 #include "BrokerAdapter.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Connection.h"
 #include "DeliverableMessage.h"
 #include "DtxAck.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Tue Sep 25 11:16:02 2007
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h Tue Sep 25 11:16:02 2007
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp Tue Sep 25 11:16:02 2007
@@ -21,9 +21,9 @@
 #include "qpid/log/Statement.h"
 #include <iostream>
 #include <sstream>
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "qpid/sys/Monitor.h"
-#include "ClientMessage.h"
+#include "Message.h"
 #include "qpid/QpidError.h"
 #include "Connection.h"
 #include "Demux.h"

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h Tue Sep 25 11:16:02 2007
@@ -1,5 +1,5 @@
-#ifndef _client_ClientChannel_h
-#define _client_ClientChannel_h
+#ifndef _client_Channel_h
+#define _client_Channel_h
 
 /*
  *
@@ -25,9 +25,9 @@
 #include <boost/scoped_ptr.hpp>
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/Uuid.h"
-#include "ClientExchange.h"
-#include "ClientMessage.h"
-#include "ClientQueue.h"
+#include "Exchange.h"
+#include "Message.h"
+#include "Queue.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/Exception.h"
@@ -313,4 +313,4 @@
 
 }}
 
-#endif  /*!_client_ClientChannel_h*/
+#endif  /*!_client_Channel_h*/

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Tue Sep 25 11:16:02 2007
@@ -23,8 +23,8 @@
 #include <boost/bind.hpp>
 
 #include "Connection.h"
-#include "ClientChannel.h"
-#include "ClientMessage.h"
+#include "Channel.h"
+#include "Message.h"
 #include "ScopedAssociation.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Tue Sep 25 11:16:02 2007
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 #include "qpid/QpidError.h"
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/framing/AMQP_HighestVersion.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Tue Sep 25 11:16:02 2007
@@ -25,7 +25,7 @@
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/log/Statement.h"
 #include "BlockingQueue.h"
-#include "ClientMessage.h"
+#include "Message.h"
 
 using qpid::framing::FrameSet;
 using qpid::framing::MessageTransferBody;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp Tue Sep 25 11:16:02 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientExchange.h"
+#include "Exchange.h"
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h Tue Sep 25 11:16:02 2007
@@ -1,5 +1,5 @@
-#ifndef _client_ClientMessage_h
-#define _client_ClientMessage_h
+#ifndef _client_Message_h
+#define _client_Message_h
 
 /*
  *
@@ -83,4 +83,4 @@
 
 }}
 
-#endif  /*!_client_ClientMessage_h*/
+#endif  /*!_client_Message_h*/

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h Tue Sep 25 11:16:02 2007
@@ -23,7 +23,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "ClientMessage.h"
+#include "Message.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.cpp&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp Tue Sep 25 11:16:02 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientQueue.h"
+#include "Queue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true), durable(false){}
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h (from r579307, incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.h&r1=579307&r2=579340&rev=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h Tue Sep 25 11:16:02 2007
@@ -1,5 +1,5 @@
-#ifndef _client_ClientQueue_h
-#define _client_ClientQueue_h
+#ifndef _client_Queue_h
+#define _client_Queue_h
 
 /*
  *
@@ -100,4 +100,4 @@
 }
 }
 
-#endif  /*!_client_ClientQueue_h*/
+#endif  /*!_client_Queue_h*/

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/BasicP2PTest.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/BasicP2PTest.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BasicP2PTest.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BasicP2PTest.h Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/BasicPubSubTest.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/BasicPubSubTest.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BasicPubSubTest.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BasicPubSubTest.h Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp Tue Sep 25 11:16:02 2007
@@ -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 @@
  * 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 @@
 
   public:
 
-    ClientChannelTestBase()
+    ChannelTestBase()
         : connection(FRAME_MAX),
           qname("testq"), data("hello"),
           queue(qname, true), exchange("", Exchange::DIRECT_EXCHANGE)
@@ -188,8 +188,8 @@
     }
 };
 
-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 @@
     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);

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/SimpleTestCaseBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/SimpleTestCaseBase.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/SimpleTestCaseBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/SimpleTestCaseBase.h Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TestCase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TestCase.h?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TestCase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TestCase.h Tue Sep 25 11:16:02 2007
@@ -21,7 +21,7 @@
  *
  */
 
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 #include "TestOptions.h"
 
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp Tue Sep 25 11:16:02 2007
@@ -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>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/exception_test.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/exception_test.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/exception_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/exception_test.cpp Tue Sep 25 11:16:02 2007
@@ -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;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/interop_runner.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/interop_runner.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/interop_runner.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/interop_runner.cpp Tue Sep 25 11:16:02 2007
@@ -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>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp Tue Sep 25 11:16:02 2007
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp Tue Sep 25 11:16:02 2007
@@ -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>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp?rev=579340&r1=579339&r2=579340&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp Tue Sep 25 11:16:02 2007
@@ -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"



Mime
View raw message