1 files changed, 37 insertions, 1 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 d871c724fd..434d40d557 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
@@ -33,10 +33,12 @@ public class BrokerOptions
     public static final String DEFAULT_CONFIG_FILE = "etc/config.xml";
     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;
@@ -46,6 +48,8 @@ public class BrokerOptions
     private BundleContext _bundleContext;
 
     private Integer _logWatchFrequency = 0;
+    private String _qpidWorkFolder;
+    private String _qpidHomeFolder;
 
     public void addPort(final int port)
     {
@@ -108,7 +112,7 @@ public class BrokerOptions
     }
     public String getQpidHome()
     {
-        return System.getProperty(QPID_HOME);
+        return _qpidHomeFolder == null? System.getProperty(QPID_HOME): _qpidHomeFolder;
     }
 
     public Set<Integer> getExcludedPorts(final ProtocolExclusion excludeProtocol)
@@ -161,4 +165,36 @@ public class BrokerOptions
     {
         _bundleContext = bundleContext;
     }
+
+    public Set<Integer> getIncludedPorts(final ProtocolInclusion includeProtocol)
+    {
+        final Set<Integer> includedPorts = _inclusionMap.get(includeProtocol);
+        return includedPorts == null ? Collections.<Integer>emptySet() : includedPorts;
+    }
+
+    public void addIncludedPort(final ProtocolInclusion includeProtocol, final int port)
+    {
+        if (!_inclusionMap.containsKey(includeProtocol))
+        {
+            _inclusionMap.put(includeProtocol, new HashSet<Integer>());
+        }
+
+        Set<Integer> ports = _inclusionMap.get(includeProtocol);
+        ports.add(port);
+    }
+
+    public String getQpidWork()
+    {
+        return _qpidWorkFolder;
+    }
+
+    public void setQpidWork(String qpidWorkFolder)
+    {
+        _qpidWorkFolder = qpidWorkFolder;
+    }
+
+    public void setQpidHome(String qpidHomeFolder)
+    {
+        _qpidHomeFolder = qpidHomeFolder;
+    }
 }
\ No newline at end of file