1 files changed, 51 insertions, 105 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
index 434d40d557..57e401e608 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
@@ -20,66 +20,25 @@
  */
 package org.apache.qpid.server;
 
-import org.osgi.framework.BundleContext;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 public class BrokerOptions
 {
-    public static final String DEFAULT_CONFIG_FILE = "etc/config.xml";
+    public static final String DEFAULT_STORE_TYPE = "json";
+    public static final String DEFAULT_CONFIG_FILE = "config";
     public static final String DEFAULT_LOG_CONFIG_FILE = "etc/log4j.xml";
-    public static final String QPID_HOME = "QPID_HOME";
-    public static final String QPID_WORK = "QPID_WORK";
-
-    private final Set<Integer> _ports = new HashSet<Integer>();
-    private final Set<Integer> _sslPorts = new HashSet<Integer>();
-    private final Map<ProtocolExclusion,Set<Integer>> _exclusionMap = new HashMap<ProtocolExclusion, Set<Integer>>();
-    private final Map<ProtocolInclusion,Set<Integer>> _inclusionMap = new HashMap<ProtocolInclusion, Set<Integer>>();
 
-    private String _configFile;
     private String _logConfigFile;
-    private String _bind;
-    private Integer _jmxPortRegistryServer;
-    private Integer _jmxPortConnectorServer;
-    private BundleContext _bundleContext;
-
     private Integer _logWatchFrequency = 0;
-    private String _qpidWorkFolder;
-    private String _qpidHomeFolder;
 
-    public void addPort(final int port)
-    {
-        _ports.add(port);
-    }
+    private String _configurationStoreLocation;
+    private String _configurationStoreType = DEFAULT_STORE_TYPE;
 
-    public void addSSLPort(final int sslPort)
-    {
-        _sslPorts.add(sslPort);
-    }
+    private String _initialConfigurationStoreLocation;
+    private String _initialConfigurationStoreType = DEFAULT_STORE_TYPE;
 
-    public Set<Integer> getPorts()
-    {
-        return Collections.unmodifiableSet(_ports);
-    }
-
-    public Set<Integer> getSSLPorts()
-    {
-        return Collections.unmodifiableSet(_sslPorts);
-    }
-
-    public String getConfigFile()
-    {
-        return _configFile;
-    }
-
-    public void setConfigFile(final String configFile)
-    {
-        _configFile = configFile;
-    }
+    private boolean _managementMode;
+    private int _managementModeRmiPort;
+    private int _managementModeConnectorPort;
+    private int _managementModeHttpPort;
 
     public String getLogConfigFile()
     {
@@ -91,110 +50,97 @@ public class BrokerOptions
         _logConfigFile = logConfigFile;
     }
 
-    public Integer getJmxPortRegistryServer()
+    public int getLogWatchFrequency()
     {
-        return _jmxPortRegistryServer;
+        return _logWatchFrequency;
     }
 
-    public void setJmxPortRegistryServer(final int jmxPortRegistryServer)
+    /**
+     * Set the frequency with which the log config file will be checked for updates.
+     * @param logWatchFrequency frequency in seconds
+     */
+    public void setLogWatchFrequency(final int logWatchFrequency)
     {
-        _jmxPortRegistryServer = jmxPortRegistryServer;
+        _logWatchFrequency = logWatchFrequency;
     }
 
-    public Integer getJmxPortConnectorServer()
+    public String getConfigurationStoreLocation()
     {
-        return _jmxPortConnectorServer;
+        return _configurationStoreLocation;
     }
 
-    public void setJmxPortConnectorServer(final int jmxPortConnectorServer)
+    public void setConfigurationStoreLocation(String cofigurationStore)
     {
-        _jmxPortConnectorServer = jmxPortConnectorServer;
+        _configurationStoreLocation = cofigurationStore;
     }
-    public String getQpidHome()
+
+    public String getConfigurationStoreType()
     {
-        return _qpidHomeFolder == null? System.getProperty(QPID_HOME): _qpidHomeFolder;
+        return _configurationStoreType;
     }
 
-    public Set<Integer> getExcludedPorts(final ProtocolExclusion excludeProtocol)
+    public void setConfigurationStoreType(String cofigurationStoreType)
     {
-        final Set<Integer> excludedPorts = _exclusionMap.get(excludeProtocol);
-        return excludedPorts == null ? Collections.<Integer>emptySet() : excludedPorts;
+        _configurationStoreType = cofigurationStoreType;
     }
 
-    public void addExcludedPort(final ProtocolExclusion excludeProtocol, final int port)
+    public void setInitialConfigurationStoreLocation(String initialConfigurationStore)
     {
-        if (!_exclusionMap.containsKey(excludeProtocol))
-        {
-            _exclusionMap.put(excludeProtocol, new HashSet<Integer>());
-        }
-
-        Set<Integer> ports = _exclusionMap.get(excludeProtocol);
-        ports.add(port);
+        _initialConfigurationStoreLocation = initialConfigurationStore;
     }
 
-    public String getBind()
+    public void setInitialConfigurationStoreType(String initialConfigurationStoreType)
     {
-        return _bind;
+        _initialConfigurationStoreType = initialConfigurationStoreType;
     }
 
-    public void setBind(final String bind)
+    public String getInitialConfigurationStoreLocation()
     {
-        _bind = bind;
+        return _initialConfigurationStoreLocation;
     }
 
-    public int getLogWatchFrequency()
+    public String getInitialConfigurationStoreType()
     {
-        return _logWatchFrequency;
+        return _initialConfigurationStoreType;
     }
 
-    /**
-     * Set the frequency with which the log config file will be checked for updates.
-     * @param logWatchFrequency frequency in seconds
-     */
-    public void setLogWatchFrequency(final int logWatchFrequency)
+    public boolean isManagementMode()
     {
-        _logWatchFrequency = logWatchFrequency;
+        return _managementMode;
     }
 
-    public BundleContext getBundleContext()
+    public void setManagementMode(boolean managementMode)
     {
-        return _bundleContext ;
+        _managementMode = managementMode;
     }
 
-    public void setBundleContext(final BundleContext bundleContext)
+    public int getManagementModeRmiPort()
     {
-        _bundleContext = bundleContext;
+        return _managementModeRmiPort;
     }
 
-    public Set<Integer> getIncludedPorts(final ProtocolInclusion includeProtocol)
+    public void setManagementModeRmiPort(int managementModeRmiPort)
     {
-        final Set<Integer> includedPorts = _inclusionMap.get(includeProtocol);
-        return includedPorts == null ? Collections.<Integer>emptySet() : includedPorts;
+        _managementModeRmiPort = managementModeRmiPort;
     }
 
-    public void addIncludedPort(final ProtocolInclusion includeProtocol, final int port)
+    public int getManagementModeConnectorPort()
     {
-        if (!_inclusionMap.containsKey(includeProtocol))
-        {
-            _inclusionMap.put(includeProtocol, new HashSet<Integer>());
-        }
-
-        Set<Integer> ports = _inclusionMap.get(includeProtocol);
-        ports.add(port);
+        return _managementModeConnectorPort;
     }
 
-    public String getQpidWork()
+    public void setManagementModeConnectorPort(int managementModeConnectorPort)
     {
-        return _qpidWorkFolder;
+        _managementModeConnectorPort = managementModeConnectorPort;
     }
 
-    public void setQpidWork(String qpidWorkFolder)
+    public int getManagementModeHttpPort()
     {
-        _qpidWorkFolder = qpidWorkFolder;
+        return _managementModeHttpPort;
     }
 
-    public void setQpidHome(String qpidHomeFolder)
+    public void setManagementModeHttpPort(int managementModeHttpPort)
     {
-        _qpidHomeFolder = qpidHomeFolder;
+        _managementModeHttpPort = managementModeHttpPort;
     }
 }
\ No newline at end of file