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, 201 deletions

diff --git a/cpp/src/qpid/broker/Configuration.cpp b/cpp/src/qpid/broker/Configuration.cpp
deleted file mode 100644
index 1fce1acf4c..0000000000
--- a/cpp/src/qpid/broker/Configuration.cpp
+++ /dev/null
@@ -1,201 +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/Configuration.h>
-#include <string.h>
-
-using namespace qpid::broker;
-using namespace std;
-
-Configuration::Configuration() : 
-    trace('t', "trace", "Print incoming & outgoing frames to the console (default=false)", false),
-    port('p', "port", "Sets the port to listen on (default=5672)", 5672),
-    workerThreads("worker-threads", "Sets the number of worker threads to use (default=5).", 5),
-    maxConnections("max-connections", "Sets the maximum number of connections the broker can accept (default=500).", 500),
-    connectionBacklog("connection-backlog", "Sets the connection backlog for the servers socket (default=10)", 10),
-    store('s', "store", "Sets the message store module to use (default='' which implies no store)", ""),
-    help("help", "Prints usage information", false)
-{
-    options.push_back(&trace);
-    options.push_back(&port);
-    options.push_back(&workerThreads);
-    options.push_back(&maxConnections);
-    options.push_back(&connectionBacklog);
-    options.push_back(&store);
-    options.push_back(&help);
-}
-
-Configuration::~Configuration(){}
-
-void Configuration::parse(int argc, char** argv){
-    int position = 1;
-    while(position < argc){
-        bool matched(false);
-        for(op_iterator i = options.begin(); i < options.end() && !matched; i++){
-            matched = (*i)->parse(position, argv, argc);
-        }
-        if(!matched){
-            std::cout<< "Warning: skipping unrecognised option " << argv[position] << std::endl;
-            position++;
-        }
-    }
-}
-
-void Configuration::usage(){
-    for(op_iterator i = options.begin(); i < options.end(); i++){
-        (*i)->print(std::cout);
-    }
-}
-
-bool Configuration::isHelp() const {
-    return help.getValue();
-}
-
-bool Configuration::isTrace() const {
-    return trace.getValue();
-}
-
-int Configuration::getPort() const {
-    return port.getValue();
-}
-
-int Configuration::getWorkerThreads() const {
-    return workerThreads.getValue();
-}
-
-int Configuration::getMaxConnections() const {
-    return maxConnections.getValue();
-}
-
-int Configuration::getConnectionBacklog() const {
-    return connectionBacklog.getValue();
-}
-
-const std::string& Configuration::getStore() const {
-    return store.getValue();
-}
-
-Configuration::Option::Option(const char _flag, const string& _name, const string& _desc) : 
-    flag(string("-") + _flag), name("--" +_name), desc(_desc) {}
-
-Configuration::Option::Option(const string& _name, const string& _desc) : 
-    flag(""), name("--" + _name), desc(_desc) {}
-
-Configuration::Option::~Option(){}
-
-bool Configuration::Option::match(const string& arg){
-    return flag == arg || name == arg;
-}
-
-bool Configuration::Option::parse(int& i, char** argv, int argc){
-    const string arg(argv[i]);
-    if(match(arg)){
-        if(needsValue()){
-            if(++i < argc) setValue(argv[i]);
-            else throw ParseException("Argument " + arg + " requires a value!");
-        }else{
-            setValue("");
-        }
-        i++;
-        return true;
-    }else{
-        return false;
-    }
-}
-
-void Configuration::Option::print(ostream& out) const {
-    out << "    ";
-    if(flag.length() > 0){
-        out << flag << " or ";
-    }
-    out << name;
-    if(needsValue()) out << "<value>";
-    out << std::endl;
-    out << "            " << desc << std::endl;
-}
-
-
-// String Option:
-
-Configuration::StringOption::StringOption(const char _flag, const string& _name, const string& _desc, const string _value) : 
-    Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::StringOption::StringOption(const string& _name, const string& _desc, const string _value) : 
-    Option(_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::StringOption::~StringOption(){}
-
-const string& Configuration::StringOption::getValue() const {
-    return value;
-}
-
-bool Configuration::StringOption::needsValue() const {
-    return true;
-}
-
-void Configuration::StringOption::setValue(const std::string& _value){
-    value = _value;
-}
-
-// Int Option:
-
-Configuration::IntOption::IntOption(const char _flag, const string& _name, const string& _desc, const int _value) : 
-    Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::IntOption::IntOption(const string& _name, const string& _desc, const int _value) : 
-    Option(_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::IntOption::~IntOption(){}
-
-int Configuration::IntOption::getValue() const {
-    return value;
-}
-
-bool Configuration::IntOption::needsValue() const {
-    return true;
-}
-
-void Configuration::IntOption::setValue(const std::string& _value){
-    value = atoi(_value.c_str());
-}
-
-// Bool Option:
-
-Configuration::BoolOption::BoolOption(const char _flag, const string& _name, const string& _desc, const bool _value) : 
-    Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::BoolOption::BoolOption(const string& _name, const string& _desc, const bool _value) : 
-    Option(_name,_desc), defaultValue(_value), value(_value) {}
-
-Configuration::BoolOption::~BoolOption(){}
-
-bool Configuration::BoolOption::getValue() const {
-    return value;
-}
-
-bool Configuration::BoolOption::needsValue() const {
-    return false;
-}
-
-void Configuration::BoolOption::setValue(const std::string& /*not required*/){
-    //BoolOptions have no value. The fact that the option is specified
-    //implies the value is true.
-    value = true;
-}