Fix for the most disruptive items in QPID-243.

* All #include lines now use '""' rather than '<>' where appropriate.
* #include lines within the qpid project use relative includes so that
  the same path will work in /usr/include when installed as part of the
  client libraries.
* All the source code has now been rearranged to be under src in a directory
  analogous to the namespace of the classes in it.


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

1 files changed, 0 insertions, 159 deletions

diff --git a/cpp/lib/broker/BrokerChannel.h b/cpp/lib/broker/BrokerChannel.h
deleted file mode 100644
index 5085783685..0000000000
--- a/cpp/lib/broker/BrokerChannel.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifndef _broker_BrokerChannel_h
-#define _broker_BrokerChannel_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 <list>
-
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_map.hpp>
-
-#include <AccumulatedAck.h>
-#include <Consumer.h>
-#include <DeliveryRecord.h>
-#include <MessageBuilder.h>
-#include <NameGenerator.h>
-#include <Prefetch.h>
-#include <TxBuffer.h>
-#include "framing/ChannelAdapter.h"
-#include "ChannelOpenBody.h"
-#include "CompletionHandler.h"
-
-namespace qpid {
-namespace broker {
-
-class ConnectionToken;
-class Connection;
-class Queue;
-class BrokerAdapter;
-
-using framing::string;
-
-/**
- * Maintains state for an AMQP channel. Handles incoming and
- * outgoing messages for that channel.
- */
-class Channel : public framing::ChannelAdapter,
-                public CompletionHandler
-{
-    class ConsumerImpl : public Consumer
-    {
-        Channel* parent;
-        const string tag;
-        Queue::shared_ptr queue;
-        ConnectionToken* const connection;
-        const bool ackExpected;
-        bool blocked;
-
-      public:
-        ConsumerImpl(Channel* parent, const string& tag,
-                     Queue::shared_ptr queue,
-                     ConnectionToken* const connection, bool ack);
-        ~ConsumerImpl();
-        virtual bool deliver(Message::shared_ptr& msg);            
-        void cancel();
-        void requestDispatch();
-    };
-
-    typedef boost::ptr_map<string,ConsumerImpl> ConsumerImplMap;
-
-    Connection& connection;
-    uint64_t currentDeliveryTag;
-    Queue::shared_ptr defaultQueue;
-    bool transactional;
-    ConsumerImplMap consumers;
-    uint32_t prefetchSize;    
-    uint16_t prefetchCount;    
-    Prefetch outstanding;
-    uint32_t framesize;
-    NameGenerator tagGenerator;
-    std::list<DeliveryRecord> unacked;
-    sys::Mutex deliveryLock;
-    TxBuffer txBuffer;
-    AccumulatedAck accumulatedAck;
-    MessageStore* const store;
-    MessageBuilder messageBuilder;//builder for in-progress message
-    bool opened;
-    boost::scoped_ptr<BrokerAdapter> adapter;
-
-	// completion handler for MessageBuilder
-    void complete(Message::shared_ptr msg);
-    
-    void deliver(Message::shared_ptr& msg, const string& tag,
-                 Queue::shared_ptr& queue, bool ackExpected);            
-    bool checkPrefetch(Message::shared_ptr& msg);
-        
-  public:
-    Channel(Connection& parent,
-            framing::ChannelId id,
-            uint32_t framesize, 
-            MessageStore* const _store = 0,
-            uint64_t stagingThreshold = 0);
-    
-    ~Channel();
-
-    bool isOpen() const { return opened; }
-    BrokerAdapter& getAdatper() { return *adapter; }
-    
-    void open() { opened = true; }
-    void setDefaultQueue(Queue::shared_ptr queue){ defaultQueue = queue; }
-    Queue::shared_ptr getDefaultQueue() const { return defaultQueue; }
-    uint32_t setPrefetchSize(uint32_t size){ return prefetchSize = size; }
-    uint16_t setPrefetchCount(uint16_t n){ return prefetchCount = n; }
-
-    bool exists(const string& consumerTag);
-
-    /**
-     *@param tagInOut - if empty it is updated with the generated token.
-     */
-    void consume(string& tagInOut, Queue::shared_ptr queue, bool acks,
-                 bool exclusive, ConnectionToken* const connection = 0,
-                 const framing::FieldTable* = 0);
-    void cancel(const string& tag);
-    bool get(Queue::shared_ptr queue, const std::string& destination, bool ackExpected);
-    void begin();
-    void close();
-    void commit();
-    void rollback();
-    void ack();
-    void ack(uint64_t deliveryTag, bool multiple);
-    void ack(uint64_t deliveryTag, uint64_t endTag);
-    void recover(bool requeue);
-    void deliver(Message::shared_ptr& msg, const string& consumerTag, uint64_t deliveryTag);            
-    void handlePublish(Message* msg);
-    void handleHeader(boost::shared_ptr<framing::AMQHeaderBody>);
-    void handleContent(boost::shared_ptr<framing::AMQContentBody>);
-    void handleHeartbeat(boost::shared_ptr<framing::AMQHeartbeatBody>);
-    
-    void handleInlineTransfer(Message::shared_ptr msg);
-    
-    // For ChannelAdapter
-    void handleMethodInContext(
-        boost::shared_ptr<framing::AMQMethodBody> method,
-        const framing::MethodContext& context);
-};
-
-}} // namespace broker
-
-
-#endif  /*!_broker_BrokerChannel_h*/