Refactored client::Message to be independent of all Basic class concepts

and client::IncomingMessage to handle 0-9 style references and appends.

* cpp/lib/client/ClientMessage.cpp: Made independent of Basic class.
* cpp/lib/client/IncomingMessage.cpp: Refactored to handle references/appends.
* cpp/lib/client/BasicMessageChannel.cpp: Refactored to use new IncomingMessage

Thread safety fixes:
* cpp/lib/client/ResponseHandler.h: Remove stateful functions.
* cpp/lib/client/ClientChannel.cpp: use new ResponseHandler interface.

Minor cleanup:
* cpp/lib/common/framing/BasicHeaderProperties.cpp: use DeliveryMode enum.
* cpp/tests/HeaderTest.cpp:  use DeliveryMode enum.
* cpp/tests/MessageTest.cpp:  use DeliveryMode enum.
* cpp/lib/common/shared_ptr.h: #include <boost/cast.hpp> for convenience.
* cpp/lib/common/sys/ThreadSafeQueue.h: Changed "stop"  "shutdown" 
* cpp/lib/common/sys/ProducerConsumer.h: Changed "stop"  "shutdown"  
* cpp/tests/ClientChannelTest.cpp (TestCase): Removed debug couts.
* cpp/tests/setup: valgrind --demangle=yes by default.
* cpp/tests/topictest: sleep to hack around startup race.
* cpp/lib/broker/BrokerQueue.cpp (configure): Fixed memory leak.

Removed/updated FIXME comments in: 
* cpp/lib/broker/BrokerMessage.cpp: 
* cpp/lib/broker/BrokerMessageBase.h: 
* cpp/lib/broker/InMemoryContent.cpp: 
* cpp/lib/common/framing/MethodContext.h: 



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

1 files changed, 0 insertions, 161 deletions

diff --git a/qpid/cpp/lib/client/ClientMessage.cpp b/qpid/cpp/lib/client/ClientMessage.cpp
deleted file mode 100644
index 8edd0a474d..0000000000
--- a/qpid/cpp/lib/client/ClientMessage.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *
- * 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 <ClientMessage.h>
-using namespace qpid::client;
-using namespace qpid::framing;
-
-Message::Message(const std::string& d)
-    : header(new AMQHeaderBody(BASIC))
-{
-    setData(d);
-}
-
-void Message::setData(const std::string& d) {
-    data = d;
-}
-
-Message::Message(AMQHeaderBody::shared_ptr& _header) : header(_header){
-}
-
-Message::~Message(){
-}
-	
-BasicHeaderProperties* Message::getHeaderProperties() const {
-    return dynamic_cast<BasicHeaderProperties*>(header->getProperties());
-}
-
-std::string Message::getContentType() const { 
-    return getHeaderProperties()->getContentType(); 
-}
-
-std::string Message::getContentEncoding() const { 
-    return getHeaderProperties()->getContentEncoding(); 
-}
-
-FieldTable& Message::getHeaders() const { 
-    return getHeaderProperties()->getHeaders(); 
-}
-
-uint8_t Message::getDeliveryMode() const { 
-    return getHeaderProperties()->getDeliveryMode(); 
-}
-
-uint8_t Message::getPriority() const { 
-    return getHeaderProperties()->getPriority(); 
-}
-
-std::string Message::getCorrelationId() const {
-    return getHeaderProperties()->getCorrelationId(); 
-}
-
-std::string Message::getReplyTo() const { 
-    return getHeaderProperties()->getReplyTo(); 
-}
-
-std::string Message::getExpiration() const { 
-    return getHeaderProperties()->getExpiration(); 
-}
-
-std::string Message::getMessageId() const {
-    return getHeaderProperties()->getMessageId(); 
-}
-
-uint64_t Message::getTimestamp() const { 
-    return getHeaderProperties()->getTimestamp(); 
-}
-
-std::string Message::getType() const { 
-    return getHeaderProperties()->getType(); 
-}
-
-std::string Message::getUserId() const { 
-    return getHeaderProperties()->getUserId(); 
-}
-
-std::string Message::getAppId() const { 
-    return getHeaderProperties()->getAppId(); 
-}
-
-std::string Message::getClusterId() const { 
-    return getHeaderProperties()->getClusterId(); 
-}
-
-void Message::setContentType(const std::string& type){ 
-    getHeaderProperties()->setContentType(type); 
-}
-
-void Message::setContentEncoding(const std::string& encoding){ 
-    getHeaderProperties()->setContentEncoding(encoding); 
-}
-
-void Message::setHeaders(const FieldTable& headers){ 
-    getHeaderProperties()->setHeaders(headers); 
-}
-
-void Message::setDeliveryMode(DeliveryMode mode){ 
-    getHeaderProperties()->setDeliveryMode(mode); 
-}
-
-void Message::setPriority(uint8_t priority){ 
-    getHeaderProperties()->setPriority(priority); 
-}
-
-void Message::setCorrelationId(const std::string& correlationId){ 
-    getHeaderProperties()->setCorrelationId(correlationId); 
-}
-
-void Message::setReplyTo(const std::string& replyTo){ 
-    getHeaderProperties()->setReplyTo(replyTo);
-}
-
-void Message::setExpiration(const std::string&  expiration){ 
-    getHeaderProperties()->setExpiration(expiration); 
-}
-
-void Message::setMessageId(const std::string& messageId){ 
-    getHeaderProperties()->setMessageId(messageId); 
-}
-
-void Message::setTimestamp(uint64_t timestamp){ 
-    getHeaderProperties()->setTimestamp(timestamp); 
-}
-
-void Message::setType(const std::string& type){ 
-    getHeaderProperties()->setType(type); 
-}
-
-void Message::setUserId(const std::string& userId){ 
-    getHeaderProperties()->setUserId(userId); 
-}
-
-void Message::setAppId(const std::string& appId){
-    getHeaderProperties()->setAppId(appId); 
-}
-
-void Message::setClusterId(const std::string& clusterId){ 
-    getHeaderProperties()->setClusterId(clusterId); 
-}
-
-
-uint64_t Message::getDeliveryTag() const {
-    BasicDeliverBody* deliver=dynamic_cast<BasicDeliverBody*>(method.get());
-    return deliver ? deliver->getDeliveryTag() : 0;
-}