2 files changed, 15 insertions, 14 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 01e049bdda..4354f6d38a 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -35,6 +35,7 @@
 #include "qpid/sys/ConnectionInputHandler.h"
 #include "qpid/sys/ConnectionInputHandlerFactory.h"
 #include "qpid/sys/TimeoutHandler.h"
+#include "qpid/Url.h"
 
 #include <iostream>
 #include <memory>
@@ -44,19 +45,17 @@ using qpid::sys::Acceptor;
 namespace qpid {
 namespace broker {
 
-Broker::Options::Options() :
+Broker::Options::Options(const std::string& name) :
+    qpid::Options(name),
+    port(TcpAddress::DEFAULT_PORT),
     workerThreads(5),
     maxConnections(500),
     connectionBacklog(10),
     store(),
     stagingThreshold(5000000)
-{}
-
-void Broker::Options::addTo(po::options_description& desc)
 {
-    using namespace po;
-    CommonOptions::addTo(desc);
-    desc.add_options()
+    addOptions()
+        ("port,p", optValue(port,"PORT"), "Use PORT for AMQP connections.")
         ("worker-threads", optValue(workerThreads, "N"),
          "Broker thread pool size")
         ("max-connections", optValue(maxConnections, "N"),
@@ -114,7 +113,7 @@ Broker::shared_ptr Broker::create(const Options& config) {
 
 MessageStore* Broker::createStore(const Options& config) {
     if (config.store.empty())
-        return new NullMessageStore(config.trace);
+        return new NullMessageStore(false);
     else
         return new MessageStoreModule(config.store);
 }
@@ -141,7 +140,7 @@ Acceptor& Broker::getAcceptor() const {
             Acceptor::create(config.port,
                              config.connectionBacklog,
                              config.workerThreads,
-                             config.trace);
+                             false);
     return *acceptor;
 }
 
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 187167ebe7..efefbd2e3e 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -23,6 +23,7 @@
  */
 
 #include "ConnectionFactory.h"
+#include "qpid/Url.h"
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Acceptor.h"
 #include "qpid/SharedObject.h"
@@ -35,7 +36,7 @@
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "QueueRegistry.h"
-#include "qpid/CommonOptions.h"
+#include "qpid/Options.h"
 
 namespace qpid { 
 namespace broker {
@@ -46,9 +47,10 @@ class Broker : public sys::Runnable,
                public SharedObject<Broker>
 {
   public:
-    struct Options : public CommonOptions {
-        Options();
-        void addTo(po::options_description&);
+    struct Options : public qpid::Options {
+        Options(const std::string& name="Broker Options");
+        
+        uint16_t port;
         int workerThreads;
         int maxConnections;
         int connectionBacklog;
@@ -62,7 +64,7 @@ class Broker : public 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 = CommonOptions::DEFAULT_PORT);
+    static shared_ptr create(int16_t port = TcpAddress::DEFAULT_PORT);
 
     /**
      * Create a broker with the options in config.