Build system reorg, see README and Makefile comments for details.

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

9 files changed, 0 insertions, 599 deletions

diff --git a/cpp/client/inc/Channel.h b/cpp/client/inc/Channel.h
deleted file mode 100644
index debecf922e..0000000000
--- a/cpp/client/inc/Channel.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <map>
-#include <string>
-#include <queue>
-#include "sys/types.h"
-
-#ifndef _Channel_
-#define _Channel_
-
-#include "amqp_framing.h"
-
-#include "ThreadFactory.h"
-
-#include "Connection.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
-#include "ReturnedMessageHandler.h"
-
-namespace qpid {
-namespace client {
-    enum ack_modes {NO_ACK=0, AUTO_ACK=1, LAZY_ACK=2, CLIENT_ACK=3};
-
-    class Channel : private virtual qpid::framing::BodyHandler, public virtual qpid::concurrent::Runnable{
-        struct Consumer{
-            MessageListener* listener;
-            int ackMode;
-            int count;
-            u_int64_t lastDeliveryTag;
-        };
-        typedef std::map<string,Consumer*>::iterator consumer_iterator; 
-
-	u_int16_t id;
-	Connection* con;
-	qpid::concurrent::ThreadFactory* threadFactory;
-	qpid::concurrent::Thread* dispatcher;
-	qpid::framing::OutputHandler* out;
-	IncomingMessage* incoming;
-	ResponseHandler responses;
-	std::queue<IncomingMessage*> messages;//holds returned messages or those delivered for a consume
-	IncomingMessage* retrieved;//holds response to basic.get
-	qpid::concurrent::Monitor* dispatchMonitor;
-	qpid::concurrent::Monitor* retrievalMonitor;
-	std::map<std::string, Consumer*> consumers;
-	ReturnedMessageHandler* returnsHandler;
-	bool closed;
-
-        u_int16_t prefetch;
-        const bool transactional;
-
-	void enqueue();
-	void retrieve(Message& msg);
-	IncomingMessage* dequeue();
-	void dispatch();
-	void stop();
-	void sendAndReceive(qpid::framing::AMQFrame* frame, const qpid::framing::AMQMethodBody& body);            
-        void deliver(Consumer* consumer, Message& msg);
-        void setQos();
-	void cancelAll();
-
-	virtual void handleMethod(qpid::framing::AMQMethodBody::shared_ptr body);
-	virtual void handleHeader(qpid::framing::AMQHeaderBody::shared_ptr body);
-	virtual void handleContent(qpid::framing::AMQContentBody::shared_ptr body);
-	virtual void handleHeartbeat(qpid::framing::AMQHeartbeatBody::shared_ptr body);
-
-    public:
-	Channel(bool transactional = false, u_int16_t prefetch = 500);
-	~Channel();
-
-	void declareExchange(Exchange& exchange, bool synch = true);
-	void deleteExchange(Exchange& exchange, bool synch = true);
-	void declareQueue(Queue& queue, bool synch = true);
-	void deleteQueue(Queue& queue, bool ifunused = false, bool ifempty = false, bool synch = true);
-	void bind(const Exchange& exchange, const Queue& queue, const std::string& key, 
-                  const qpid::framing::FieldTable& args, bool synch = true);
-        void consume(Queue& queue, std::string& tag, MessageListener* listener, 
-                     int ackMode = NO_ACK, bool noLocal = false, bool synch = true);
-	void cancel(std::string& tag, bool synch = true);
-        bool get(Message& msg, const Queue& queue, int ackMode = NO_ACK);
-        void publish(Message& msg, const Exchange& exchange, const std::string& routingKey, 
-                     bool mandatory = false, bool immediate = false);
-
-        void commit();
-        void rollback();
-
-        void setPrefetch(u_int16_t prefetch);
-
-	/**
-	 * Start message dispatching on a new thread
-	 */
-	void start();
-	/**
-	 * Do message dispatching on this thread
-	 */
-	void run();
-
-        void close();
-
-	void setReturnedMessageHandler(ReturnedMessageHandler* handler);
-
-        friend class Connection;
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/Connection.h b/cpp/client/inc/Connection.h
deleted file mode 100644
index 89169e92b1..0000000000
--- a/cpp/client/inc/Connection.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <map>
-#include <string>
-
-#ifndef _Connection_
-#define _Connection_
-
-#include "QpidError.h"
-#include "Connector.h"
-#include "ShutdownHandler.h"
-#include "TimeoutHandler.h"
-
-#include "amqp_framing.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
-
-namespace qpid {
-namespace client {
-
-    class Channel;
-
-    class Connection : public virtual qpid::framing::InputHandler, 
-        public virtual qpid::io::TimeoutHandler, 
-        public virtual qpid::io::ShutdownHandler, 
-        private virtual qpid::framing::BodyHandler{
-
-        typedef std::map<int, Channel*>::iterator iterator;
-
-	static u_int16_t channelIdCounter;
-
-	std::string host;
-	int port;
-	const u_int32_t max_frame_size;
-	std::map<int, Channel*> channels; 
-	qpid::io::Connector* connector;
-	qpid::framing::OutputHandler* out;
-	ResponseHandler responses;
-        volatile bool closed;
-
-        void channelException(Channel* channel, qpid::framing::AMQMethodBody* body, QpidError& e);
-        void error(int code, const string& msg, int classid = 0, int methodid = 0);
-        void closeChannel(Channel* channel, u_int16_t code, string& text, u_int16_t classId = 0, u_int16_t methodId = 0);
-	void sendAndReceive(qpid::framing::AMQFrame* frame, const qpid::framing::AMQMethodBody& body);
-
-	virtual void handleMethod(qpid::framing::AMQMethodBody::shared_ptr body);
-	virtual void handleHeader(qpid::framing::AMQHeaderBody::shared_ptr body);
-	virtual void handleContent(qpid::framing::AMQContentBody::shared_ptr body);
-	virtual void handleHeartbeat(qpid::framing::AMQHeartbeatBody::shared_ptr body);
-
-    public:
-
-	Connection(bool debug = false, u_int32_t max_frame_size = 65536);
-	~Connection();
-        void open(const std::string& host, int port = 5672, 
-                  const std::string& uid = "guest", const std::string& pwd = "guest", 
-                  const std::string& virtualhost = "/");
-        void close();
-	void openChannel(Channel* channel);
-	/*
-         * Requests that the server close this channel, then removes
-         * the association to the channel from this connection
-         */
-	void closeChannel(Channel* channel);
-	/*
-         * Removes the channel from association with this connection,
-	 * without sending a close request to the server.
-         */
-	void removeChannel(Channel* channel);
-
-	virtual void received(qpid::framing::AMQFrame* frame);
-
-	virtual void idleOut();
-	virtual void idleIn();
-
-	virtual void shutdown();
-
-	inline u_int32_t getMaxFrameSize(){ return max_frame_size; }
-    };
-
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/Exchange.h b/cpp/client/inc/Exchange.h
deleted file mode 100644
index 66593a41cc..0000000000
--- a/cpp/client/inc/Exchange.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-
-#ifndef _Exchange_
-#define _Exchange_
-
-namespace qpid {
-namespace client {
-
-    class Exchange{
-	const std::string name;
-	const std::string type;
-
-    public:
-
-	static const std::string DIRECT_EXCHANGE;
-	static const std::string TOPIC_EXCHANGE;
-	static const std::string HEADERS_EXCHANGE;
-
-	static const Exchange DEFAULT_DIRECT_EXCHANGE;
-	static const Exchange DEFAULT_TOPIC_EXCHANGE;
-	static const Exchange DEFAULT_HEADERS_EXCHANGE;
-
-	Exchange(std::string name, std::string type = DIRECT_EXCHANGE);
-	const std::string& getName() const;
-	const std::string& getType() const;
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/IncomingMessage.h b/cpp/client/inc/IncomingMessage.h
deleted file mode 100644
index 90fed17ee0..0000000000
--- a/cpp/client/inc/IncomingMessage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-#include <vector>
-#include "amqp_framing.h"
-
-#ifndef _IncomingMessage_
-#define _IncomingMessage_
-
-#include "Message.h"
-
-namespace qpid {
-namespace client {
-
-    class IncomingMessage{
-        //content will be preceded by one of these method frames
-	qpid::framing::BasicDeliverBody::shared_ptr delivered;
-	qpid::framing::BasicReturnBody::shared_ptr returned;
-	qpid::framing::BasicGetOkBody::shared_ptr response;
-	qpid::framing::AMQHeaderBody::shared_ptr header;
-	std::vector<qpid::framing::AMQContentBody::shared_ptr> content;
-
-	u_int64_t contentSize();
-    public:
-	IncomingMessage(qpid::framing::BasicDeliverBody::shared_ptr intro);
-	IncomingMessage(qpid::framing::BasicReturnBody::shared_ptr intro);
-	IncomingMessage(qpid::framing::BasicGetOkBody::shared_ptr intro);
-        ~IncomingMessage();
-	void setHeader(qpid::framing::AMQHeaderBody::shared_ptr header);
-	void addContent(qpid::framing::AMQContentBody::shared_ptr content);
-	bool isComplete();
-	bool isReturn();
-	bool isDelivery();
-	bool isResponse();
-	const string& getConsumerTag();//only relevant if isDelivery()
-	qpid::framing::AMQHeaderBody::shared_ptr& getHeader();
-        u_int64_t getDeliveryTag();
-	void getData(string& data);
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/Message.h b/cpp/client/inc/Message.h
deleted file mode 100644
index fc3ec34bcf..0000000000
--- a/cpp/client/inc/Message.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-#include "amqp_framing.h"
-
-#ifndef _Message_
-#define _Message_
-
-
-namespace qpid {
-namespace client {
-
-    class Message{
-	qpid::framing::AMQHeaderBody::shared_ptr header;
-	string data;
-	bool redelivered;
-        u_int64_t deliveryTag;
-
-        qpid::framing::BasicHeaderProperties* getHeaderProperties();
-	Message(qpid::framing::AMQHeaderBody::shared_ptr& header);
-    public:
-	Message();
-	~Message();
-	
-	inline std::string getData(){ return data; }
-	inline void setData(const std::string& _data){ data = _data; }
-
-	inline bool isRedelivered(){ return redelivered; }
-	inline void setRedelivered(bool _redelivered){  redelivered = _redelivered; }
-
-        inline u_int64_t getDeliveryTag(){ return deliveryTag; }
-
-        std::string& getContentType();
-        std::string& getContentEncoding();
-        qpid::framing::FieldTable& getHeaders();
-        u_int8_t getDeliveryMode();
-        u_int8_t getPriority();
-        std::string& getCorrelationId();
-        std::string& getReplyTo();
-        std::string& getExpiration();
-        std::string& getMessageId();
-        u_int64_t getTimestamp();
-        std::string& getType();
-        std::string& getUserId();
-        std::string& getAppId();
-        std::string& getClusterId();
-
-	void setContentType(std::string& type);
-	void setContentEncoding(std::string& encoding);
-	void setHeaders(qpid::framing::FieldTable& headers);
-	void setDeliveryMode(u_int8_t mode);
-	void setPriority(u_int8_t priority);
-	void setCorrelationId(std::string& correlationId);
-	void setReplyTo(std::string& replyTo);
-	void setExpiration(std::string&  expiration);
-	void setMessageId(std::string& messageId);
-	void setTimestamp(u_int64_t timestamp);
-	void setType(std::string& type);
-	void setUserId(std::string& userId);
-	void setAppId(std::string& appId);
-	void setClusterId(std::string& clusterId);
-
-
-	friend class Channel;
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/MessageListener.h b/cpp/client/inc/MessageListener.h
deleted file mode 100644
index 81b80ff5cb..0000000000
--- a/cpp/client/inc/MessageListener.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-
-#ifndef _MessageListener_
-#define _MessageListener_
-
-#include "Message.h"
-
-namespace qpid {
-namespace client {
-
-    class MessageListener{
-    public:
-        virtual ~MessageListener();
-	virtual void received(Message& msg) = 0;
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/Queue.h b/cpp/client/inc/Queue.h
deleted file mode 100644
index e0964af774..0000000000
--- a/cpp/client/inc/Queue.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-
-#ifndef _Queue_
-#define _Queue_
-
-namespace qpid {
-namespace client {
-
-    class Queue{
-	std::string name;
-        const bool autodelete;
-        const bool exclusive;
-
-    public:
-
-	Queue();
-	Queue(std::string name);
-	Queue(std::string name, bool temp);
-	Queue(std::string name, bool autodelete, bool exclusive);
-	const std::string& getName() const;
-	void setName(const std::string&);
-        bool isAutoDelete() const;
-        bool isExclusive() const;
-    };
-
-}
-}
-
-
-#endif
diff --git a/cpp/client/inc/ResponseHandler.h b/cpp/client/inc/ResponseHandler.h
deleted file mode 100644
index f5392c954d..0000000000
--- a/cpp/client/inc/ResponseHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-#include "amqp_framing.h"
-#include "Monitor.h"
-
-#ifndef _ResponseHandler_
-#define _ResponseHandler_
-
-namespace qpid {
-    namespace client {
-
-        class ResponseHandler{
-            bool waiting;
-            qpid::framing::AMQMethodBody::shared_ptr response;
-            qpid::concurrent::Monitor* monitor;
-
-        public:
-            ResponseHandler();
-            ~ResponseHandler();
-            inline bool isWaiting(){ return waiting; }
-            inline qpid::framing::AMQMethodBody::shared_ptr getResponse(){ return response; }
-            bool validate(const qpid::framing::AMQMethodBody& expected);
-            void waitForResponse();
-            void signalResponse(qpid::framing::AMQMethodBody::shared_ptr response);
-            void receive(const qpid::framing::AMQMethodBody& expected);
-            void expect();//must be called before calling receive
-        };
-
-    }
-}
-
-
-#endif
diff --git a/cpp/client/inc/ReturnedMessageHandler.h b/cpp/client/inc/ReturnedMessageHandler.h
deleted file mode 100644
index 0d30d0ab32..0000000000
--- a/cpp/client/inc/ReturnedMessageHandler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <string>
-
-#ifndef _ReturnedMessageHandler_
-#define _ReturnedMessageHandler_
-
-#include "Message.h"
-
-namespace qpid {
-namespace client {
-
-    class ReturnedMessageHandler{
-    public:
-        virtual ~ReturnedMessageHandler();
-	virtual void returned(Message& msg) = 0;
-    };
-
-}
-}
-
-
-#endif