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

1 files changed, 0 insertions, 192 deletions

diff --git a/cpp/src/qpid/broker/BrokerQueue.h b/cpp/src/qpid/broker/BrokerQueue.h
deleted file mode 100644
index 4b6070d11c..0000000000
--- a/cpp/src/qpid/broker/BrokerQueue.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef _broker_BrokerQueue_h
-#define _broker_BrokerQueue_h
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include <vector>
-#include <memory>
-#include <deque>
-#include <boost/shared_ptr.hpp>
-#include "qpid/framing/amqp_types.h"
-#include "ConnectionToken.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/sys/Serializer.h"
-#include "qpid/sys/Monitor.h"
-#include "PersistableQueue.h"
-#include "QueuePolicy.h"
-#include "QueueBindings.h"
-
-// TODO aconway 2007-02-06: Use auto_ptr and boost::ptr_vector to
-// enforce ownership of Consumers.
-
-namespace qpid {
-    namespace broker {
-        class MessageStore;
-        class QueueRegistry;
-        class TransactionContext;
-        class Exchange;
-
-        using std::string;
-
-        /**
-         * The brokers representation of an amqp queue. Messages are
-         * delivered to a queue from where they can be dispatched to
-         * registered consumers or be stored until dequeued or until one
-         * or more consumers registers.
-         */
-        class Queue : public PersistableQueue{
-            typedef std::vector<Consumer*> Consumers;
-            typedef std::deque<QueuedMessage> Messages;
-            
-            struct DispatchFunctor {
-                Queue& queue;
-                DispatchFunctor(Queue& q) : queue(q) {}
-                void operator()() { queue.dispatch(); }
-            };
-                
-            const string name;
-            const bool autodelete;
-            MessageStore* const store;
-            const ConnectionToken* const owner;
-            Consumers acquirers;
-            Consumers browsers;
-            Messages messages;
-            int next;
-            mutable qpid::sys::RWlock consumerLock;
-            mutable qpid::sys::Mutex messageLock;
-            Consumer* exclusive;
-            mutable uint64_t persistenceId;
-            framing::FieldTable settings;
-            std::auto_ptr<QueuePolicy> policy;            
-            QueueBindings bindings;
-            boost::shared_ptr<Exchange> alternateExchange;
-            qpid::sys::Serializer<DispatchFunctor> serializer;
-            DispatchFunctor dispatchCallback;
-            framing::SequenceNumber sequence;
-
-            void pop();
-            void push(Message::shared_ptr& msg);
-            bool dispatch(QueuedMessage& msg);
-            void setPolicy(std::auto_ptr<QueuePolicy> policy);
-            /**
-             * only called by serilizer
-	     */
-            void dispatch();
-            void cancel(Consumer* c, Consumers& set);
-            void serviceBrowser(Consumer* c);
- 
-        protected:
-	   /**
-	   * Call back from store
-	   */
-  	   virtual void notifyDurableIOComplete();
-
-        public:
-            
-            typedef boost::shared_ptr<Queue> shared_ptr;
-
-            typedef std::vector<shared_ptr> vector;
-	    
-            Queue(const string& name, bool autodelete = false, 
-                  MessageStore* const store = 0, 
-                  const ConnectionToken* const owner = 0);
-            ~Queue();
-
-            void create(const qpid::framing::FieldTable& settings);
-            void configure(const qpid::framing::FieldTable& settings);
-            void destroy();
-            void bound(const string& exchange, const string& key, const qpid::framing::FieldTable& args);
-            void unbind(ExchangeRegistry& exchanges, Queue::shared_ptr shared_ref);
-
-            bool acquire(const QueuedMessage& msg);
-
-            /**
-             * Delivers a message to the queue. Will record it as
-             * enqueued if persistent then process it.
-             */
-            void deliver(Message::shared_ptr& msg);
-            /**
-             * Dispatches the messages immediately to a consumer if
-             * one is available or stores it for later if not.
-             */
-            void process(Message::shared_ptr& msg);
-            /**
-             * Returns a message to the in-memory queue (due to lack
-             * of acknowledegement from a receiver). If a consumer is
-             * available it will be dispatched immediately, else it
-             * will be returned to the front of the queue.
-             */
-            void requeue(const QueuedMessage& msg);
-            /**
-             * Used during recovery to add stored messages back to the queue
-             */
-            void recover(Message::shared_ptr& msg);
-            /**
-             * Request dispatch any queued messages providing there are
-             * consumers for them. Only one thread can be dispatching
-             * at any time, so this call schedules the despatch based on
-	     * the serilizer policy.
-             */
-            void requestDispatch(Consumer* c = 0, bool sync = false);
-            void consume(Consumer* c, bool exclusive = false);
-            void cancel(Consumer* c);
-            uint32_t purge();
-            uint32_t getMessageCount() const;
-            uint32_t getConsumerCount() const;
-            inline const string& getName() const { return name; }
-            inline const bool isExclusiveOwner(const ConnectionToken* const o) const { return o == owner; }
-            inline bool hasExclusiveConsumer() const { return exclusive; }
-            inline bool hasExclusiveOwner() const { return owner != 0; }
-            inline bool isDurable() const { return store != 0; }
-            inline const framing::FieldTable& getSettings() const { return settings; }
-            inline bool isAutoDelete() const { return autodelete; }
-            bool canAutoDelete() const;
-
-            bool enqueue(TransactionContext* ctxt, Message::shared_ptr& msg);
-            /**
-             * dequeue from store (only done once messages is acknowledged)
-             */
-            bool dequeue(TransactionContext* ctxt, Message::shared_ptr& msg);
-            /**
-             * dequeues from memory only
-             */
-            QueuedMessage dequeue();
-
-            const QueuePolicy* const getPolicy();
-
-            void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
-            boost::shared_ptr<Exchange> getAlternateExchange();
-
-            //PersistableQueue support:
-            uint64_t getPersistenceId() const;
-            void setPersistenceId(uint64_t persistenceId) const;
-            void encode(framing::Buffer& buffer) const;
-            uint32_t encodedSize() const;
-
-            static Queue::shared_ptr decode(QueueRegistry& queues, framing::Buffer& buffer);
-        };
-    }
-}
-
-
-#endif  /*!_broker_BrokerQueue_h*/