Merged revisions 532430 by hand from

https://svn.apache.org/repos/asf/incubator/qpid/branches/trunk/qpid/cpp

------------------------------------------------------------------------
r532430 | aconway | 2007-04-25 14:06:14 -0400 (Wed, 25 Apr 2007) | 10 lines


 * qpid/CommonOptions.h:
  - Convenience classs/functions to use boost::program_options.
  - CommonOptions class for options common to client/broker.
 * qpid/broker/Broker.h:
  - Replaced broker::Configuration with class Broker::Options,
    derived from CommonOptions.
 * qpidd.cpp: Updated options handling.
 * qpid/Exception.h: Added strError function to get std::string from errno.

------------------------------------------------------------------------


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

1 files changed, 14 insertions, 5 deletions

diff --git a/cpp/lib/broker/Broker.h b/cpp/lib/broker/Broker.h
index 8ea1a57c27..8b54bd592b 100644
--- a/cpp/lib/broker/Broker.h
+++ b/cpp/lib/broker/Broker.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include <Configuration.h>
+#include <CommonOptions.h>
 #include <SessionHandlerFactoryImpl.h>
 #include <sys/Runnable.h>
 #include <sys/Acceptor.h>
@@ -37,7 +37,15 @@ class Broker : public qpid::sys::Runnable,
                public qpid::SharedObject<Broker>
 {
   public:
-    static const int16_t DEFAULT_PORT;
+    struct Options : public CommonOptions {
+        Options();
+        void addTo(po::options_description&);
+        int workerThreads;
+        int maxConnections;
+        int connectionBacklog;
+        std::string store;      
+        long stagingThreshold;
+    };
             
     virtual ~Broker();
 
@@ -45,12 +53,12 @@ class Broker : public qpid::sys::Runnable,
      * Create a broker.
      * @param port Port to listen on or 0 to pick a port dynamically.
      */
-    static shared_ptr create(int16_t port = DEFAULT_PORT);
+    static shared_ptr create(int16_t port = Options::DEFAULT_PORT);
 
     /**
      * Create a broker using a Configuration.
      */
-    static shared_ptr create(const Configuration& config);
+    static shared_ptr create(const Options& config);
 
     /**
      * Return listening port. If called before bind this is
@@ -70,7 +78,8 @@ class Broker : public qpid::sys::Runnable,
     virtual void shutdown();
 
   private:
-    Broker(const Configuration& config); 
+    Broker(const Options& config);
+    Options config;
     qpid::sys::Acceptor::shared_ptr acceptor;
     SessionHandlerFactoryImpl factory;
 };