QPID-2630, QPID-2631: Restore the virtualhosts.xml file. When a virtualhosts.xml file is specified load it as its own Configuration object to ensure the property heirarchy is not lost. Enforce that virtualhost config can only be specified in either the main config.xml file or the virtualhosts.xml file, but not both. Allow the virtualhosts.xml file to be a combined configuration and use to provide override abilities for testing.

Applied patch from Andrew Kennedy <andrew.international@gmail.com>


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@929136 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 444 insertions, 248 deletions

diff --git a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
index 33cc90b895..7deb80bcd9 100644
--- a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
@@ -18,9 +18,6 @@
  - specific language governing permissions and limitations
  - under the License.
  -
-
- This is an example config using the BDBMessageStore available from
- the Red Hat Messaging project at etp.108.redhat.com and distributed under GPL.
  -->
         
 <broker>
@@ -68,17 +65,8 @@
         </jmx>
     </security>
 
-    <virtualhosts>
-        <virtualhost>
-            <name>dev-only</name>
-            <dev-only>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                    <environment-path>${work}/bdbstore/dev-only-store</environment-path>
-                </store>
-            </dev-only>
-        </virtualhost>
-    </virtualhosts>
+    <virtualhosts>${conf}/virtualhosts-ServerConfigurationTest-New.xml</virtualhosts>
+    
     <heartbeat>
         <delay>0</delay>
         <timeoutFactor>2.0</timeoutFactor>
@@ -86,8 +74,6 @@
     <queue>
         <auto_register>true</auto_register>
     </queue>
-
-    <virtualhosts>${conf}/virtualhosts-ServerConfigurationTest-New.xml</virtualhosts>
 </broker>
 
 
diff --git a/qpid/java/systests/etc/config-systests-acl-settings.xml b/qpid/java/systests/etc/config-systests-acl-settings.xml
index d7c1ef70df..eebc75f05f 100644
--- a/qpid/java/systests/etc/config-systests-acl-settings.xml
+++ b/qpid/java/systests/etc/config-systests-acl-settings.xml
@@ -20,141 +20,7 @@
  -
  -->
 <broker>
-
-    <virtualhosts>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <queues>
-                    <exchange>amq.direct</exchange>
-                    <!-- 4Mb -->
-                    <maximumQueueDepth>4235264</maximumQueueDepth>
-                    <!-- 2Mb -->
-                    <maximumMessageSize>2117632</maximumMessageSize>
-                    <!-- 10 mins -->
-                    <maximumMessageAge>600000</maximumMessageAge>
-                </queues>
-
-
-                <security>
-                    <access>
-                        <class>org.apache.qpid.server.security.access.plugins.SimpleXML</class>
-                    </access>
-                    <access_control_list>
-                        <!-- This section grants pubish rights to an exchange + routing key pair -->
-                        <publish>
-                            <exchanges>
-                                <exchange>
-                                    <name>amq.direct</name>
-                                    <routing_keys>
-
-                                        <!-- Allow clients to publish requests -->
-                                        <routing_key>
-                                            <value>example.RequestQueue</value>
-                                            <users>
-                                                <user>client</user>
-                                            </users>
-                                        </routing_key>
-
-                                        <!-- Allow the processor to respond to a client on their Temporary Topic -->
-                                        <routing_key>
-                                            <value>tmp_*</value>
-                                            <users>
-                                                <user>server</user>
-                                            </users>
-                                        </routing_key>
-                                        <routing_key>
-                                            <value>TempQueue*</value>
-                                            <users>
-                                                <user>server</user>
-                                            </users>
-                                        </routing_key>
-                                    </routing_keys>
-
-                                </exchange>
-                            </exchanges>
-                        </publish>
-
-                        <!-- This section grants users the ability to consume from the broker -->
-                        <consume>
-                            <queues>
-                                <temporary>
-                                    <users>
-                                        <user>client</user>
-                                    </users>
-                                </temporary>
-
-                                <!-- Only allow the server to consume from the Request Queue-->
-                                <queue>
-                                    <name>example.RequestQueue</name>
-                                    <users>
-                                        <user>server</user>
-                                    </users>
-                                </queue>
-
-
-                            </queues>
-                        </consume>
-
-                        <!-- This section grants users the ability to create queues and exchanges -->
-                        <create>
-                            <queues>
-                                <temporary>
-                                    <users>
-                                        <user>client</user>
-                                    </users>
-                                </temporary>
-
-                                <!-- Allow clients to create queue on this exchange-->
-                                <queue>
-                                    <exchanges>                                    
-                                        <exchange>
-                                            <name>amq.direct</name>
-                                            <users>
-                                                <user>client</user>
-                                            </users>
-                                        </exchange>
-                                    </exchanges>
-                                </queue>
-                                <!-- Allow the server to create the Request Queue-->
-                                <queue>
-                                    <name>example.RequestQueue</name>
-                                    <users>
-                                        <user>server</user>
-                                    </users>
-                                </queue>
-
-                            </queues>
-                        </create>
-
-
-                    </access_control_list>
-
-                </security>
-            </test>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test2</name>
-            <test2>
-                <security>
-                    <access>
-                        <class>org.apache.qpid.server.security.access.plugins.SimpleXML</class>
-                    </access>
-                    
-                    <access_control_list>
-                        <!-- This section grants specific users full permissions to all artifacts in this virtualhost -->
-                        <access>
-                            <users>
-                                <user>guest</user>
-                            </users>
-                        </access>
-                    </access_control_list>
-                </security>
-            </test2>
-        </virtualhost>
-    </virtualhosts>
+    <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-acl.xml</virtualhosts>
 </broker>
 
 
diff --git a/qpid/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml
index 34104dbe6b..535108235e 100644
--- a/qpid/java/systests/etc/config-systests-acl.xml
+++ b/qpid/java/systests/etc/config-systests-acl.xml
@@ -22,7 +22,7 @@
 <configuration>
     <system/>
     <override>
-        <xml fileName="${test.config}" config-optional="true"/>
+        <xml fileName="${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-acl-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config.xml"/>
diff --git a/qpid/java/systests/etc/config-systests-derby-settings.xml b/qpid/java/systests/etc/config-systests-derby-settings.xml
index 9c25b5682e..3ed3a9e33b 100644
--- a/qpid/java/systests/etc/config-systests-derby-settings.xml
+++ b/qpid/java/systests/etc/config-systests-derby-settings.xml
@@ -20,45 +20,7 @@
  -
  -->
 <broker>
-    <virtualhosts>
-        <directory>${conf}/virtualhosts</directory>
-
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
-                    <environment-path>${work}/derbyDB/localhost-store</environment-path>
-                </store>
-
-                <housekeeping>
-                    <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
-                </housekeeping>
-
-            </localhost>
-        </virtualhost>
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-                <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
-                    <environment-path>${work}/derbyDB/development-store</environment-path>                                        
-                </store>
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
-                    <environment-path>${work}/derbyDB/test-store</environment-path>
-                </store>
-            </test>
-        </virtualhost>
-
-    </virtualhosts>
+    <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-derby.xml</virtualhosts>
 </broker>
 
 
diff --git a/qpid/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
index 18ba0c4ad9..ba27a0c020 100644
--- a/qpid/java/systests/etc/config-systests-derby.xml
+++ b/qpid/java/systests/etc/config-systests-derby.xml
@@ -22,7 +22,7 @@
 <configuration>
     <system/>
     <override>
-        <xml fileName="${test.config}" config-optional="true"/>
+        <xml fileName="${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-derby-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config.xml"/>
diff --git a/qpid/java/systests/etc/config-systests-firewall-2.xml b/qpid/java/systests/etc/config-systests-firewall-2.xml
index 1c560d751d..8380fab3d9 100644
--- a/qpid/java/systests/etc/config-systests-firewall-2.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-2.xml
@@ -96,32 +96,8 @@
         </firewall>
     </security>
 
-    <virtualhosts>
-        <default>test</default>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore
-                    </class>
-                </store>
-                <security>
-                    <firewall default-action="allow"/>
-		</security>
-            </test>
-        </virtualhost>
- 
-        <virtualhost>
-            <name>test2</name>
-            <test2>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore
-                    </class>
-                </store>
-            </test2>
-        </virtualhost>
-    </virtualhosts>
+    <virtualhosts>${conf}/virtualhosts-systests-firewall-2.xml</virtualhosts>
+    
     <heartbeat>
         <delay>0</delay>
         <timeoutFactor>2.0</timeoutFactor>
diff --git a/qpid/java/systests/etc/config-systests-firewall-3.xml b/qpid/java/systests/etc/config-systests-firewall-3.xml
index 05c4df6069..2068581ca1 100644
--- a/qpid/java/systests/etc/config-systests-firewall-3.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-3.xml
@@ -96,32 +96,8 @@
         </firewall>
     </security>
 
-    <virtualhosts>
-        <default>test</default>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore
-                    </class>
-                </store>
-            </test>
-        </virtualhost>
- 
-        <virtualhost>
-            <name>test2</name>
-            <test2>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore
-                    </class>
-                </store>
-                <security>
-	            <firewall default-action="deny"/>
-	        </security>
-            </test2>
-        </virtualhost>
-    </virtualhosts>
+    <virtualhosts>${conf}/virtualhosts-systests-firewall-3.xml</virtualhosts>
+    
     <heartbeat>
         <delay>0</delay>
         <timeoutFactor>2.0</timeoutFactor>
diff --git a/qpid/java/systests/etc/config-systests-firewall-settings.xml b/qpid/java/systests/etc/config-systests-firewall-settings.xml
index d115e74663..aa73be0646 100644
--- a/qpid/java/systests/etc/config-systests-firewall-settings.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-settings.xml
@@ -25,4 +25,6 @@
         <rule access="allow" network="127.0.0.1"/>
     </firewall>
     </security>
+    
+    <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-firewall.xml</virtualhosts>
 </broker>
diff --git a/qpid/java/systests/etc/config-systests-firewall.xml b/qpid/java/systests/etc/config-systests-firewall.xml
index 90773f5cc2..c0ce71210f 100644
--- a/qpid/java/systests/etc/config-systests-firewall.xml
+++ b/qpid/java/systests/etc/config-systests-firewall.xml
@@ -22,8 +22,9 @@
 <configuration>
     <system/>
     <override>
-        <xml fileName="${test.config}" config-optional="true"/>
-        <xml fileName="${QPID_FIREWALL_SETTINGS}"/>
+        <xml fileName="${test.config}" optional="true"/>
+        <xml fileName="${QPID_FIREWALL_CONFIG_SETTINGS}" optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/config-systests-firewall-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config.xml"/>                
     </override>
diff --git a/qpid/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml
index 4e9c863fda..a7f538aec1 100644
--- a/qpid/java/systests/etc/config-systests-settings.xml
+++ b/qpid/java/systests/etc/config-systests-settings.xml
@@ -26,4 +26,5 @@
             <enabled>false</enabled>
         </ssl>
     </management>
+    <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests.xml</virtualhosts>
 </broker>
diff --git a/qpid/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
index 290c082a4f..5d7d878e76 100644
--- a/qpid/java/systests/etc/config-systests.xml
+++ b/qpid/java/systests/etc/config-systests.xml
@@ -22,7 +22,7 @@
 <configuration>
     <system/>
     <override>
-        <xml fileName="${test.config}" config-optional="true"/>
+        <xml fileName="${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config.xml"/>                
     </override>
diff --git a/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
index 168aa074da..1b6845662b 100644
--- a/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
+++ b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
@@ -26,7 +26,7 @@
         <dev-only>            
             <queues>
                 <exchange>amq.direct</exchange>
-		<!-- Small defaults for development -->
+                <!-- Small defaults for development -->
                 <maximumQueueDepth>102400</maximumQueueDepth>  <!-- 100k -->
                 <maximumMessageSize>20480</maximumMessageSize> <!-- 20kb -->
                 <maximumMessageAge>60000</maximumMessageAge>  <!-- 1 mins -->
@@ -35,6 +35,11 @@
                     <name>dev-queue</name>
                 </queue>
             </queues>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                <environment-path>${QPID_WORK}/bdbstore/dev-only-store</environment-path>
+            </store>
         </dev-only>
     </virtualhost>
 </virtualhosts>
+ 
\ No newline at end of file
diff --git a/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
new file mode 100644
index 0000000000..50fda4e999
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+    <virtualhost>
+        <name>test</name>
+        <test>
+            <queues>
+                <exchange>amq.direct</exchange>
+                <!-- 4Mb -->
+                <maximumQueueDepth>4235264</maximumQueueDepth>
+                <!-- 2Mb -->
+                <maximumMessageSize>2117632</maximumMessageSize>
+                <!-- 10 mins -->
+                <maximumMessageAge>600000</maximumMessageAge>
+            </queues>
+
+
+            <security>
+                <access>
+                    <class>org.apache.qpid.server.security.access.plugins.SimpleXML</class>
+                </access>
+                <access_control_list>
+                    <!-- This section grants pubish rights to an exchange + routing key pair -->
+                    <publish>
+                        <exchanges>
+                            <exchange>
+                                <name>amq.direct</name>
+                                <routing_keys>
+
+                                    <!-- Allow clients to publish requests -->
+                                    <routing_key>
+                                        <value>example.RequestQueue</value>
+                                        <users>
+                                            <user>client</user>
+                                        </users>
+                                    </routing_key>
+
+                                    <!-- Allow the processor to respond to a client on their Temporary Topic -->
+                                    <routing_key>
+                                        <value>tmp_*</value>
+                                        <users>
+                                            <user>server</user>
+                                        </users>
+                                    </routing_key>
+                                    <routing_key>
+                                        <value>TempQueue*</value>
+                                        <users>
+                                            <user>server</user>
+                                        </users>
+                                    </routing_key>
+                                </routing_keys>
+
+                            </exchange>
+                        </exchanges>
+                    </publish>
+
+                    <!-- This section grants users the ability to consume from the broker -->
+                    <consume>
+                        <queues>
+                            <temporary>
+                                <users>
+                                    <user>client</user>
+                                </users>
+                            </temporary>
+
+                            <!-- Only allow the server to consume from the Request Queue-->
+                            <queue>
+                                <name>example.RequestQueue</name>
+                                <users>
+                                    <user>server</user>
+                                </users>
+                            </queue>
+
+
+                        </queues>
+                    </consume>
+
+                    <!-- This section grants users the ability to create queues and exchanges -->
+                    <create>
+                        <queues>
+                            <temporary>
+                                <users>
+                                    <user>client</user>
+                                </users>
+                            </temporary>
+
+                            <!-- Allow clients to create queue on this exchange-->
+                            <queue>
+                                <exchanges>                                    
+                                    <exchange>
+                                        <name>amq.direct</name>
+                                        <users>
+                                            <user>client</user>
+                                        </users>
+                                    </exchange>
+                                </exchanges>
+                            </queue>
+                            <!-- Allow the server to create the Request Queue-->
+                            <queue>
+                                <name>example.RequestQueue</name>
+                                <users>
+                                    <user>server</user>
+                                </users>
+                            </queue>
+
+                        </queues>
+                    </create>
+
+
+                </access_control_list>
+
+            </security>
+        </test>
+    </virtualhost>
+
+    <virtualhost>
+        <name>test2</name>
+        <test2>
+            <security>
+                <access>
+                    <class>org.apache.qpid.server.security.access.plugins.SimpleXML</class>
+                </access>
+                
+                <access_control_list>
+                    <!-- This section grants specific users full permissions to all artifacts in this virtualhost -->
+                    <access>
+                        <users>
+                            <user>guest</user>
+                        </users>
+                    </access>
+                </access_control_list>
+            </security>
+        </test2>
+    </virtualhost>
+</virtualhosts>
+
+
diff --git a/qpid/java/systests/etc/virtualhosts-systests-acl.xml b/qpid/java/systests/etc/virtualhosts-systests-acl.xml
new file mode 100644
index 0000000000..4a56c39de0
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-acl.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<configuration>
+    <system/>
+    <override>
+        <xml fileName="${test.virtualhosts}" optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-acl-settings.xml"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+    </override>
+</configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
new file mode 100644
index 0000000000..ed5ffbb1fd
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+    <directory>${QPID_HOME}/virtualhosts</directory>
+    <default>test</default>
+    
+    <virtualhost>
+        <localhost>
+            <store>
+                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                <environment-path>${QPID_WORK}/derbyDB/localhost-store</environment-path>
+            </store>
+        </localhost>
+    </virtualhost>
+
+    <virtualhost>
+        <development>
+            <store>
+                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                <environment-path>${QPID_WORK}/derbyDB/development-store</environment-path>                                        
+            </store>
+        </development>
+    </virtualhost>
+
+    <virtualhost>
+        <test>
+            <store>
+                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                <environment-path>${QPID_WORK}/derbyDB/test-store</environment-path>
+            </store>
+        </test>
+    </virtualhost>
+</virtualhosts>
+
+
diff --git a/qpid/java/systests/etc/virtualhosts-systests-derby.xml b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
new file mode 100644
index 0000000000..171be37416
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<configuration>
+    <system/>
+    <override>
+        <xml fileName="${test.virtualhosts}" optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-derby-settings.xml"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+    </override>
+</configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
new file mode 100644
index 0000000000..b85ab83676
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+    <default>test</default>
+
+    <virtualhost>
+        <name>test</name>
+        <test>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore
+                </class>
+            </store>
+            <security>
+                <firewall default-action="allow"/>
+            </security>
+        </test>
+    </virtualhost>
+
+    <virtualhost>
+        <name>test2</name>
+        <test2>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore
+                </class>
+            </store>
+        </test2>
+    </virtualhost>
+</virtualhosts>
\ No newline at end of file
diff --git a/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
new file mode 100644
index 0000000000..ebfc2bad20
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+    <default>test</default>
+
+    <virtualhost>
+        <name>test</name>
+        <test>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore
+                </class>
+            </store>
+        </test>
+    </virtualhost>
+
+    <virtualhost>
+        <name>test2</name>
+        <test2>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore
+                </class>
+            </store>
+            <security>
+         <firewall default-action="deny"/>
+     </security>
+        </test2>
+    </virtualhost>
+</virtualhosts>
+
+
diff --git a/qpid/java/systests/etc/virtualhosts-systests-firewall.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
new file mode 100644
index 0000000000..51ab6739b3
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<configuration>
+    <system/>
+    <override>
+        <xml fileName="${test.virtualhosts}" optional="true"/>
+        <xml fileName="${QPID_FIREWALL_VIRTUALHOSTS_SETTINGS}" optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>                
+    </override>
+</configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests.xml b/qpid/java/systests/etc/virtualhosts-systests.xml
new file mode 100644
index 0000000000..71f1cc9889
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<configuration>
+    <system/>
+    <override>
+        <xml fileName="${test.virtualhosts}" optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>                
+    </override>
+</configuration>