2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


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

1 files changed, 0 insertions, 215 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
deleted file mode 100644
index 6478383cb2..0000000000
--- a/cpp/src/qpid/broker/Message.cpp
+++ /dev/null
@@ -1,215 +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 <qpid/broker/Message.h>
-#include <iostream>
-
-#include <qpid/broker/InMemoryContent.h>
-#include <qpid/broker/LazyLoadedContent.h>
-#include <qpid/broker/MessageStore.h>
-// AMQP version change - kpvdr 2006-11-17
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/BasicDeliverBody.h>
-#include <qpid/framing/BasicGetOkBody.h>
-
-using namespace boost;
-using namespace qpid::broker;
-using namespace qpid::framing;
-
-Message::Message(const ConnectionToken* const _publisher, 
-                 const string& _exchange, const string& _routingKey, 
-                 bool _mandatory, bool _immediate) : publisher(_publisher),
-                                                     exchange(_exchange),
-                                                     routingKey(_routingKey), 
-                                                     mandatory(_mandatory),
-                                                     immediate(_immediate),
-                                                     redelivered(false),
-                                                     size(0),
-                                                     persistenceId(0) {}
-
-Message::Message(Buffer& buffer, bool headersOnly, u_int32_t contentChunkSize) : 
-    publisher(0), mandatory(false), immediate(false), redelivered(false), size(0), persistenceId(0){
-
-    decode(buffer, headersOnly, contentChunkSize);
-}
-
-Message::Message() : publisher(0), mandatory(false), immediate(false), redelivered(false), size(0), persistenceId(0){}
-
-Message::~Message(){}
-
-void Message::setHeader(AMQHeaderBody::shared_ptr _header){
-    this->header = _header;
-}
-
-void Message::addContent(AMQContentBody::shared_ptr data){
-    if (!content.get()) {
-        content = std::auto_ptr<Content>(new InMemoryContent());
-    }
-    content->add(data);
-    size += data->size();    
-}
-
-bool Message::isComplete(){
-    return header.get() && (header->getContentSize() == contentSize());
-}
-
-void Message::redeliver(){
-    redelivered = true;
-}
-
-void Message::deliver(OutputHandler* out, int channel, 
-                      const string& consumerTag, u_int64_t deliveryTag, 
-                      u_int32_t framesize){
-
-    // AMQP version change - kpvdr 2006-11-17
-    // TODO: Make this class version-aware and link these hard-wired numbers to that version
-    out->send(new AMQFrame(channel, new BasicDeliverBody(ProtocolVersion(8,0), consumerTag, deliveryTag, redelivered, exchange, routingKey)));
-    sendContent(out, channel, framesize);
-}
-
-void Message::sendGetOk(OutputHandler* out, 
-         int channel, 
-         u_int32_t messageCount,
-         u_int64_t deliveryTag, 
-         u_int32_t framesize){
-
-    // AMQP version change - kpvdr 2006-11-17
-    // TODO: Make this class version-aware and link these hard-wired numbers to that version
-    out->send(new AMQFrame(channel, new BasicGetOkBody(ProtocolVersion(8,0), deliveryTag, redelivered, exchange, routingKey, messageCount)));
-    sendContent(out, channel, framesize);
-}
-
-void Message::sendContent(OutputHandler* out, int channel, u_int32_t framesize){
-    AMQBody::shared_ptr headerBody = static_pointer_cast<AMQBody, AMQHeaderBody>(header);
-    out->send(new AMQFrame(channel, headerBody));
-
-    if (content.get()) content->send(out, channel, framesize);
-}
-
-BasicHeaderProperties* Message::getHeaderProperties(){
-    return dynamic_cast<BasicHeaderProperties*>(header->getProperties());
-}
-
-const ConnectionToken* const Message::getPublisher(){
-    return publisher;
-}
-
-bool Message::isPersistent()
-{
-    if(!header) return false;
-    BasicHeaderProperties* props = getHeaderProperties();
-    return props && props->getDeliveryMode() == PERSISTENT;
-}
-
-void Message::decode(Buffer& buffer, bool headersOnly, u_int32_t contentChunkSize)
-{
-    decodeHeader(buffer);
-    if (!headersOnly) decodeContent(buffer, contentChunkSize);
-}
-
-void Message::decodeHeader(Buffer& buffer)
-{
-    buffer.getShortString(exchange);
-    buffer.getShortString(routingKey);
-    
-    u_int32_t headerSize = buffer.getLong();
-    AMQHeaderBody::shared_ptr headerBody(new AMQHeaderBody());
-    headerBody->decode(buffer, headerSize);
-    setHeader(headerBody);
-}
-
-void Message::decodeContent(Buffer& buffer, u_int32_t chunkSize)
-{    
-    u_int64_t expected = expectedContentSize();
-    if (expected != buffer.available()) {
-        std::cout << "WARN: Expected " << expectedContentSize() << " bytes, got " << buffer.available() << std::endl;
-    }
-
-    if (!chunkSize || chunkSize > expected) {
-        chunkSize = expected;
-    }
-
-    u_int64_t total = 0;
-    while (total < expectedContentSize()) {
-        u_int64_t remaining =  expected - total;
-        AMQContentBody::shared_ptr contentBody(new AMQContentBody());        
-        contentBody->decode(buffer, remaining < chunkSize ? remaining : chunkSize);
-        addContent(contentBody);
-        total += chunkSize;
-    }
-}
-
-void Message::encode(Buffer& buffer)
-{
-    encodeHeader(buffer);
-    encodeContent(buffer);
-}
-
-void Message::encodeHeader(Buffer& buffer)
-{
-    buffer.putShortString(exchange);
-    buffer.putShortString(routingKey);    
-    buffer.putLong(header->size());
-    header->encode(buffer);
-}
-
-void Message::encodeContent(Buffer& buffer)
-{
-    if (content.get()) content->encode(buffer);
-}
-
-u_int32_t Message::encodedSize()
-{
-    return  encodedHeaderSize() + encodedContentSize();
-}
-
-u_int32_t Message::encodedContentSize()
-{
-    return content.get() ? content->size() : 0;
-}
-
-u_int32_t Message::encodedHeaderSize()
-{
-    return exchange.size() + 1
-        + routingKey.size() + 1
-        + header->size() + 4;//4 extra bytes for size
-}
-
-u_int64_t Message::expectedContentSize()
-{
-    return header.get() ? header->getContentSize() : 0;
-}
-
-void Message::releaseContent(MessageStore* store)
-{
-    if (!content.get() || content->size() > 0) {
-        //set content to lazy loading mode (but only if there is stored content):
-
-        //Note: the LazyLoadedContent instance contains a raw pointer to the message, however it is
-        //      then set as a member of that message so its lifetime is guaranteed to be no longer than
-        //      that of the message itself
-        content = std::auto_ptr<Content>(new LazyLoadedContent(store, this, expectedContentSize()));
-    }
-}
-
-void Message::setContent(std::auto_ptr<Content>& _content)
-{
-    content = _content;
-}