Merged from trunk up to r816580

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-0-10@821779 13f79535-47bb-0310-9956-ffa450edef68
author: Robert Godfrey <rgodfrey@apache.org> 2009-10-05 12:51:57 +0000
committer: Robert Godfrey <rgodfrey@apache.org> 2009-10-05 12:51:57 +0000
commit: f67026b148b3429ca9731bce94a0bd3ff2981ce5 (patch)
tree: 95e7dfcfff6640d83b4171520bffb4d4b2304b9a /qpid/java
parent: 69e05a6b0979d2e12588635a4ed46a09a87cdec0 (diff)
download: qpid-python-f67026b148b3429ca9731bce94a0bd3ff2981ce5.tar.gz
64 files changed, 2047 insertions, 1804 deletions
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index 63b30b5e71..b84580da60 100755
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -1,35 +1,35 @@
-#!/bin/bash
-#
-# 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.
-#
-
-if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
-fi
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.tools.security.Passwd "$@"
+#!/bin/bash
+#
+# 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.
+#
+
+if [ -z "$QPID_HOME" ]; then
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
+
+# Set other variables used by the qpid-run script before calling
+export JAVA=java \
+       JAVA_VM=-server \
+       JAVA_MEM=-Xmx1024m \
+       QPID_CLASSPATH=$QPID_LIBS
+
+. qpid-run org.apache.qpid.tools.security.Passwd "$@"
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index e5a9e998e2..738fc6e084 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -26,14 +26,19 @@ fi
 # Set classpath to include Qpid jar with all required jars in manifest
 QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar
 
+# Default Log4j to append to its log file
+if [ -z "$QPID_LOG_APPEND" ]; then
+    export QPID_LOG_APPEND="true"
+fi
+
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM=-Xmx1024m \
        JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
        QPID_CLASSPATH=$QPID_LIBS \
-       QPID_RUN_LOG=2
+       QPID_RUN_LOG=2 
 
-QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32"
+QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG_APPEND"
 
 . qpid-run org.apache.qpid.server.Main "$@"
diff --git a/qpid/java/broker/etc/config-systests-derby.xml b/qpid/java/broker/etc/config-systests-derby.xml
deleted file mode 100644
index e9cfa04ab5..0000000000
--- a/qpid/java/broker/etc/config-systests-derby.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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.
- -
- -->
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
-             to enable SSL support
-        <ssl>
-            <enabled>true</enabled>
-            <sslOnly>true</sslOnly>
-            <keystorePath>/path/to/keystore.ks</keystorePath>
-            <keystorePassword>keystorepass</keystorePassword>
-        </ssl>-->
-        <qpidnio>false</qpidnio>
-        <protectio>
-            <enabled>false</enabled>
-        </protectio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>false</enabled>
-        <jmxport>8999</jmxport>
-        <ssl>
-            <enabled>false</enabled>
-            <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore  -->
-            <keyStorePath>${prefix}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath>
-            <keyStorePassword>password</keyStorePassword>
-        </ssl>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed -->
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwd</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-        </principal-databases>
-
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-        </access>
-        
-        <msg-auth>false</msg-auth>
-        
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>
-    </security>
-
-    <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>
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <virtualhosts>${conf}/virtualhosts-systests.xml</virtualhosts>
-</broker>
-
-
diff --git a/qpid/java/broker/etc/config-systests.xml b/qpid/java/broker/etc/config-systests.xml
deleted file mode 100644
index 42e8c9dbba..0000000000
--- a/qpid/java/broker/etc/config-systests.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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.
- -
- -->
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
-             to enable SSL support
-        <ssl>
-            <enabled>true</enabled>
-            <sslOnly>true</sslOnly>
-            <keystorePath>/path/to/keystore.ks</keystorePath>
-            <keystorePassword>keystorepass</keystorePassword>
-        </ssl>-->
-        <qpidnio>false</qpidnio>
-        <protectio>
-            <enabled>false</enabled>
-            <readBufferLimitSize>262144</readBufferLimitSize>
-            <writeBufferLimitSize>262144</writeBufferLimitSize>
-        </protectio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>false</enabled>
-        <jmxport>8999</jmxport>
-        <ssl>
-            <enabled>false</enabled>
-            <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore  -->
-            <keyStorePath>${prefix}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath>
-            <keyStorePassword>password</keyStorePassword>
-        </ssl>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
-        <locale>en_US</locale>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed -->
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwd</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-        </principal-databases>
-
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-        </access>
-        
-        <msg-auth>false</msg-auth>
-        
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>
-    </security>
-
-    <virtualhosts>
-        <directory>${conf}/virtualhosts</directory>
-
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-
-                <housekeeping>
-                    <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
-                </housekeeping>
-
-            </localhost>
-        </virtualhost>
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-            </test>
-        </virtualhost>
-
-    </virtualhosts>
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <status-updates>ON</status-updates>
-
-    <virtualhosts>${conf}/virtualhosts-systests.xml</virtualhosts>
-</broker>
-
-
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
index 928b773606..8fb3a8cf5a 100644
--- a/qpid/java/broker/etc/config.xml
+++ b/qpid/java/broker/etc/config.xml
@@ -24,17 +24,20 @@
     <work>${QPID_WORK}</work>
     <conf>${prefix}/etc</conf>
     <connector>
-        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
-             to enable SSL support
+        <!-- To enable SSL edit the keystorePath and keystorePassword
+	     and set enabled to true. 
+             To disasble Non-SSL port set sslOnly to true -->
         <ssl>
-            <enabled>true</enabled>
-            <sslOnly>true</sslOnly>
+            <enabled>false</enabled>
+            <sslOnly>false</sslOnly>
             <keystorePath>/path/to/keystore.ks</keystorePath>
             <keystorePassword>keystorepass</keystorePassword>
-        </ssl>-->
+        </ssl>
         <qpidnio>false</qpidnio>
         <protectio>
             <enabled>false</enabled>
+            <readBufferLimitSize>262144</readBufferLimitSize>
+            <writeBufferLimitSize>262144</writeBufferLimitSize>	    
         </protectio>
         <transport>nio</transport>
         <port>5672</port>
@@ -59,6 +62,7 @@
         <framesize>65535</framesize>
         <compressBufferOnQueue>false</compressBufferOnQueue>
         <enableJMSXUserID>false</enableJMSXUserID>
+        <locale>en_US</locale>	
     </advanced>
 
     <security>
@@ -89,40 +93,143 @@
     </security>
 
     <virtualhosts>
-        <directory>${conf}/virtualhosts</directory>
 
+        <default>test</default>
         <virtualhost>
             <name>localhost</name>
             <localhost>
                 <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore
+                    </class>
                 </store>
 
                 <housekeeping>
                     <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
                 </housekeeping>
 
+                <exchanges>
+                    <exchange>
+                        <type>direct</type>
+                        <name>test.direct</name>
+                        <durable>true</durable>
+                    </exchange>
+                    <exchange>
+                        <type>topic</type>
+                        <name>test.topic</name>
+                    </exchange>
+                </exchanges>
+                <queues>
+                    <exchange>amq.direct</exchange>
+                    <maximumQueueDepth>4235264</maximumQueueDepth>
+                    <!-- 4Mb -->
+                    <maximumMessageSize>2117632</maximumMessageSize>
+                    <!-- 2Mb -->
+                    <maximumMessageAge>600000</maximumMessageAge>
+                    <!-- 10 mins -->
+                    <maximumMessageCount>50</maximumMessageCount>
+                    <!-- 50 messages -->
+
+                    <queue>
+                        <name>queue</name>
+                    </queue>
+                    <queue>
+                        <name>ping</name>
+                    </queue>
+                    <queue>
+                        <name>test-queue</name>
+                        <test-queue>
+                            <exchange>test.direct</exchange>
+                            <durable>true</durable>
+                        </test-queue>
+                    </queue>
+                    <queue>
+                        <name>test-ping</name>
+                        <test-ping>
+                            <exchange>test.direct</exchange>
+                        </test-ping>
+                    </queue>
+
+                </queues>
             </localhost>
         </virtualhost>
 
+
         <virtualhost>
             <name>development</name>
             <development>
                 <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore
+                    </class>
                 </store>
+
+                <queues>
+                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                    <maximumMessageCount>50</maximumMessageCount>
+                    <queue>
+                        <name>queue</name>
+                        <queue>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>
+                            <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize>
+                            <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>
+                            <!-- 10 mins -->
+                        </queue>
+                    </queue>
+                    <queue>
+                        <name>ping</name>
+                        <ping>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>
+                            <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize>
+                            <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>
+                            <!-- 10 mins -->
+                        </ping>
+                    </queue>
+                </queues>
             </development>
         </virtualhost>
-
         <virtualhost>
             <name>test</name>
             <test>
                 <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore
+                    </class>
                 </store>
+
+                <queues>
+                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                    <maximumMessageCount>50</maximumMessageCount>
+                    <queue>
+                        <name>queue</name>
+                        <queue>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>
+                            <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize>
+                            <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>
+                            <!-- 10 mins -->
+                        </queue>
+                    </queue>
+                    <queue>
+                        <name>ping</name>
+                        <ping>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>
+                            <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize>
+                            <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>
+                            <!-- 10 mins -->
+                        </ping>
+                    </queue>
+                </queues>
             </test>
         </virtualhost>
-
     </virtualhosts>
     <heartbeat>
         <delay>0</delay>
@@ -132,7 +239,8 @@
         <auto_register>true</auto_register>
     </queue>
 
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
+    <status-updates>ON</status-updates>
+
 </broker>
 
 
diff --git a/qpid/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
index a395d0fd56..8ca43ededd 100644
--- a/qpid/java/broker/etc/log4j.xml
+++ b/qpid/java/broker/etc/log4j.xml
@@ -50,7 +50,7 @@
 
     <appender class="org.apache.log4j.FileAppender" name="FileAppender">
         <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
+        <param name="Append" value="${QPID_LOG_APPEND}"/>
 
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
diff --git a/qpid/java/broker/etc/virtualhosts-systests.xml b/qpid/java/broker/etc/virtualhosts-systests.xml
deleted file mode 100644
index 4f23f55579..0000000000
--- a/qpid/java/broker/etc/virtualhosts-systests.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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>localhost</name>
-        <localhost>            
-            <exchanges>
-                <exchange>
-                    <type>direct</type>
-                    <name>test.direct</name>
-                    <durable>true</durable>
-                </exchange>
-                <exchange>
-                    <type>topic</type>
-                    <name>test.topic</name>
-                </exchange>
-            </exchanges>
-            <queues>
-                <exchange>amq.direct</exchange>
-                <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                <maximumMessageCount>50</maximumMessageCount> <!-- 50 messages -->
-
-                <queue>
-                    <name>queue</name>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                </queue>
-                <queue>
-                    <name>test-queue</name>
-                    <test-queue>
-                        <exchange>test.direct</exchange>
-                        <durable>true</durable>
-                    </test-queue>
-                </queue>
-                <queue>
-                    <name>test-ping</name>
-                    <test-ping>
-                        <exchange>test.direct</exchange>
-                    </test-ping>
-                </queue>
-
-            </queues>
-        </localhost>
-    </virtualhost>
-
-
-    <virtualhost>
-        <name>development</name>
-        <development>
-            <queues>
-                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                <maximumMessageCount>50</maximumMessageCount>
-                <queue>
-                    <name>queue</name>
-                    <queue>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </queue>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                    <ping>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </ping>
-                </queue>
-            </queues>
-        </development>
-    </virtualhost>
-        <virtualhost>
-            <name>test</name>
-            <test>                
-                <queues>
-                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                    <maximumMessageCount>50</maximumMessageCount>
-                    <queue>
-                        <name>queue</name>
-                        <queue>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </queue>
-                    </queue>
-                    <queue>
-                        <name>ping</name>
-                        <ping>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </ping>
-                    </queue>
-                </queues>
-            </test>
-    </virtualhost>
-</virtualhosts>
diff --git a/qpid/java/broker/etc/virtualhosts.xml b/qpid/java/broker/etc/virtualhosts.xml
deleted file mode 100644
index f62ec3f5d7..0000000000
--- a/qpid/java/broker/etc/virtualhosts.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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>localhost</name>
-        <localhost>            
-            <exchanges>
-                <exchange>
-                    <type>direct</type>
-                    <name>test.direct</name>
-                    <durable>true</durable>
-                </exchange>
-                <exchange>
-                    <type>topic</type>
-                    <name>test.topic</name>
-                </exchange>
-            </exchanges>
-            <queues>
-                <exchange>amq.direct</exchange>
-                <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-
-                <queue>
-                    <name>queue</name>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                </queue>
-                <queue>
-                    <name>test-queue</name>
-                    <test-queue>
-                        <exchange>test.direct</exchange>
-                        <durable>true</durable>
-                    </test-queue>
-                </queue>
-                <queue>
-                    <name>test-ping</name>
-                    <test-ping>
-                        <exchange>test.direct</exchange>
-                    </test-ping>
-                </queue>
-
-            </queues>
-        </localhost>
-    </virtualhost>
-
-
-    <virtualhost>
-        <name>development</name>
-        <development>
-            <queues>
-                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                <maximumMessageCount>5000</maximumMessageCount>
-                <queue>
-                    <name>queue</name>
-                    <queue>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </queue>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                    <ping>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </ping>
-                </queue>
-            </queues>
-        </development>
-    </virtualhost>
-        <virtualhost>
-            <name>test</name>
-            <test>                
-                <queues>
-                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                    <maximumMessageCount>5000</maximumMessageCount>
-                    <queue>
-                        <name>queue</name>
-                        <queue>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </queue>
-                    </queue>
-                    <queue>
-                        <name>ping</name>
-                        <ping>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </ping>
-                    </queue>
-                </queues>
-            </test>
-    </virtualhost>
-</virtualhosts>
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 2afd3c1dc3..5cfa8066e5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -317,8 +317,10 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
         try
         {
             queue.delete();
-            _messageStore.removeQueue(queue);
-
+            if (queue.isDurable())
+            {
+                _messageStore.removeQueue(queue);
+            }
         }
         catch (AMQException ex)
         {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 7ea7738189..ed9d8acc08 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -147,32 +147,27 @@ public class ServerConfiguration implements SignalHandler
             Object thing = i.next();
             if (thing instanceof String)
             {
+                //Open the Virtualhost.xml file and copy values in to main config
                 XMLConfiguration vhostConfiguration = new XMLConfiguration((String) thing);
-                List hosts = vhostConfiguration.getList("virtualhost.name");
-                    for (int j = 0; j < hosts.size(); j++)
-                {
-                    String name = (String) hosts.get(j);
-                    // Add the keys of the virtual host to the main config then bail out
-
-                    Configuration myConf = vhostConfiguration.subset("virtualhost." + name);
-                    Iterator k = myConf.getKeys();
-                    while (k.hasNext())
-                    {
-                        String key = (String) k.next();
-                        conf.setProperty("virtualhosts.virtualhost."+name+"."+key, myConf.getProperty(key));
-                    }
-                    VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost."+name));
-                    _virtualHosts.put(vhostConfig.getName(), vhostConfig);
-                }
-                // Grab things other than the virtualhosts themselves
                 Iterator keys = vhostConfiguration.getKeys();
                 while (keys.hasNext())
                 {
                     String key = (String) keys.next();
-                    conf.setProperty("virtualhosts."+key, vhostConfiguration.getProperty(key));
+                    conf.setProperty("virtualhosts." + key, vhostConfiguration.getProperty(key));
                 }
             }
         }
+
+        List hosts = conf.getList("virtualhosts.virtualhost.name");
+        for (int j = 0; j < hosts.size(); j++)
+        {
+            String name = (String) hosts.get(j);
+            // Add the keys of the virtual host to the main config then bail out
+
+            VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, conf.subset("virtualhosts.virtualhost." + name));
+            _virtualHosts.put(vhostConfig.getName(), vhostConfig);
+        }
+
     }
 
     private void substituteEnvironmentVariables()
@@ -202,7 +197,7 @@ public class ServerConfiguration implements SignalHandler
     }
 
     /**
-     * Check the configuration file to see if status updates are enabled.  
+     * Check the configuration file to see if status updates are enabled.
      * @return true if status updates are enabled
      */
     public boolean getStatusUpdatesEnabled()
@@ -466,7 +461,7 @@ public class ServerConfiguration implements SignalHandler
     {
         return getConfig().getBoolean("management.enabled", true);
     }
- 
+
     public void setManagementEnabled(boolean enabled)
     {
         getConfig().setProperty("management.enabled", enabled);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/StartupRootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/StartupRootMessageLogger.java
index 0dffde50fa..bfb122985b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/StartupRootMessageLogger.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/StartupRootMessageLogger.java
@@ -39,4 +39,11 @@ public class StartupRootMessageLogger extends RootMessageLoggerImpl
         return true;
     }
 
+    @Override
+    public boolean isMessageEnabled(LogActor actor)
+    {
+        return true;
+    }
+
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 42b3b05ac5..aea9ab43ea 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
@@ -379,6 +379,8 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
             try
             {
                 _cs.stop();
+                CurrentActor.get().message(ManagementConsoleMessages.MNG_1003("RMI Registry", _cs.getAddress().getPort() - PORT_EXPORT_OFFSET));
+                CurrentActor.get().message(ManagementConsoleMessages.MNG_1003("RMI ConnectorServer", _cs.getAddress().getPort()));
             }
             catch (IOException e)
             {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicACLPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicACLPlugin.java
index 5f52805414..569dd8bdbd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicACLPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicACLPlugin.java
@@ -109,10 +109,4 @@ public abstract class BasicACLPlugin implements ACLPlugin
         // no-op
     }
 
-    public boolean supportsTag(String name)
-    {
-        // This plugin doesn't support any tags
-        return false;
-    }
-
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java
deleted file mode 100644
index a1a399e5bf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.server.security.access.plugins.network;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.security.access.ACLPlugin;
-import org.apache.qpid.server.security.access.ACLPluginFactory;
-
-public class FirewallFactory implements ACLPluginFactory
-{
-
-    @Override
-    public ACLPlugin newInstance(Configuration config) throws ConfigurationException
-    {
-        FirewallPlugin plugin = new FirewallPlugin();
-        plugin.setConfiguration(config);
-        return plugin;
-    }
-
-    @Override
-    public boolean supportsTag(String name)
-    {
-        return name.equals("firewall");
-    }
-    
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index fa6b2285eb..9ab3592628 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -195,10 +195,22 @@ public class VirtualHost implements Accessable
         // perform a createExchange twice with the same details in the
         // MessageStore(RoutingTable) as some instances may not like that.
         // Derby being one.
+        // todo this can be removed with the resolution fo QPID-2096
         configFileRT.exchange.clear();
         
         initialiseModel(hostConfig);
 
+        //todo REMOVE Work Around for QPID-2096
+        // This means that all durable exchanges declared in the configuration
+        // will not be stored in the MessageStore.
+        // They will still be created/registered/available on startup for as
+        // long as they are contained in the configuration. However, when they
+        // are removed from the configuration they will no longer exist.
+        // This differs from durable queues as they will be writen to to the
+        // store. After QPID-2096 has been resolved exchanges will mirror that
+        // functionality.
+        configFileRT.exchange.clear();
+
         if (store != null)
         {
             _messageStore = store;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 8cb0837b39..ebfa80d139 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -54,7 +54,7 @@ public class ServerConfigurationTest extends TestCase
 
         _config = new XMLConfiguration();
     }
-    
+
     @Override
     public void tearDown() throws Exception
     {
@@ -727,7 +727,7 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(true, config.getQpidNIO()); // From the second file, not
                                                  // present in the first
     }
-    
+
     public void testVariableInterpolation() throws Exception
     {
         File mainFile = File.createTempFile(getClass().getName(), null);
@@ -742,7 +742,7 @@ public class ServerConfigurationTest extends TestCase
         out.close();
 
         ServerConfiguration config = new ServerConfiguration(mainFile.getAbsoluteFile());
-        assertEquals("Did not get correct interpolated value", 
+        assertEquals("Did not get correct interpolated value",
                 "foo", config.getManagementKeyStorePath());
     }
 
@@ -783,7 +783,7 @@ public class ServerConfigurationTest extends TestCase
         out.write("\t</virtualhosts>\n");
         out.write("</broker>\n");
         out.close();
-        
+
         // Load config
         ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile);
         ApplicationRegistry.initialise(reg, 1);
@@ -795,15 +795,15 @@ public class ServerConfigurationTest extends TestCase
 
         TestIoSession iosession = new TestIoSession();
         iosession.setAddress("127.0.0.1");
-        
+
         AMQProtocolSession session = new AMQMinaProtocolSession(iosession, virtualHostRegistry, codecFactory);
         assertFalse(reg.getAccessManager().authoriseConnect(session, virtualHost));
-        
+
         iosession.setAddress("127.1.2.3");
         session = new AMQMinaProtocolSession(iosession, virtualHostRegistry, codecFactory);
         assertTrue(reg.getAccessManager().authoriseConnect(session, virtualHost));
     }
-    
+
     public void testCombinedConfigurationFirewall() throws Exception
     {
         // Write out config
@@ -870,7 +870,7 @@ public class ServerConfigurationTest extends TestCase
 
         TestIoSession iosession = new TestIoSession();
         iosession.setAddress("127.0.0.1");
-        
+
         AMQProtocolSession session = new AMQMinaProtocolSession(iosession, virtualHostRegistry, codecFactory);
         assertFalse(reg.getAccessManager().authoriseConnect(session, virtualHost));
     }
@@ -947,22 +947,22 @@ public class ServerConfigurationTest extends TestCase
         fileBRandom.setLength(0);
         fileBRandom.seek(0);
         fileBRandom.close();
-        
+
         out = new FileWriter(fileB);
         out.write("<firewall>\n");
         out.write("\t<rule access=\"allow\" network=\"127.0.0.1\"/>");
         out.write("</firewall>\n");
         out.close();
-        
+
         reg.getConfiguration().reparseConfigFile();
-        
+
         assertTrue(reg.getAccessManager().authoriseConnect(session, virtualHost));
-        
+
         fileBRandom = new RandomAccessFile(fileB, "rw");
         fileBRandom.setLength(0);
         fileBRandom.seek(0);
         fileBRandom.close();
-        
+
         out = new FileWriter(fileB);
         out.write("<firewall>\n");
         out.write("\t<rule access=\"deny\" network=\"127.0.0.1\"/>");
@@ -970,17 +970,17 @@ public class ServerConfigurationTest extends TestCase
         out.close();
         
         reg.getConfiguration().reparseConfigFile();
-        
+
         assertFalse(reg.getAccessManager().authoriseConnect(session, virtualHost));
     }
 
     public void testnewParserOutputVsOldParserOutput() throws ConfigurationException
     {
         String configDir = System.getProperty("QPID_HOME")+"/etc";
-        
-        XMLConfiguration oldConfig = new XMLConfiguration(configDir +"/sample-parsed-config.xml");
-        Configuration newConfig = new ServerConfiguration(new File(configDir+"/persistent_config-config-test.xml")).getConfig();
-        
+
+        XMLConfiguration oldConfig = new XMLConfiguration(configDir +"/config-systests-ServerConfigurationTest-Old.xml");
+        Configuration newConfig = new ServerConfiguration(new File(configDir+"/config-systests-ServerConfigurationTest-New.xml")).getConfig();
+
         Iterator xmlKeys = oldConfig.getKeys();
         while (xmlKeys.hasNext())
         {
@@ -988,6 +988,21 @@ public class ServerConfigurationTest extends TestCase
             assertEquals("Incorrect value for "+key, oldConfig.getProperty(key), newConfig.getProperty(key));
         }
     }
-    
-    
+
+
+    public void testNoVirtualhostXMLFile() throws Exception
+    {
+        int REGISTRY=1;
+
+        File configFile = new File(System.getProperty("QPID_HOME")+"/etc/config.xml");
+        assertTrue(configFile.exists());
+
+        ApplicationRegistry.initialise(new ConfigurationFileApplicationRegistry(configFile), REGISTRY);
+
+        VirtualHostRegistry virtualHostRegistry = ApplicationRegistry.getInstance(REGISTRY).getVirtualHostRegistry();
+
+        assertEquals("Incorrect virtualhost count", 3 , virtualHostRegistry.getVirtualHosts().size());
+    }
+
+
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ExchangeDenier.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ExchangeDenier.java
index a964fa931c..0e754e2c87 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ExchangeDenier.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ExchangeDenier.java
@@ -47,17 +47,4 @@ public class ExchangeDenier extends AllowAll
     {
         return AuthzResult.DENIED;
     }
-
-    @Override
-    public String getPluginName()
-    {
-        return getClass().getSimpleName();
-    }
-
-    @Override
-    public boolean supportsTag(String name)
-    {
-        return name.equals("exchangeDenier");
-    }
-
 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
index 05ac3dca9e..6bae0166d1 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
@@ -39,9 +39,4 @@ public class AMQAuthenticationException extends AMQException
     {
         super(error, msg, cause);
     }
-    public boolean isHardError()
-    {
-        return true;
-    }
-
 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 118be75705..2e3e417c95 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -65,6 +65,7 @@ import org.apache.qpid.AMQDisconnectedException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.AMQInvalidRoutingKeyException;
+import org.apache.qpid.AMQChannelClosedException;
 import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.client.failover.FailoverNoopSupport;
 import org.apache.qpid.client.failover.FailoverProtectedOperation;
@@ -205,9 +206,9 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
      */
     protected static final boolean DEFAULT_MANDATORY = Boolean.parseBoolean(System.getProperty("qpid.default_mandatory", "true"));
 
-    protected static final boolean DECLARE_QUEUES =
+    protected final boolean DECLARE_QUEUES =
         Boolean.parseBoolean(System.getProperty("qpid.declare_queues", "true"));
-    protected static final boolean DECLARE_EXCHANGES =
+    protected final boolean DECLARE_EXCHANGES =
         Boolean.parseBoolean(System.getProperty("qpid.declare_exchanges", "true"));
 
     /** System property to enable strict AMQP compliance. */
@@ -629,6 +630,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
      */
     public void close(long timeout) throws JMSException
     {
+        close(timeout, true);
+    }
+
+    private void close(long timeout, boolean sendClose) throws JMSException
+    {
         if (_logger.isInfoEnabled())
         {
             StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
@@ -654,9 +660,12 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
                         // If the connection is open or we are in the process
                         // of closing the connection then send a cance
                         // no point otherwise as the connection will be gone
-                        if (!_connection.isClosed() || _connection.isClosing())                        
+                        if (!_connection.isClosed() || _connection.isClosing())
                         {
-                            sendClose(timeout);
+                            if (sendClose)
+                            {
+                                sendClose(timeout);
+                            }
                         }
                     }
                     catch (AMQException e)
@@ -712,25 +721,22 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
 
         if (!_closed.getAndSet(true))
         {
-            synchronized (getFailoverMutex())
+            synchronized (_messageDeliveryLock)
             {
-                synchronized (_messageDeliveryLock)
+                // An AMQException has an error code and message already and will be passed in when closure occurs as a
+                // result of a channel close request
+                AMQException amqe;
+                if (e instanceof AMQException)
                 {
-                    // An AMQException has an error code and message already and will be passed in when closure occurs as a
-                    // result of a channel close request
-                    AMQException amqe;
-                    if (e instanceof AMQException)
-                    {
-                        amqe = (AMQException) e;
-                    }
-                    else
-                    {
-                        amqe = new AMQException("Closing session forcibly", e);
-                    }
-
-                    _connection.deregisterSession(_channelId);
-                    closeProducersAndConsumers(amqe);
+                    amqe = (AMQException) e;
+                }
+                else
+                {
+                    amqe = new AMQException("Closing session forcibly", e);
                 }
+
+                _connection.deregisterSession(_channelId);
+                closeProducersAndConsumers(amqe);
             }
         }
     }
@@ -1737,6 +1743,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
                         }
                         catch (AMQException e)
                         {
+                            if (e instanceof AMQChannelClosedException)
+                            {
+                                close(-1, false);
+                            }
+
                             JMSException ex = new JMSException("Error registering consumer: " + e);
 
                             ex.setLinkedException(e);
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
index fa4e08f62b..d7196c0abb 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
@@ -33,6 +33,7 @@ import org.apache.qpid.client.message.*;
 import org.apache.qpid.client.message.AMQMessageDelegateFactory;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.state.listener.SpecificMethodFrameListener;
+import org.apache.qpid.client.state.AMQState;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
@@ -116,12 +117,23 @@ public final class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, B
 
     public void sendClose(long timeout) throws AMQException, FailoverException
     {
-        getProtocolHandler().closeSession(this);
-        getProtocolHandler().syncWrite(getProtocolHandler().getMethodRegistry().createChannelCloseBody(AMQConstant.REPLY_SUCCESS.getCode(),
-                new AMQShortString("JMS client closing channel"), 0, 0).generateFrame(_channelId), 
-                                       ChannelCloseOkBody.class, timeout);
-        // When control resumes at this point, a reply will have been received that
-        // indicates the broker has closed the channel successfully.
+        // we also need to check the state manager for 08/09 as the
+        // _connection variable may not be updated in time by the error receiving
+        // thread.
+        // We can't close the session if we are alreadying in the process of
+        // closing/closed the connection.
+                
+        if (!(getProtocolHandler().getStateManager().getCurrentState().equals(AMQState.CONNECTION_CLOSED)
+            || getProtocolHandler().getStateManager().getCurrentState().equals(AMQState.CONNECTION_CLOSING)))
+        {
+
+            getProtocolHandler().closeSession(this);
+            getProtocolHandler().syncWrite(getProtocolHandler().getMethodRegistry().createChannelCloseBody(AMQConstant.REPLY_SUCCESS.getCode(),
+                                                                                                           new AMQShortString("JMS client closing channel"), 0, 0).generateFrame(_channelId),
+                                           ChannelCloseOkBody.class, timeout);
+            // When control resumes at this point, a reply will have been received that
+            // indicates the broker has closed the channel successfully.
+        }
     }
 
     public void sendCommit() throws AMQException, FailoverException
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 2b6745ebe4..2cf19bf391 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
@@ -32,7 +32,6 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ChannelCloseBody;
 import org.apache.qpid.framing.ChannelCloseOkBody;
 import org.apache.qpid.protocol.AMQConstant;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +47,7 @@ public class ChannelCloseMethodHandler implements StateAwareMethodListener<Chann
     }
 
     public void methodReceived(AMQProtocolSession session, ChannelCloseBody method, int channelId)
-        throws AMQException
+            throws AMQException
     {
         _logger.debug("ChannelClose method received");
 
@@ -59,52 +58,62 @@ public class ChannelCloseMethodHandler implements StateAwareMethodListener<Chann
             _logger.debug("Channel close reply code: " + errorCode + ", reason: " + reason);
         }
 
-
-
         ChannelCloseOkBody body = session.getMethodRegistry().createChannelCloseOkBody();
         AMQFrame frame = body.generateFrame(channelId);
         session.writeFrame(frame);
-
-        if (errorCode != AMQConstant.REPLY_SUCCESS)
+        try
         {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Channel close received with errorCode " + errorCode + ", and reason " + reason);
-            }
-
-            if (errorCode == AMQConstant.NO_CONSUMERS)
-            {
-                throw new AMQNoConsumersException("Error: " + reason, null, null);
-            }
-            else if (errorCode == AMQConstant.NO_ROUTE)
-            {
-                throw new AMQNoRouteException("Error: " + reason, null, null);
-            }
-            else if (errorCode == AMQConstant.INVALID_ARGUMENT)
+            if (errorCode != AMQConstant.REPLY_SUCCESS)
             {
-                _logger.debug("Broker responded with Invalid Argument.");
+                if (_logger.isDebugEnabled())
+                {
+                    _logger.debug("Channel close received with errorCode " + errorCode + ", and reason " + reason);
+                }
+
+                if (errorCode == AMQConstant.NO_CONSUMERS)
+                {
+                    throw new AMQNoConsumersException("Error: " + reason, null, null);
+                }
+                else if (errorCode == AMQConstant.NO_ROUTE)
+                {
+                    throw new AMQNoRouteException("Error: " + reason, null, null);
+                }
+                else if (errorCode == AMQConstant.INVALID_ARGUMENT)
+                {
+                    _logger.debug("Broker responded with Invalid Argument.");
+
+                    throw new org.apache.qpid.AMQInvalidArgumentException(String.valueOf(reason), null);
+                }
+                else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
+                {
+                    _logger.debug("Broker responded with Invalid Routing Key.");
+
+                    throw new AMQInvalidRoutingKeyException(String.valueOf(reason), null);
+                }
+                else
+                {
+
+                    throw new AMQChannelClosedException(errorCode, "Error: " + reason, null);
+                }
 
-                throw new org.apache.qpid.AMQInvalidArgumentException(String.valueOf(reason), null);
-            }
-            else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
-            {
-                _logger.debug("Broker responded with Invalid Routing Key.");
-
-                throw new AMQInvalidRoutingKeyException(String.valueOf(reason), null);
-            }
-            else
-            {
-                throw new AMQChannelClosedException(errorCode, "Error: " + reason, null);
             }
-
         }
-        // fixme why is this only done when the close is expected...
-        // should the above forced closes not also cause a close?
-        // ----------
-        // Closing the session only when it is expected allows the errors to be processed
-        // Calling this here will prevent failover. So we should do this for all exceptions
-        // that should never cause failover. Such as authentication errors.
-
-        session.channelClosed(channelId, errorCode, String.valueOf(reason));
+        finally
+        {
+            // fixme why is this only done when the close is expected...
+            // should the above forced closes not also cause a close?
+            // ----------
+            // Closing the session only when it is expected allows the errors to be processed
+            // Calling this here will prevent failover. So we should do this for all exceptions
+            // that should never cause failover. Such as authentication errors.
+            // ----
+            // 2009-09-07 - ritchiem
+            // calling channelClosed will only close this session and will not
+            // prevent failover. If we don't close the session here then we will
+            // have problems during the session close as it will attempt to
+            // close the session that the broker has closed, 
+
+            session.channelClosed(channelId, errorCode, String.valueOf(reason));
+        }
     }
 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
index e639a33450..e40cafd72f 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
@@ -40,7 +40,6 @@ public class ConnectionOpenOkMethodHandler implements StateAwareMethodListener<C
     }
 
     public void methodReceived(AMQProtocolSession session, ConnectionOpenOkBody body, int channelId)
-                throws AMQException            
     {
         session.getStateManager().changeState(AMQState.CONNECTION_OPEN);
     }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
index e4e58c317d..287b5957a1 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
@@ -45,7 +45,6 @@ public class ConnectionTuneMethodHandler implements StateAwareMethodListener<Con
     { }
 
     public void methodReceived(AMQProtocolSession session, ConnectionTuneBody frame, int channelId)
-                throws AMQException
     {
         _logger.debug("ConnectionTune frame received");
         final MethodRegistry methodRegistry = session.getMethodRegistry();
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java
index f2aca58deb..8782e00a12 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java
@@ -52,7 +52,7 @@ public class AMQIoTransportProtocolSession extends AMQProtocolSession
     }
     
     @Override
-    public void closeProtocolSession(boolean waitLast) throws AMQException
+    public void closeProtocolSession(boolean waitLast) 
     {
         _ioSender.close();
         _protocolHandler.getStateManager().changeState(AMQState.CONNECTION_CLOSED);
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index 2389c9e2da..6f62070fd0 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -259,7 +259,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter
 
     /**
      * Called when we want to create a new IoTransport session
-     * @param brokerDetail 
+     * @param brokerDetail
      */
     public void createIoTransportSession(BrokerDetails brokerDetail)
     {
@@ -271,7 +271,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter
                                 brokerDetail.useSSL());
         _protocolSession.init();
     }
-    
+
     /**
      * Called when the network connection is closed. This can happen, either because the client explicitly requested
      * that the connection be closed, in which case nothing is done, or because the connection died. In the case
@@ -433,12 +433,11 @@ public class AMQProtocolHandler extends IoHandlerAdapter
      * @param e the exception to propagate
      *
      * @see #propagateExceptionToFrameListeners
-     * @see #propagateExceptionToStateWaiters
      */
     public void propagateExceptionToAllWaiters(Exception e)
     {
+        getStateManager().error(e);
         propagateExceptionToFrameListeners(e);
-        propagateExceptionToStateWaiters(e);
     }
 
     /**
@@ -469,22 +468,6 @@ public class AMQProtocolHandler extends IoHandlerAdapter
         }
     }
 
-    /**
-     * This caters for the case where we only need to propogate an exception to the the state manager to interupt any
-     * thing waiting for a state change.
-     *
-     * Currently (2008-07-15) the state manager is only used during 0-8/0-9 Connection establishement.
-     *
-     * Normally the state manager would not need to be notified without notifiying the frame listeners so in normal
-     * cases {@link #propagateExceptionToAllWaiters} would be the correct choice.
-     *
-     * @param e the exception to propagate
-     */
-    public void propagateExceptionToStateWaiters(Exception e)
-    {
-        getStateManager().error(e);
-    }
-
     public void notifyFailoverStarting()
     {
         // Set the last exception in the sync block to ensure the ordering with add.
@@ -601,7 +584,7 @@ public class AMQProtocolHandler extends IoHandlerAdapter
         {
             _protocolLogger.debug(String.format("SEND: [%s] %s", this, message));
         }
-        
+
         final long sentMessages = _messagesOut++;
 
         final boolean debug = _logger.isDebugEnabled();
@@ -667,7 +650,8 @@ public class AMQProtocolHandler extends IoHandlerAdapter
                     throw _lastFailoverException;
                 }
 
-                if(_stateManager.getCurrentState() == AMQState.CONNECTION_CLOSED)
+                if(_stateManager.getCurrentState() == AMQState.CONNECTION_CLOSED ||
+                        _stateManager.getCurrentState() == AMQState.CONNECTION_CLOSING)
                 {
                     Exception e = _stateManager.getLastException();
                     if (e != null)
@@ -733,25 +717,31 @@ public class AMQProtocolHandler extends IoHandlerAdapter
      */
     public void closeConnection(long timeout) throws AMQException
     {
-        getStateManager().changeState(AMQState.CONNECTION_CLOSING);
-
         ConnectionCloseBody body = _protocolSession.getMethodRegistry().createConnectionCloseBody(AMQConstant.REPLY_SUCCESS.getCode(), // replyCode
                                                                                                   new AMQShortString("JMS client is closing the connection."), 0, 0);
 
         final AMQFrame frame = body.generateFrame(0);
 
-        try
-        {
-            syncWrite(frame, ConnectionCloseOkBody.class, timeout);
-            _protocolSession.closeProtocolSession();
-        }
-        catch (AMQTimeoutException e)
+        //If the connection is already closed then don't do a syncWrite
+        if (getStateManager().getCurrentState().equals(AMQState.CONNECTION_CLOSED))
         {
             _protocolSession.closeProtocolSession(false);
         }
-        catch (FailoverException e)
+        else
         {
-            _logger.debug("FailoverException interrupted connection close, ignoring as connection close anyway.");
+            try
+            {
+                syncWrite(frame, ConnectionCloseOkBody.class, timeout);
+                _protocolSession.closeProtocolSession();
+            }
+            catch (AMQTimeoutException e)
+            {
+                _protocolSession.closeProtocolSession(false);
+            }
+            catch (FailoverException e)
+            {
+                _logger.debug("FailoverException interrupted connection close, ignoring as connection   close anyway.");
+            }
         }
     }
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 5e12a5e6f8..0e872170aa 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -410,12 +410,12 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession
         return (AMQConnection) _minaProtocolSession.getAttribute(AMQ_CONNECTION);
     }
 
-    public void closeProtocolSession() throws AMQException
+    public void closeProtocolSession()
     {
         closeProtocolSession(true);
     }
 
-    public void closeProtocolSession(boolean waitLast) throws AMQException
+    public void closeProtocolSession(boolean waitLast)
     {
         _logger.debug("Waiting for last write to join.");
         if (waitLast && (_lastWriteFuture != null))
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
index f8645139f2..70d4697f2c 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Set;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.io.IOException;
 
 /**
  * The state manager is responsible for managing the state of the protocol session. <p/>
@@ -86,7 +87,7 @@ public class AMQStateManager implements AMQMethodListener
         return _currentState;
     }
 
-    public void changeState(AMQState newState) throws AMQException
+    public void changeState(AMQState newState)
     {
         _logger.debug("State changing to " + newState + " from old state " + _currentState);
 
@@ -136,6 +137,22 @@ public class AMQStateManager implements AMQMethodListener
      */
     public void error(Exception error)
     {
+        if (error instanceof AMQException)
+        {
+            // AMQException should be being notified before closing the
+            // ProtocolSession. Which will change the State to CLOSED.
+            // if we have a hard error.
+            if (((AMQException)error).isHardError())
+            {
+                changeState(AMQState.CONNECTION_CLOSING);
+            }
+        }
+        else
+        {
+            // Be on the safe side here and mark the connection closed
+            changeState(AMQState.CONNECTION_CLOSED);
+        }
+
         if (_waiters.size() == 0)
         {
             _logger.error("No Waiters for error saving as last error:" + error.getMessage());
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
index ce79080e97..da44822ec3 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
@@ -85,7 +85,7 @@ public class MockAMQConnection extends AMQConnection
     }
 
     @Override
-    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException, AMQException
+    public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
     {
         _connected = true;
         _protocolHandler.getStateManager().changeState(AMQState.CONNECTION_OPEN);
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
index 10ec220d9e..fc7f8148f0 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
@@ -200,15 +200,8 @@ public class AMQProtocolHandlerTest extends TestCase
         _handler.getStateManager().error(trigger);
 
         _logger.info("Setting state to be CONNECTION_CLOSED.");
-        try
-        {
-            _handler.getStateManager().changeState(AMQState.CONNECTION_CLOSED);
-        }
-        catch (AMQException e)
-        {
-            _logger.error("Unable to change the state to closed.", e);
-            fail("Unable to change the state to closed due to :"+e.getMessage());
-        }
+
+        _handler.getStateManager().changeState(AMQState.CONNECTION_CLOSED);
 
         _logger.info("Firing exception");
         _handler.propagateExceptionToFrameListeners(trigger);
diff --git a/qpid/java/doc/broker-priority-queue-subscription.dia b/qpid/java/doc/broker-priority-queue-subscription.dia
new file mode 100644
index 0000000000..2289899435
--- /dev/null
+++ b/qpid/java/doc/broker-priority-queue-subscription.dia
diff --git a/qpid/java/doc/broker-queue-subscription.dia b/qpid/java/doc/broker-queue-subscription.dia
new file mode 100644
index 0000000000..d146ad136d
--- /dev/null
+++ b/qpid/java/doc/broker-queue-subscription.dia
diff --git a/qpid/java/broker/etc/persistent_config-config-test.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
index 258f54397d..33cc90b895 100644
--- a/qpid/java/broker/etc/persistent_config-config-test.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
@@ -87,7 +87,7 @@
         <auto_register>true</auto_register>
     </queue>
 
-    <virtualhosts>${conf}/virtualhosts-config-test.xml</virtualhosts>
+    <virtualhosts>${conf}/virtualhosts-ServerConfigurationTest-New.xml</virtualhosts>
 </broker>
 
 
diff --git a/qpid/java/broker/etc/sample-parsed-config.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
index 37dfae4d2e..67e0702c41 100644
--- a/qpid/java/broker/etc/sample-parsed-config.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
@@ -41,7 +41,7 @@
 <principal-database>passwordfile</principal-database>
 </jmx>
 </security>
-<virtualhosts>${conf}/virtualhosts-config-test.xml
+<virtualhosts>${conf}/virtualhosts-ServerConfigurationTest-New.xml
 <default>dev-only</default>
 <virtualhost>
 <name>dev-only</name>
diff --git a/qpid/java/broker/etc/acl.config.xml b/qpid/java/systests/etc/config-systests-acl-settings.xml
index a2b723fc63..c5374a5c5e 100644
--- a/qpid/java/broker/etc/acl.config.xml
+++ b/qpid/java/systests/etc/config-systests-acl-settings.xml
@@ -20,76 +20,12 @@
  -
  -->
 <broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
-             to enable SSL support
-        <ssl>
-            <enabled>true</enabled>
-            <sslOnly>true</sslOnly>
-            <keystorePath>/path/to/keystore.ks</keystorePath>
-            <keystorePassword>keystorepass</keystorePassword>
-        </ssl>-->
-        <qpidnio>false</qpidnio>
-        <!-- I've had the 0.0 and 0.1 Reader threads continually throwing IOException when client closes-->
-        <protectio>false</protectio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>false</enabled>
-        <jmxport>8999</jmxport>
-        <security-enabled>false</security-enabled>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed -->
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwd</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-        </principal-databases>
-
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.DenyAll</class>
-        </access>
-
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>
-    </security>
 
     <virtualhosts>
-        <directory>${conf}/virtualhosts</directory>
 
         <virtualhost>
             <name>test</name>
             <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-
                 <queues>
                     <exchange>amq.direct</exchange>
                     <!-- 4Mb -->
@@ -197,34 +133,7 @@
                 </security>
             </test>
         </virtualhost>
-
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-            </localhost>
-        </virtualhost>
-
     </virtualhosts>
-
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
 </broker>
 
 
diff --git a/qpid/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml
new file mode 100644
index 0000000000..34104dbe6b
--- /dev/null
+++ b/qpid/java/systests/etc/config-systests-acl.xml
@@ -0,0 +1,30 @@
+<?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.config}" 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"/>
+    </override>
+</configuration>
diff --git a/qpid/java/systests/etc/config-systests-derby-settings.xml b/qpid/java/systests/etc/config-systests-derby-settings.xml
new file mode 100644
index 0000000000..9c25b5682e
--- /dev/null
+++ b/qpid/java/systests/etc/config-systests-derby-settings.xml
@@ -0,0 +1,64 @@
+<?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.
+ -
+ -->
+<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>
+</broker>
+
+
diff --git a/qpid/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
new file mode 100644
index 0000000000..18ba0c4ad9
--- /dev/null
+++ b/qpid/java/systests/etc/config-systests-derby.xml
@@ -0,0 +1,30 @@
+<?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.config}" 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"/>
+    </override>
+</configuration>
diff --git a/qpid/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml
new file mode 100644
index 0000000000..4e9c863fda
--- /dev/null
+++ b/qpid/java/systests/etc/config-systests-settings.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.
+ -
+ -->
+<broker>
+    <management>
+        <enabled>false</enabled>
+        <ssl>
+            <enabled>false</enabled>
+        </ssl>
+    </management>
+</broker>
diff --git a/qpid/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
new file mode 100644
index 0000000000..290c082a4f
--- /dev/null
+++ b/qpid/java/systests/etc/config-systests.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.config}" config-optional="true"/>
+        <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
+        <xml fileName="${QPID_HOME}/etc/config.xml"/>                
+    </override>
+</configuration>
diff --git a/qpid/java/broker/etc/virtualhosts-config-test.xml b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
index 168aa074da..168aa074da 100644
--- a/qpid/java/broker/etc/virtualhosts-config-test.xml
+++ b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
index 7a2266902b..2e107ada34 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
@@ -20,24 +20,21 @@
  */
 package org.apache.qpid.management.jmx;
 
-import org.apache.qpid.commands.objects.AllObjects;
-import org.apache.qpid.management.common.JMXConnnectionFactory;
 import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedConnection;
 import org.apache.qpid.management.common.mbeans.ManagedExchange;
 import org.apache.qpid.server.logging.AbstractTestLogging;
 import org.apache.qpid.server.logging.subjects.AbstractTestLogSubject;
+import org.apache.qpid.test.utils.JMXTestUtils;
 
 import javax.jms.Connection;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
 import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
 import java.io.IOException;
 import java.util.List;
-import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Test class to test if any change in the broker JMX code is affesting the management console
@@ -46,33 +43,21 @@ import java.util.Set;
  */
 public class ManagementActorLoggingTest extends AbstractTestLogging
 {
-    MBeanServerConnection _mbsc;
-    JMXConnector _jmxc;
+    private JMXTestUtils _jmxUtils;
     private static final String USER = "admin";
 
     @Override
     public void setUp() throws Exception
     {
-        setConfigurationProperty("management.enabled", "true");
+        _jmxUtils = new JMXTestUtils(this, USER, USER);
+        _jmxUtils.setUp();
         super.setUp();
-
-        if (isExternalBroker())
-        {
-            _jmxc = JMXConnnectionFactory.getJMXConnection(
-                    5000, "127.0.0.1",
-                    getManagementPort(getPort()), USER, USER);
-
-            _mbsc = _jmxc.getMBeanServerConnection();
-        }
     }
 
     @Override
     public void tearDown() throws Exception
     {
-        if (isExternalBroker())
-        {
-            _jmxc.close();
-        }
+        _jmxUtils.close();
         super.tearDown();
     }
 
@@ -103,34 +88,31 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testJMXManagementConsoleConnection() throws IOException
     {
-        if (isExternalBroker())
-        {
-            List<String> results = _monitor.findMatches("MNG-1007");
+        List<String> results = _monitor.findMatches("MNG-1007");
 
-            assertEquals("Unexpected Management Connection count", 1, results.size());
+        assertEquals("Unexpected Management Connection count", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            validateMessageID("MNG-1007", log);
+        validateMessageID("MNG-1007", log);
 
-            assertTrue("User not in log message:" + log, log.endsWith(USER));
-            // Extract the id from the log string
-            //  MESSAGE [mng:1(rmi://169.24.29.116)] MNG-1007 : Open : User admin
-            int connectionID = Integer.parseInt(fromActor(getLog(results.get(0))).charAt(4) + "");
+        assertTrue("User not in log message:" + log, log.endsWith(USER));
+        // Extract the id from the log string
+        //  MESSAGE [mng:1(rmi://169.24.29.116)] MNG-1007 : Open : User admin
+        int connectionID = Integer.parseInt(fromActor(getLog(results.get(0))).charAt(4) + "");
 
-            results = _monitor.findMatches("MNG-1008");
+        results = _monitor.findMatches("MNG-1008");
 
-            assertEquals("Unexpected Management Connection close count", 0, results.size());
+        assertEquals("Unexpected Management Connection close count", 0, results.size());
 
-            _jmxc.close();
+        _jmxUtils.close();
 
-            results = _monitor.findMatches("MNG-1008");
+        results = _monitor.findMatches("MNG-1008");
 
-            assertEquals("Unexpected Management Connection count", 1, results.size());
+        assertEquals("Unexpected Management Connection count", 1, results.size());
 
-            assertEquals("Close does not have same id as open,", connectionID,
-                         Integer.parseInt(fromActor(getLog(results.get(0))).charAt(4) + ""));
-        }
+        assertEquals("Close does not have same id as open,", connectionID,
+                     Integer.parseInt(fromActor(getLog(results.get(0))).charAt(4) + ""));
     }
 
     /**
@@ -155,38 +137,40 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testConnectionCloseViaManagement() throws IOException, Exception
     {
-        if (isExternalBroker())
+        //Create a connection to the broker
+        Connection connection = getConnection();
+
+        // Monitor the connection for an exception being thrown
+        // this should be a DisconnectionException but it is not this tests
+        // job to valiate that. Only use the exception as a synchronisation
+        // to check the log file for the Close message
+        final CountDownLatch exceptionReceived = new CountDownLatch(1);
+        connection.setExceptionListener(new ExceptionListener()
         {
+            public void onException(JMSException e)
+            {
+                //Failover being attempted.
+                exceptionReceived.countDown();
+            }
+        });
 
-            //Create a connection to the broker
-            Connection connection = getConnection();
-
-            // Get all active AMQP connections
-            AllObjects allObject = new AllObjects(_mbsc);
-            allObject.querystring = "org.apache.qpid:type=VirtualHost.Connection,*";
-
-            Set<ObjectName> objectNames = allObject.returnObjects();
-
-            assertEquals("More than one test connection returned", 1, objectNames.size());
+        //Remove the connection close from any 0-10 connections
+        _monitor.reset();
 
-            ObjectName connectionName = objectNames.iterator().next();
+        // Get a managedConnection
+        ManagedConnection mangedConnection = _jmxUtils.getManagedObject(ManagedConnection.class, "org.apache.qpid:type=VirtualHost.Connection,*");
 
-            ManagedConnection mangedConnection = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, connectionName,
-                                     ManagedConnection.class, false);
+        //Close the connection
+        mangedConnection.closeConnection();
 
-            //Remove the connection close from any 0-10 connections 
-           _monitor.reset();
+        //Wait for the connection to close
+        assertTrue("Timed out waiting for conneciton to report close",
+                   exceptionReceived.await(2, TimeUnit.SECONDS));
 
-            //Close the connection
-            mangedConnection.closeConnection();
+        //Validate results
+        List<String> results = _monitor.findMatches("CON-1002");
 
-            //Validate results
-            List<String> results = _monitor.findMatches("CON-1002");
-
-
-            assertEquals("Unexpected Connection Close count", 1, results.size());
-        }
+        assertEquals("Unexpected Connection Close count", 1, results.size());
     }
 
     /**
@@ -212,114 +196,100 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testCreateExchangeDirectTransientViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous exchange declares
-            _monitor.reset();
-
-            createExchange("direct");
+        _monitor.reset();
 
-            // Validate
+        _jmxUtils.createExchange("test", "direct", null, false);
 
-            //1 - ID is correct
-            List<String> results = _monitor.findMatches("EXH-1001");
+        // Validate
 
-            assertEquals("More than one exchange creation found", 1, results.size());
+        //1 - ID is correct
+        List<String> results = _monitor.findMatches("EXH-1001");
 
-            String log = getLog(results.get(0));
+        assertEquals("More than one exchange creation found", 1, results.size());
 
-            // Validate correct exchange name
-            assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
+        String log = getLog(results.get(0));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
+        // Validate correct exchange name
+        assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
 
-        }
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
     public void testCreateExchangeTopicTransientViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous exchange declares
-            _monitor.reset();
+        //Remove any previous exchange declares
+        _monitor.reset();
 
-            createExchange("topic");
+        _jmxUtils.createExchange("test", "topic", null, false);
 
-            // Validate
+        // Validate
 
-            //1 - ID is correct
-            List<String> results = _monitor.findMatches("EXH-1001");
+        //1 - ID is correct
+        List<String> results = _monitor.findMatches("EXH-1001");
 
-            assertEquals("More than one exchange creation found", 1, results.size());
+        assertEquals("More than one exchange creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct exchange name
-            assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
+        // Validate correct exchange name
+        assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
 
-        }
     }
 
     public void testCreateExchangeFanoutTransientViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous exchange declares
-            _monitor.reset();
+        //Remove any previous exchange declares
+        _monitor.reset();
 
-            createExchange("fanout");
+        _jmxUtils.createExchange("test", "fanout", null, false);
 
-            // Validate
+        // Validate
 
-            //1 - ID is correct
-            List<String> results = _monitor.findMatches("EXH-1001");
+        //1 - ID is correct
+        List<String> results = _monitor.findMatches("EXH-1001");
 
-            assertEquals("More than one exchange creation found", 1, results.size());
+        assertEquals("More than one exchange creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct exchange name
-            assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
+        // Validate correct exchange name
+        assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
 
-        }
     }
 
     public void testCreateExchangeHeadersTransientViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous exchange declares
-            _monitor.reset();
+        //Remove any previous exchange declares
+        _monitor.reset();
 
-            createExchange("headers");
+        _jmxUtils.createExchange("test", "headers", null, false);
 
-            // Validate
+        // Validate
 
-            //1 - ID is correct
-            List<String> results = _monitor.findMatches("EXH-1001");
+        //1 - ID is correct
+        List<String> results = _monitor.findMatches("EXH-1001");
 
-            assertEquals("More than one exchange creation found", 1, results.size());
+        assertEquals("More than one exchange creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct exchange name
-            assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
+        // Validate correct exchange name
+        assertTrue("Incorrect exchange name created:" + log, log.endsWith(getName()));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
 
-        }
     }
 
     /**
@@ -343,29 +313,26 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testCreateQueueTransientViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createQueue();
+        _jmxUtils.createQueue("test", getName(), null, false);
 
-            // Validate
+        // Validate
 
-            List<String> results = _monitor.findMatches("QUE-1001");
+        List<String> results = _monitor.findMatches("QUE-1001");
 
-            assertEquals("More than one queue creation found", 1, results.size());
+        assertEquals("More than one queue creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct queue name
-            String subject = fromSubject(log);
-            assertEquals("Incorrect queue name created", getName(), AbstractTestLogSubject.getSlice("qu", subject));
+        // Validate correct queue name
+        String subject = fromSubject(log);
+        assertEquals("Incorrect queue name created", getName(), AbstractTestLogSubject.getSlice("qu", subject));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
-        }
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
     /**
@@ -389,34 +356,29 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testQueueDeleteViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createQueue();
+        _jmxUtils.createQueue("test", getName(), null, false);
 
-            ManagedBroker managedBroker = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, getVirtualHostManagerObjectName(),
-                                     ManagedBroker.class, false);
+        ManagedBroker managedBroker = _jmxUtils.getManagedBroker("test");
 
-            managedBroker.deleteQueue(getName());
+        managedBroker.deleteQueue(getName());
 
-            List<String> results = _monitor.findMatches("QUE-1002");
+        List<String> results = _monitor.findMatches("QUE-1002");
 
-            assertEquals("More than one queue deletion found", 1, results.size());
+        assertEquals("More than one queue deletion found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct binding
-            String subject = fromSubject(log);
-            assertEquals("Incorrect queue named in delete", getName(), AbstractTestLogSubject.getSlice("qu", subject));
+        // Validate correct binding
+        String subject = fromSubject(log);
+        assertEquals("Incorrect queue named in delete", getName(), AbstractTestLogSubject.getSlice("qu", subject));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
 
-        }
     }
 
     /**
@@ -440,98 +402,83 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testBindingCreateOnDirectViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createQueue();
+        _jmxUtils.createQueue("test", getName(), null, false);
 
-            ManagedExchange managedExchange = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, getExchange("amq.direct"),
-                                     ManagedExchange.class, false);
+        ManagedExchange managedExchange = _jmxUtils.getManagedExchange("amq.direct");
 
-            managedExchange.createNewBinding(getName(), getName());
+        managedExchange.createNewBinding(getName(), getName());
 
-            List<String> results = _monitor.findMatches("BND-1001");
+        List<String> results = _monitor.findMatches("BND-1001");
 
-            assertEquals("More than one bind creation found", 1, results.size());
+        assertEquals("More than one bind creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct binding
-            String subject = fromSubject(log);
-            assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
-            assertEquals("Incorrect routing key in create", getName(), AbstractTestLogSubject.getSlice("rk", subject));
+        // Validate correct binding
+        String subject = fromSubject(log);
+        assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
+        assertEquals("Incorrect routing key in create", getName(), AbstractTestLogSubject.getSlice("rk", subject));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
-        }
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
     public void testBindingCreateOnTopicViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createQueue();
+        _jmxUtils.createQueue("test", getName(), null, false);
 
-            ManagedExchange managedExchange = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, getExchange("amq.topic"),
-                                     ManagedExchange.class, false);
+        ManagedExchange managedExchange = _jmxUtils.getManagedExchange("amq.topic");
 
-            managedExchange.createNewBinding(getName(), getName());
+        managedExchange.createNewBinding(getName(), getName());
 
-            List<String> results = _monitor.findMatches("BND-1001");
+        List<String> results = _monitor.findMatches("BND-1001");
 
-            assertEquals("More than one bind creation found", 1, results.size());
+        assertEquals("More than one bind creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct binding
-            String subject = fromSubject(log);
-            assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
-            assertEquals("Incorrect routing key in create", getName(), AbstractTestLogSubject.getSlice("rk", subject));
+        // Validate correct binding
+        String subject = fromSubject(log);
+        assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
+        assertEquals("Incorrect routing key in create", getName(), AbstractTestLogSubject.getSlice("rk", subject));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
-        }
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
     public void testBindingCreateOnFanoutViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createQueue();
+        _jmxUtils.createQueue("test", getName(), null, false);
 
-            ManagedExchange managedExchange = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, getExchange("amq.fanout"),
-                                     ManagedExchange.class, false);
+        ManagedExchange managedExchange = _jmxUtils.getManagedExchange("amq.fanout");
 
-            managedExchange.createNewBinding(getName(), getName());
+        managedExchange.createNewBinding(getName(), getName());
 
-            List<String> results = _monitor.findMatches("BND-1001");
+        List<String> results = _monitor.findMatches("BND-1001");
 
-            assertEquals("More than one bind creation found", 1, results.size());
+        assertEquals("More than one bind creation found", 1, results.size());
 
-            String log = getLog(results.get(0));
+        String log = getLog(results.get(0));
 
-            // Validate correct binding
-            String subject = fromSubject(log);
-            assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
-            assertEquals("Incorrect routing key in create", "*", AbstractTestLogSubject.getSlice("rk", subject));
+        // Validate correct binding
+        String subject = fromSubject(log);
+        assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
+        assertEquals("Incorrect routing key in create", "*", AbstractTestLogSubject.getSlice("rk", subject));
 
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
-        }
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
     /**
@@ -556,114 +503,28 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
      */
     public void testUnRegisterExchangeViaManagementConsole() throws IOException, JMException
     {
-        if (isExternalBroker())
-        {
-
-            //Remove any previous queue declares
-            _monitor.reset();
+        //Remove any previous queue declares
+        _monitor.reset();
 
-            createExchange("direct");
+        _jmxUtils.createExchange("test", "direct", null, false);
 
-            ManagedBroker managedBroker = MBeanServerInvocationHandler.
-                    newProxyInstance(_mbsc, getVirtualHostManagerObjectName(),
-                                     ManagedBroker.class, false);
+        ManagedBroker managedBroker = _jmxUtils.getManagedBroker("test");
 
-            managedBroker.unregisterExchange(getName());
+        managedBroker.unregisterExchange(getName());
 
-            List<String> results = _monitor.findMatches("EXH-1002");
+        List<String> results = _monitor.findMatches("EXH-1002");
 
-            assertEquals("More than one exchange deletion found", 1, results.size());
-
-            String log = getLog(results.get(0));
-
-            // Validate correct binding
-            String subject = fromSubject(log);
-            assertEquals("Incorrect exchange named in delete", "direct/" + getName(), AbstractTestLogSubject.getSlice("ex", subject));
-
-            // Validate it was a management actor.
-            String actor = fromActor(log);
-            assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
-        }
-    }
-
-    /**
-     * Create a non-durable test exchange with the current test name
-     *
-     * @throws JMException - is thrown if a exchange with this testName already exists
-     * @throws IOException - if there is a problem with the JMX Connection
-     * @throws javax.management.MBeanException
-     *                     - if there is another problem creating the exchange
-     */
-    private void createExchange(String type)
-            throws JMException, IOException, MBeanException
-    {
-        ManagedBroker managedBroker = MBeanServerInvocationHandler.
-                newProxyInstance(_mbsc, getVirtualHostManagerObjectName(),
-                                 ManagedBroker.class, false);
-
-        managedBroker.createNewExchange(getName(), type, false);
-    }
-
-    /**
-     * Create a non-durable queue (with no owner) that is named after the
-     * creating test.
-     *
-     * @throws JMException - is thrown if a queue with this testName already exists
-     * @throws IOException - if there is a problem with the JMX Connection
-     */
-    private void createQueue()
-            throws JMException, IOException
-    {
-        ManagedBroker managedBroker = MBeanServerInvocationHandler.
-                newProxyInstance(_mbsc, getVirtualHostManagerObjectName(),
-                                 ManagedBroker.class, false);
-
-        managedBroker.createNewQueue(getName(), null, false);
-    }
-
-    /**
-     * Retrive the ObjectName for the test Virtualhost.
-     *
-     * This is then use to create aproxy to the ManagedBroker MBean.
-     *
-     * @return the ObjectName for the 'test' VirtualHost.
-     */
-    private ObjectName getVirtualHostManagerObjectName()
-    {
-        // Get the name of the test manager
-        AllObjects allObject = new AllObjects(_mbsc);
-        allObject.querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=test,*";
-
-        Set<ObjectName> objectNames = allObject.returnObjects();
-
-        assertEquals("Incorrect number test vhosts returned", 1, objectNames.size());
-
-        // We have verified we have only one value in objectNames so return it
-        return objectNames.iterator().next();
-    }
-
-    /**
-     * Retrive the ObjectName for the given Exchange on the test Virtualhost.
-     *
-     * This is then use to create aproxy to the ManagedExchange MBean.
-     *
-     * @param exchange The exchange to retireve e.g. 'direct'
-     *
-     * @return the ObjectName for the given exchange on the test VirtualHost.
-     */
-    private ObjectName getExchange(String exchange)
-    {
-        // Get the name of the test manager
-        AllObjects allObject = new AllObjects(_mbsc);
-        allObject.querystring = "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost=test,name=" + exchange + ",*";
+        assertEquals("More than one exchange deletion found", 1, results.size());
 
-        Set<ObjectName> objectNames = allObject.returnObjects();
+        String log = getLog(results.get(0));
 
-        assertEquals("Incorrect number of exchange with name '" + exchange +
-                     "' returned", 1, objectNames.size());
+        // Validate correct binding
+        String subject = fromSubject(log);
+        assertEquals("Incorrect exchange named in delete", "direct/" + getName(), AbstractTestLogSubject.getSlice("ex", subject));
 
-        // We have verified we have only one value in objectNames so return it
-        return objectNames.iterator().next();
+        // Validate it was a management actor.
+        String actor = fromActor(log);
+        assertTrue("Actor is not a manangement actor:" + actor, actor.startsWith("mng"));
     }
 
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
index c4803e121e..0a88ef391c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
@@ -40,6 +40,8 @@ public class ServerConfigurationFileTest extends QpidTestCase
         {
             fail("Unable to test without config file:" + _configFile);
         }
+
+        saveTestConfiguration();
         _serverConfig = new ServerConfiguration(_configFile);
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
index 620b2a5161..683abee4da 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
@@ -94,7 +94,7 @@ public class AlertingTest extends AbstractTestLogging
     {
         _connection = getConnection();
         _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
-        _destination = _session.createQueue("testQueue");
+        _destination = _session.createQueue(getTestQueueName());
 
         // Consumer is only used to actually create the destination
         _session.createConsumer(_destination).close();
@@ -116,14 +116,12 @@ public class AlertingTest extends AbstractTestLogging
             // Add the current contents of the log file to test output
             message.append(_monitor.readFile());
 
-            // Write the server config file to test output
-            message.append("Server configuration file in use:\n");
-            message.append(FileUtils.readFileAsString(_configFile));
+            // Write the test config file to test output
+            message.append("Server configuration overrides in use:\n");
+            message.append(FileUtils.readFileAsString(getTestConfigFile()));
 
-            // Write the virtualhost config file to test output
-            message.append("\nVirtualhost configuration file in use:\n");
-            message.append(FileUtils.readFileAsString(ServerConfiguration.
-                    flatConfig(_configFile).getString("virtualhosts")));
+            message.append("\nVirtualhost maxMessageCount:\n");                        
+            message.append((new ServerConfiguration(_configFile)).getConfig().getString("virtualhosts.virtualhost." + VIRTUALHOST + ".queues.maximumMessageCount"));
 
             fail(message.toString());
         }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
index 254ec9693d..cc3993249c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
@@ -28,6 +28,7 @@ import javax.jms.Connection;
 import javax.jms.Queue;
 import javax.jms.Session;
 import java.util.List;
+import java.io.File;
 
 /**
  * The MessageStore test suite validates that the follow log messages as
@@ -56,9 +57,9 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         //We call super.setUp but this will not start the broker as that is
         //part of the test case.
 
-        // Load current configuration file to get the list of defined vhosts
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        // Load the default configuration file to get the list of defined vhosts
+        ServerConfiguration configuration = new ServerConfiguration(new File(_configFile.getParent() + "/config.xml"));
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         // Make them all persistent i.e. Use DerbyMessageStore and
         // test that it logs correctly.
@@ -97,8 +98,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1002");
@@ -117,7 +118,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -160,8 +161,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1004");
@@ -186,7 +187,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -227,8 +228,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1006");
@@ -253,7 +254,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -293,8 +294,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1004 : Recovery Start :");
@@ -316,7 +317,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         // the virtualhost name, found above. AND
         // the index that the virtualhost is within the configuration.
         // we can retrive that from the vhosts list previously extracted.
-        String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+        String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
         // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
         String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -358,8 +359,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1006 : Recovery Complete :");
@@ -381,7 +382,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
         // the virtualhost name, found above. AND
         // the index that the virtualhost is within the configuration.
         // we can retrive that from the vhosts list previously extracted.
-        String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+        String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
         // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
         String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -500,8 +501,8 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             assertTrue("MST messages not logged", results.size() > 0);
 
             // Load VirtualHost list from file.
-            Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-            List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+            ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
             //Validate each vhost logs a creation
             results = _monitor.findMatches("MST-1004 : Recovery Start : " + queueName);
@@ -542,7 +543,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
index 11c003a2a7..8b7c881a32 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
@@ -24,6 +24,7 @@ import junit.framework.AssertionFailedError;
 import org.apache.qpid.util.LogMonitor;
 
 import java.util.List;
+import java.io.File;
 
 /**
  * Management Console Test Suite
@@ -308,9 +309,8 @@ public class ManagementLoggingTest extends AbstractTestLogging
 
                 // We expect the RMIConnector Server port to be 100 higher than
                 // the RMI Server Port
-                int mPort = getPort() + (DEFAULT_MANAGEMENT_PORT - DEFAULT_PORT) + 100;
-                assertTrue("SSL Keystore entry expected(" + mPort + ").:" + getMessageString(log),
-                           getMessageString(log).endsWith(getConfigurationStringProperty("management.ssl.keyStorePath")));
+                assertTrue("SSL Keystore entry expected.:" + getMessageString(log),
+                           getMessageString(log).endsWith(new File(getConfigurationStringProperty("management.ssl.keyStorePath")).getName()));
             }
             catch (AssertionFailedError afe)
             {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
index a1cbeca6de..2298ba4da0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
@@ -89,8 +89,8 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
         assertEquals("MST-1001 is not the first MST message", "MST-1001", getMessageID(fromMessage(log)));
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1001");
@@ -109,7 +109,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
@@ -156,8 +156,8 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
         assertTrue("MST messages not logged", results.size() > 0);
 
         // Load VirtualHost list from file.
-        Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-        List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+        ServerConfiguration configuration = new ServerConfiguration(_configFile);
+        List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
         //Validate each vhost logs a creation
         results = _monitor.findMatches("MST-1003");
@@ -176,7 +176,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
             // the virtualhost name, found above. AND
             // the index that the virtualhost is within the configuration.
             // we can retrive that from the vhosts list previously extracted.
-            String fullStoreName = configuration.getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
+            String fullStoreName = configuration.getConfig().getString("virtualhosts.virtualhost(" + vhosts.indexOf(vhostName) + ")." + vhostName + ".store.class");
 
             // Get the Simple class name from the expected class name of o.a.q.s.s.MMS
             String storeName = fullStoreName.substring(fullStoreName.lastIndexOf(".") + 1);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
index 033c0533f8..5dd56fb0f9 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
@@ -29,6 +29,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
+import javax.jms.Message;
 import java.io.IOException;
 import java.util.List;
 
@@ -327,51 +328,59 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
         int PREFETCH = 15;
 
         //Create new session with small prefetch
-        _session = ((AMQConnection) _connection).createSession(true, Session.AUTO_ACKNOWLEDGE, PREFETCH);
+        _session = ((AMQConnection) _connection).createSession(true, Session.SESSION_TRANSACTED, PREFETCH);
 
         MessageConsumer consumer = _session.createConsumer(_queue);
 
         _connection.start();
 
+        //Start the dispatcher & Unflow the channel.
+        consumer.receiveNoWait();
+
         //Fill the prefetch and two extra so that our receive bellow allows the
-        // subscription to become active then return to a suspended state.
-        sendMessage(_session, _queue, 17);
+        // subscription to become active
+        // Previously we set this to 17 so that it would return to a suspended
+        // state. However, testing has shown that the state change can occur
+        // sufficiently quickly that logging does not occur consistently enough
+        // for testing.
+        int SEND_COUNT = 16;
+        sendMessage(_session, _queue, SEND_COUNT);
         _session.commit();
         // Retreive the first message, and start the flow of messages
-        assertNotNull("First message not retreived", consumer.receive(1000));
+        Message msg = consumer.receive(1000);
+        assertNotNull("First message not retreived", msg);
         _session.commit();
         
-        
-        //Validate
-        List<String> results = _monitor.findMatches("SUB-1003");
-        
-        int i = 0;
-        while (results.size() != 3 && i < 10)
+        // Drain the queue to ensure there is time for the ACTIVE log message
+        // Check that we can received all the messages
+        int receivedCount = 0;
+        while (msg != null)
         {
-            try
-            {
-                Thread.sleep(1500);
-            }
-            catch (InterruptedException e)
-            {
-                
-            }
-            results = _monitor.findMatches("SUB-1003");
-            i++;
+            receivedCount++;
+            msg = consumer.receive(1000);
+            _session.commit();
         }
 
+        //Validate we received all the messages
+        assertEquals("Not all sent messages received.", SEND_COUNT, receivedCount);
+
+        // Fill the queue again to suspend the consumer
+        sendMessage(_session, _queue, SEND_COUNT);
+        _session.commit();
+
+        //Validate
+        List<String> results = _monitor.findMatches("SUB-1003");
+
         try
         {
             // Validation expects three messages.
-            // The first will be logged by the QueueActor as part of the processQueue thread
-// INFO - MESSAGE [vh(/test)/qu(example.queue)] [sub:6(qu(example.queue))] SUB-1003 : State : SUSPENDED 
-            // The second will be by the connnection as it acknowledges and activates the subscription
-// INFO - MESSAGE [con:6(guest@anonymous(26562441)/test)/ch:3] [sub:6(qu(example.queue))] SUB-1003 : State : ACTIVE
-            // The final one can be the subscription suspending as part of the SubFlushRunner or the processQueue thread
-            // As a result validating the actor is more complicated and doesn't add anything. The goal of this test is
-            // to ensure the State is correct not that a particular Actor performs the logging.
-// INFO - MESSAGE [sub:6(vh(test)/qu(example.queue))] [sub:6(qu(example.queue))] SUB-1003 : State : SUSPENDED
-// INFO - MESSAGE [vh(/test)/qu(example.queue)] [sub:6(qu(example.queue))] SUB-1003 : State : SUSPENDED
+            // The Actor can be any one of the following depending on the exactly what is going on on the broker.
+            // Ideally we would test that we can get all of them but setting up
+            // the timing to do this in a consistent way is not benefitial.
+            // Ensuring the State is as expected is sufficient.
+// INFO - MESSAGE [vh(/test)/qu(example.queue)] [sub:6(qu(example.queue))] SUB-1003 : State :
+// INFO - MESSAGE [con:6(guest@anonymous(26562441)/test)/ch:3] [sub:6(qu(example.queue))] SUB-1003 : State :
+// INFO - MESSAGE [sub:6(vh(test)/qu(example.queue))] [sub:6(qu(example.queue))] SUB-1003 : State :
 
             assertEquals("Result set not expected size:", 3, results.size());
 
@@ -380,19 +389,10 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
             String log = getLog(results.get(0));
             validateSubscriptionState(log, expectedState);
 
-            // Validate that the logActor is the the queue
-            String actor = fromActor(log);
-            assertTrue("Actor string does not contain expected queue("
-                       + _queue.getQueueName() + ") name." + actor,
-                       actor.contains("qu(" + _queue.getQueueName() + ")"));
-
             // After being suspended the subscription should become active.
             expectedState = "ACTIVE";
             log = getLog(results.get(1));
             validateSubscriptionState(log, expectedState);
-            // Validate we have a connection Actor
-            actor = fromActor(log);
-            assertTrue("The actor is not a connection actor:" + actor, actor.startsWith("con:"));
 
             // Validate that it was re-suspended
             expectedState = "SUSPENDED";
@@ -411,6 +411,9 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
         }
         _connection.close();
 
+        //Ensure the queue is drained before the test ends
+        drainQueue(_queue);
+
     }
 
     /**
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
index 7bf644508e..f4a0c8b27d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
@@ -64,8 +64,8 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
         try
         {
             // Validation
-            Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-            List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+            ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
             //Validate each vhost logs a creation
             results = _monitor.findMatches("VHT-1001");
@@ -117,8 +117,8 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
         {
             // Validation
 
-            Configuration configuration = ServerConfiguration.flatConfig(_configFile);
-            List<String> vhosts = configuration.getList("virtualhosts.virtualhost.name");
+            ServerConfiguration configuration = new ServerConfiguration(_configFile);
+            List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
 
             //Validate each vhost logs a creation
             results = _monitor.findMatches("VHT-1002");
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
new file mode 100644
index 0000000000..078b8f43ce
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
@@ -0,0 +1,299 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.server.queue;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.management.common.mbeans.ManagedBroker;
+import org.apache.qpid.management.common.mbeans.ManagedQueue;
+import org.apache.qpid.test.utils.JMXTestUtils;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.management.JMException;
+import javax.management.MBeanException;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
+
+/**
+ * This Test validates the Queue Model on the broker.
+ * Currently it has some basic queue creation / deletion tests.
+ * However, it should be expanded to include other tests that relate to the
+ * model. i.e.
+ *
+ * The Create and Delete tests should ensure that the requisite logging is
+ * performed.
+ *
+ * Additions to this suite would be to complete testing of creations, validating
+ * fields such as owner/exclusive, autodelete and priority are correctly set.
+ *
+ * Currently this test uses the JMX interface to validate that the queue has
+ * been declared as expected so these tests cannot run against a CPP broker.
+ *
+ *
+ * Tests should ensure that they clean up after themselves.
+ * e,g. Durable queue creation test should perform a queue delete.
+ */
+public class ModelTest extends QpidTestCase
+{
+
+    private static final String USER = "admin";
+    private JMXTestUtils _jmxUtils;
+    private static final String VIRTUALHOST_NAME = "test";
+
+    @Override
+    public void setUp() throws Exception
+    {
+        // Create a JMX Helper
+        _jmxUtils = new JMXTestUtils(this, USER, USER);
+        _jmxUtils.setUp();
+        super.setUp();
+
+        // Open the JMX Connection
+        _jmxUtils.open();
+    }
+
+    @Override
+    public void tearDown() throws Exception
+    {
+        // Close the JMX Connection
+        _jmxUtils.close();
+        super.tearDown();
+    }
+
+    /**
+     * Test that a transient queue can be created via AMQP.
+     *
+     * @throws Exception On unexpected error
+     */
+    public void testQueueCreationTransientViaAMQP() throws Exception
+    {
+        Connection connection = getConnection();
+
+        String queueName = getTestQueueName();
+        boolean durable = false;
+        boolean autoDelete = false;
+        boolean exclusive = false;
+
+        createViaAMQPandValidateViaJMX(connection, queueName, durable,
+                                       autoDelete, exclusive);
+    }
+
+    /**
+     * Test that a durable queue can be created via AMQP.
+     *
+     * @throws Exception On unexpected error
+     */
+
+    public void testQueueCreationDurableViaAMQP() throws Exception
+    {
+        Connection connection = getConnection();
+
+        String queueName = getTestQueueName();
+        boolean durable = true;
+        boolean autoDelete = false;
+        boolean exclusive = false;
+
+        createViaAMQPandValidateViaJMX(connection, queueName, durable,
+                                       autoDelete, exclusive);
+
+        // Clean up
+        ManagedBroker managedBroker =
+                _jmxUtils.getManagedBroker(VIRTUALHOST_NAME);
+        managedBroker.deleteQueue(queueName);
+    }
+
+    /**
+     * Test that a transient queue can be created via JMX.
+     *
+     * @throws IOException                  if there is a problem via the JMX connection
+     * @throws javax.management.JMException if there is a problem with the JMX command
+     */
+    public void testCreationTransientViaJMX() throws IOException, JMException
+    {
+        String name = getName();
+        String owner = null;
+        boolean durable = false;
+
+        createViaJMXandValidateViaJMX(name, owner, durable, durable);
+    }
+
+    /**
+     * Test that a durable queue can be created via JMX.
+     *
+     * @throws IOException                  if there is a problem via the JMX connection
+     * @throws javax.management.JMException if there is a problem with the JMX command
+     */
+    public void testCreationDurableViaJMX() throws IOException, JMException
+    {
+        String name = getName();
+        String owner = null;
+        boolean durable = true;
+
+        createViaJMXandValidateViaJMX(name, owner, durable, durable);
+
+        // Clean up
+        ManagedBroker managedBroker =
+                _jmxUtils.getManagedBroker(VIRTUALHOST_NAME);
+        managedBroker.deleteQueue(name);
+    }
+
+    /**
+     * Test that a transient queue can be deleted via JMX.
+     *
+     * @throws IOException                  if there is a problem via the JMX connection
+     * @throws javax.management.JMException if there is a problem with the JMX command
+     */
+    public void testDeletionTransientViaJMX() throws IOException, JMException
+    {
+        String name = getName();
+
+        _jmxUtils.createQueue(VIRTUALHOST_NAME, name, null, false);
+
+        ManagedBroker managedBroker = _jmxUtils.
+                getManagedBroker(VIRTUALHOST_NAME);
+
+        try
+        {
+            managedBroker.deleteQueue(name);
+        }
+        catch (UndeclaredThrowableException e)
+        {
+            fail(((MBeanException) ((InvocationTargetException)
+                    e.getUndeclaredThrowable()).getTargetException()).getTargetException().getMessage());
+        }
+    }
+
+    /**
+     * Test that a durable queue can be created via JMX.
+     *
+     * @throws IOException                  if there is a problem via the JMX connection
+     * @throws javax.management.JMException if there is a problem with the JMX command
+     */
+    public void testDeletionDurableViaJMX() throws IOException, JMException
+    {
+        String name = getName();
+
+        _jmxUtils.createQueue(VIRTUALHOST_NAME, name, null, true);
+
+        ManagedBroker managedBroker = _jmxUtils.
+                getManagedBroker(VIRTUALHOST_NAME);
+
+        try
+        {
+            managedBroker.deleteQueue(name);
+        }
+        catch (UndeclaredThrowableException e)
+        {
+            fail(((MBeanException) ((InvocationTargetException)
+                    e.getUndeclaredThrowable()).getTargetException()).getTargetException().getMessage());
+        }
+    }
+
+    /*
+     * Helper Methods
+     */
+
+    /**
+     * Using the provided JMS Connection create a queue using the AMQP extension
+     * with the given properties and then validate it was created correctly via
+     * the JMX Connection
+     *
+     * @param connection Qpid JMS Connection
+     * @param queueName  String the desired QueueName
+     * @param durable    boolean if the queue should be durable
+     * @param autoDelete boolean if the queue is an autoDelete queue
+     * @param exclusive  boolean if the queue is exclusive
+     *
+     * @throws AMQException if there is a problem with the createQueue call
+     * @throws JMException  if there is a problem with the JMX validatation
+     * @throws IOException  if there is a problem with the JMX connection
+     * @throws JMSException if there is a problem creating the JMS Session
+     */
+    private void createViaAMQPandValidateViaJMX(Connection connection,
+                                                String queueName,
+                                                boolean durable,
+                                                boolean autoDelete,
+                                                boolean exclusive)
+            throws AMQException, JMException, IOException, JMSException
+    {
+        AMQSession session = (AMQSession) connection.createSession(false,
+                                                                   Session.AUTO_ACKNOWLEDGE);
+
+        session.createQueue(new AMQShortString(queueName),
+                            autoDelete, durable, exclusive);
+
+        validateQueueViaJMX(queueName, exclusive ? ((AMQConnection) connection).
+                getUsername() : null, durable, autoDelete);
+    }
+
+    /**
+     * Use the JMX Helper to create a queue with the given properties and then
+     * validate it was created correctly via the JMX Connection
+     *
+     * @param queueName  String the desired QueueName
+     * @param owner      String the owner value that should be set
+     * @param durable    boolean if the queue should be durable
+     * @param autoDelete boolean if the queue is an autoDelete queue
+     *
+     * @throws JMException if there is a problem with the JMX validatation
+     * @throws IOException if there is a problem with the JMX connection
+     */
+    private void createViaJMXandValidateViaJMX(String queueName, String owner,
+                                               boolean durable, boolean autoDelete)
+            throws JMException, IOException
+    {
+        _jmxUtils.createQueue(VIRTUALHOST_NAME, queueName, owner, durable);
+
+        validateQueueViaJMX(queueName, owner, durable, autoDelete);
+    }
+
+    /**
+     * Validate that a queue with the given properties exists on the broker
+     *
+     * @param queueName  String the desired QueueName
+     * @param owner      String the owner value that should be set
+     * @param durable    boolean if the queue should be durable
+     * @param autoDelete boolean if the queue is an autoDelete queue
+     *
+     * @throws JMException if there is a problem with the JMX validatation
+     * @throws IOException if there is a problem with the JMX connection
+     */
+    private void validateQueueViaJMX(String queueName, String owner, boolean durable, boolean autoDelete)
+            throws JMException, IOException
+    {
+        ManagedQueue managedQueue = _jmxUtils.
+                getManagedObject(ManagedQueue.class,
+                                 _jmxUtils.getQueueObjectName(VIRTUALHOST_NAME,
+                                                              queueName));
+
+        assertEquals(queueName, managedQueue.getName());
+        assertEquals(String.valueOf(owner), managedQueue.getOwner());
+        assertEquals(durable, managedQueue.isDurable());
+        assertEquals(autoDelete, managedQueue.isAutoDelete());
+    }
+
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
index b5c0a87b0f..a755bbfaa7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
@@ -21,67 +21,57 @@
 
 package org.apache.qpid.server.security.acl;
 
-import junit.framework.TestCase;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.client.*;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.AMQConnectionFailureException;
+import org.apache.qpid.client.AMQAuthenticationException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.url.URLSyntaxException;
 
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
 import javax.jms.IllegalStateException;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.NamingException;
 import java.io.File;
 
 public class SimpleACLTest extends QpidTestCase implements ConnectionListener
 {
-    private String BROKER = "vm://:"+ApplicationRegistry.DEFAULT_INSTANCE;//"tcp://localhost:5672";
-
     public void setUp() throws Exception
     {
-        //Shutdown the QTC broker
-        stopBroker();
-
-        // Initialise ACLs.
-        final String QpidExampleHome = System.getProperty("QPID_EXAMPLE_HOME");
-        final File defaultaclConfigFile = new File(QpidExampleHome, "etc/acl.config.xml");
+        final String QPID_HOME = System.getProperty("QPID_HOME");
 
-        if (!defaultaclConfigFile.exists())
-        {
-            System.err.println("Configuration file not found:" + defaultaclConfigFile);
-            fail("Configuration file not found:" + defaultaclConfigFile);
-        }
-
-        if (System.getProperty("QPID_HOME") == null)                                                                                            
+        if (QPID_HOME == null)
         {
             fail("QPID_HOME not set");
         }
 
-        ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
-        ApplicationRegistry.initialise(config, ApplicationRegistry.DEFAULT_INSTANCE);
-        TransportConnection.createVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
-    }
+        // Initialise ACLs.
+        _configFile = new File(QPID_HOME, "etc/config-systests-acl.xml");
 
-    public void tearDown()
-    {
-        TransportConnection.killVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
-        ApplicationRegistry.remove(ApplicationRegistry.DEFAULT_INSTANCE);
+        super.setUp();
     }
 
-    public String createConnectionString(String username, String password, String broker)
+    public String createConnectionString(String username, String password)
     {
 
-        return "amqp://" + username + ":" + password + "@clientid/test?brokerlist='" + broker + "?retries='0''";
+        return "amqp://" + username + ":" + password + "@clientid/test?brokerlist='" + getBroker() + "?retries='0''";
     }
 
     public void testAccessAuthorized() throws AMQException, URLSyntaxException
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             Session sesh = conn.createSession(true, Session.SESSION_TRANSACTED);
 
@@ -94,28 +84,32 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
         catch (Exception e)
         {
-            fail("Connection was not created due to:" + e.getMessage());
+            fail("Connection was not created due to:" + e);
         }
     }
 
-    public void testAccessNoRights() throws URLSyntaxException, JMSException
+    public void testAccessNoRights() throws Exception
     {
         try
         {
-            Connection conn = createConnection("guest", "guest");
+            Connection conn = getConnection("guest", "guest");
 
             //Attempt to do do things to test connection.
             Session sesh = conn.createSession(true, Session.SESSION_TRANSACTED);
             conn.start();
             sesh.rollback();
 
-            conn.close();
             fail("Connection was created.");
         }
-        catch (AMQException amqe)
+        catch (JMSException jmse)
         {
-            Throwable cause = amqe.getCause();
-            assertEquals("Exception was wrong type", AMQAuthenticationException.class, cause.getClass());
+            Throwable linkedException = jmse.getLinkedException();
+            assertNotNull("Cause was null", linkedException);
+
+            assertEquals("Linked Exception was wrong type", AMQConnectionFailureException.class, linkedException.getClass());
+
+            Throwable cause = linkedException.getCause();
+            assertEquals("Cause was wrong type", AMQAuthenticationException.class, cause.getClass());
             assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
         }
     }
@@ -124,7 +118,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -140,11 +134,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testClientConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException
+    public void testClientConsumeFromNamedQueueInvalid() throws NamingException
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             //Prevent Failover
             ((AMQConnection) conn).setConnectionListener(this);
@@ -171,7 +165,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -189,11 +183,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testClientCreateNamedQueue() throws JMSException, URLSyntaxException, AMQException
+    public void testClientCreateNamedQueue() throws NamingException, JMSException, AMQException
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -207,6 +201,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
         catch (AMQAuthenticationException amqe)
         {
+            amqe.printStackTrace();
             assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) amqe).getErrorCode().getCode());
         }
     }
@@ -215,7 +210,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             ((AMQConnection) conn).setConnectionListener(this);
 
@@ -242,7 +237,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             ((AMQConnection) conn).setConnectionListener(this);
 
@@ -268,11 +263,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testClientPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException
+    public void testClientPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
     {
         try
         {
-            Connection conn = createConnection("client", "guest");
+            Connection conn = getConnection("client", "guest");
 
             ((AMQConnection) conn).setConnectionListener(this);
 
@@ -317,7 +312,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
     {
         try
         {
-            Connection conn = createConnection("server", "guest");
+            Connection conn = getConnection("server", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -333,11 +328,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException
+    public void testServerConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException, NamingException
     {
         try
-        {                                                      
-            Connection conn = createConnection("client", "guest");
+        {
+            Connection conn = getConnection("client", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -358,11 +353,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerConsumeFromTemporaryQueue() throws AMQException, URLSyntaxException
+    public void testServerConsumeFromTemporaryQueue() throws AMQException, URLSyntaxException, NamingException
     {
         try
         {
-            Connection conn = createConnection("server","guest");
+            Connection conn = getConnection("server", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -382,30 +377,22 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    private Connection createConnection(String username, String password) throws AMQException
+    @Override
+    public Connection getConnection(String username, String password) throws NamingException, JMSException
     {
-        AMQConnection connection = null;
-        try
-        {
-            connection = new AMQConnection(createConnectionString(username, password, BROKER));
-        }
-        catch (URLSyntaxException e)
-        {
-            // This should never happen as we generate the URLs.
-            fail(e.getMessage());
-        }
+        AMQConnection connection = (AMQConnection) super.getConnection(username, password);
 
         //Prevent Failover
         connection.setConnectionListener(this);
 
-        return (Connection)connection;
+        return (Connection) connection;
     }
 
     public void testServerCreateNamedQueueValid() throws JMSException, URLSyntaxException
     {
         try
         {
-            Connection conn = createConnection("server", "guest");
+            Connection conn = getConnection("server", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -422,11 +409,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException
+    public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException, NamingException
     {
         try
         {
-            Connection conn = createConnection("server", "guest");
+            Connection conn = getConnection("server", "guest");
 
             Session sesh = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -444,18 +431,18 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerCreateTemporaryQueueInvalid() throws JMSException, URLSyntaxException, AMQException
+    public void testServerCreateTemporaryQueueInvalid() throws NamingException
     {
         try
         {
-            Connection conn = createConnection("server", "guest");
+            Connection conn = getConnection("server", "guest");
 
             Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             conn.start();
 
             session.createTemporaryQueue();
-                    
+
             fail("Test failed as creation succeded.");
             //conn will be automatically closed
         }
@@ -469,19 +456,19 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerCreateAutoDeleteQueueInvalid() throws JMSException, URLSyntaxException, AMQException
+    public void testServerCreateAutoDeleteQueueInvalid() throws NamingException, JMSException, AMQException
     {
         Connection connection = null;
         try
         {
-            connection = createConnection("server", "guest");
+            connection = getConnection("server", "guest");
 
             Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             connection.start();
 
             ((AMQSession) session).createQueue(new AMQShortString("again_ensure_auto_delete_queue_for_temporary"),
-                                            true, false, false);
+                                               true, false, false);
 
             fail("Test failed as creation succeded.");
             //connection will be automatically closed
@@ -489,7 +476,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         catch (AMQAuthenticationException amqe)
         {
             assertEquals("Incorrect error code thrown", 403, amqe.getErrorCode().getCode());
-        }       
+        }
     }
 
     /**
@@ -500,10 +487,10 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
      * @throws URLSyntaxException
      * @throws JMSException
      */
-    public void testServerPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException, JMSException
+    public void testServerPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
     {
         //Set up the Server
-        Connection serverConnection = createConnection("server", "guest");
+        Connection serverConnection = getConnection("server", "guest");
 
         ((AMQConnection) serverConnection).setConnectionListener(this);
 
@@ -516,7 +503,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         serverConnection.start();
 
         //Set up the consumer
-        Connection clientConnection = createConnection("client", "guest");
+        Connection clientConnection = getConnection("client", "guest");
 
         //Send a test mesage
         Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -557,8 +544,6 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
             //Send the message using a transaction as this will allow us to retrieve any errors that occur on the broker.
             serverSession.commit();
 
-
-
             //Ensure Response is received.
             Message clientResponseMsg = clientResponse.receive(2000);
             assertNotNull("Client did not receive response message,", clientResponseMsg);
@@ -582,11 +567,11 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
     }
 
-    public void testServerPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException
+    public void testServerPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
     {
         try
         {
-            Connection conn = createConnection("server", "guest");
+            Connection conn = getConnection("server", "guest");
 
             ((AMQConnection) conn).setConnectionListener(this);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index 5a5e23baa5..d76d3858b3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -1,31 +1,300 @@
+/*
+ *
+ * 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.
+ *
+ */
 package org.apache.qpid.test.client.message;
 
+import java.util.concurrent.CountDownLatch;
+
 import javax.jms.Connection;
+import javax.jms.DeliveryMode;
 import javax.jms.Destination;
+import javax.jms.InvalidSelectorException;
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import junit.framework.Assert;
 
-import org.apache.log4j.Logger;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.BasicMessageProducer;
 import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class SelectorTest extends QpidTestCase
+public class SelectorTest extends QpidTestCase implements MessageListener
 {
-    private static final Logger _logger = Logger.getLogger(SelectorTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class);
+
+    private AMQConnection _connection;
+    private AMQDestination _destination;
+    private AMQSession _session;
+    private int count;
+    public String _connectionString = "vm://:1";
+    private static final String INVALID_SELECTOR = "Cost LIKE 5";
+    CountDownLatch _responseLatch = new CountDownLatch(1);
+
+    private static final String BAD_MATHS_SELECTOR = " 1 % 5";
+
+    private static final long RECIEVE_TIMEOUT = 1000;
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        BasicConfigurator.configure();
+        init((AMQConnection) getConnection("guest", "guest"));
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        if (_session != null)
+        {
+            try
+            {
+                _session.close();
+            }
+            catch (JMSException e)
+            {
+                fail("Error cleaning up:" + e.getMessage());
+            }
+        }
+        if (_connection != null)
+        {
+            try
+            {
+                _connection.close();
+            }
+            catch (JMSException e)
+            {
+                fail("Error cleaning up:" + e.getMessage());
+            }
+        }
+    }
+
+    private void init(AMQConnection connection) throws JMSException
+    {
+        init(connection, new AMQQueue(connection, randomize("SessionStartTest"), true));
+    }
+
+    private void init(AMQConnection connection, AMQDestination destination) throws JMSException
+    {
+        _connection = connection;
+        _destination = destination;
+        connection.start();
+
+        String selector = null;
+        selector = "Cost = 2 AND \"property-with-hyphen\" = 'wibble'";
+        // selector = "JMSType = Special AND Cost = 2 AND AMQMessageID > 0 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT;
+
+        _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+        // _session.createConsumer(destination).setMessageListener(this);
+        _session.createConsumer(destination, selector).setMessageListener(this);
+    }
+
+    public void test() throws Exception
+    {
+        try
+        {
+            init((AMQConnection) getConnection("guest", "guest", randomize("Client")));
+
+            Message msg = _session.createTextMessage("Message");
+            msg.setJMSPriority(1);
+            msg.setIntProperty("Cost", 2);
+            msg.setStringProperty("property-with-hyphen", "wibble");
+            msg.setJMSType("Special");
+
+            _logger.info("Sending Message:" + msg);
+
+            ((BasicMessageProducer) _session.createProducer(_destination)).send(msg, DeliveryMode.NON_PERSISTENT);
+            _logger.info("Message sent, waiting for response...");
+
+            _responseLatch.await();
+
+            if (count > 0)
+            {
+                _logger.info("Got message");
+            }
+
+            if (count == 0)
+            {
+                fail("Did not get message!");
+                // throw new RuntimeException("Did not get message!");
+            }
+        }
+        catch (JMSException e)
+        {
+            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            if (!(e instanceof InvalidSelectorException))
+            {
+                fail("Wrong exception:" + e.getMessage());
+            }
+            else
+            {
+                System.out.println("SUCCESS!!");
+            }
+        }
+        catch (InterruptedException e)
+        {
+            _logger.debug("IE :" + e.getClass().getSimpleName() + ":" + e.getMessage());
+        }
+        catch (URLSyntaxException e)
+        {
+            _logger.debug("URL:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            fail("Wrong exception");
+        }
+        catch (AMQException e)
+        {
+            _logger.debug("AMQ:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            fail("Wrong exception");
+        }
+
+        finally
+        {
+            if (_session != null)
+            {
+                _session.close();
+            }
+            if (_connection != null)
+            {
+                _connection.close();
+            }
+        }
+    }
+
+    public void testUnparsableSelectors() throws Exception
+    {
+        Connection connection = getConnection("guest", "guest", randomize("Client"));
+        _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+        boolean caught = false;
 
+        //Try Creating a Browser
+        try
+        {
+            _session.createBrowser(_session.createQueue("Ping"), INVALID_SELECTOR);
+        }
+        catch (JMSException e)
+        {
+            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            if (!(e instanceof InvalidSelectorException))
+            {
+                fail("Wrong exception:" + e.getMessage());
+            }
+            caught = true;
+        }
+        assertTrue("No exception thrown!", caught);
+        caught = false;
+
+        //Try Creating a Consumer
+        try
+        {
+            _session.createConsumer(_session.createQueue("Ping"), INVALID_SELECTOR);
+        }
+        catch (JMSException e)
+        {
+            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            if (!(e instanceof InvalidSelectorException))
+            {
+                fail("Wrong exception:" + e.getMessage());
+            }
+            caught = true;
+        }
+        assertTrue("No exception thrown!", caught);
+        caught = false;
+
+        //Try Creating a Receiever
+        try
+        {
+            _session.createReceiver(_session.createQueue("Ping"), INVALID_SELECTOR);
+        }
+        catch (JMSException e)
+        {
+            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            if (!(e instanceof InvalidSelectorException))
+            {
+                fail("Wrong exception:" + e.getMessage());
+            }
+            caught = true;
+        }
+        assertTrue("No exception thrown!", caught);
+        caught = false;
+
+        try
+        {
+            _session.createReceiver(_session.createQueue("Ping"), BAD_MATHS_SELECTOR);
+        }
+        catch (JMSException e)
+        {
+            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
+            if (!(e instanceof InvalidSelectorException))
+            {
+                fail("Wrong exception:" + e.getMessage());
+            }
+            caught = true;
+        }
+        assertTrue("No exception thrown!", caught);
+        caught = false;
+        
+    }
+    
+    public void testRuntimeSelectorError() throws JMSException
+    {
+        MessageConsumer consumer = _session.createConsumer(_destination , "testproperty % 5 = 1");
+        MessageProducer producer = _session.createProducer(_destination);
+        Message sentMsg = _session.createTextMessage();
+        
+        sentMsg.setIntProperty("testproperty", 1); // 1 % 5
+        producer.send(sentMsg);
+        Message recvd = consumer.receive(RECIEVE_TIMEOUT);
+        assertNotNull(recvd);
+        
+        sentMsg.setStringProperty("testproperty", "hello"); // "hello" % 5 makes no sense
+        producer.send(sentMsg);
+        try
+        {
+            recvd = consumer.receive(RECIEVE_TIMEOUT);
+            assertNull(recvd);
+        }
+        catch (Exception e)
+        {
+            
+        }
+        assertTrue("Connection should be closed", _connection.isClosed());
+    }
+        
     public void testSelectorWithJMSMessageID() throws Exception
     {
         Connection conn = getConnection();
         conn.start();
         Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
-
-        Destination dest = session.createQueue("SelectorQueue");
         
-        MessageProducer prod = session.createProducer(dest);
-        MessageConsumer consumer = session.createConsumer(dest,"JMSMessageID IS NOT NULL");
+        MessageProducer prod = session.createProducer(_destination);
+        MessageConsumer consumer = session.createConsumer(_destination,"JMSMessageID IS NOT NULL");
         
         for (int i=0; i<2; i++)
         {
@@ -54,7 +323,7 @@ public class SelectorTest extends QpidTestCase
         Message msg3 = consumer.receive(1000);        
         Assert.assertNull("Msg3 should be null", msg3);
         session.commit();
-        consumer = session.createConsumer(dest,"JMSMessageID IS NULL");
+        consumer = session.createConsumer(_destination,"JMSMessageID IS NULL");
         
         Message msg4 = consumer.receive(1000);
         Message msg5 = consumer.receive(1000);
@@ -62,4 +331,49 @@ public class SelectorTest extends QpidTestCase
         Assert.assertNotNull("Msg4 should not be null", msg4);
         Assert.assertNotNull("Msg5 should not be null", msg5);
     }
+
+    public void onMessage(Message message)
+    {
+        count++;
+        _logger.info("Got Message:" + message);
+        _responseLatch.countDown();
+    }
+
+    private static String randomize(String in)
+    {
+        return in + System.currentTimeMillis();
+    }
+
+    public static void main(String[] argv) throws Exception
+    {
+        SelectorTest test = new SelectorTest();
+        test._connectionString = (argv.length == 0) ? "localhost:3000" : argv[0];
+
+        try
+        {
+            while (true)
+            {
+                if (test._connectionString.contains("vm://:1"))
+                {
+                    test.setUp();
+                }
+                test.test();
+
+                if (test._connectionString.contains("vm://:1"))
+                {
+                    test.tearDown();
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            System.err.println(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(SelectorTest.class);
+    }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
index b13170efc9..a123fb290c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
@@ -57,26 +57,13 @@ public class SyncWaitDelayTest extends QpidTestCase
 
     public void setUp() throws Exception
     {
-        super.setUp();
-        stopBroker();
-        if (!_configFile.exists())
-        {
-            fail("Unable to test without config file:" + _configFile);
-        }
 
-        XMLConfiguration configuration = new XMLConfiguration(_configFile); 
-        configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
-        configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", POST_COMMIT_DELAY);
-        configuration.setProperty("management.enabled", "false");
+        setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+        setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY));
+        setConfigurationProperty("management.enabled", "false");
 
         
-        File tmpFile = File.createTempFile("configFile", "test");
-        tmpFile.deleteOnExit();
-        configuration.save(tmpFile);
-        
-        _configFile = tmpFile;
-
-        startBroker(1);
+        super.setUp();
 
         //Set the syncWrite timeout to be just larger than the delay on the commitTran.
         setSystemProperty("amqj.default_syncwrite_timeout", String.valueOf(SYNC_WRITE_TIMEOUT));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SelectorTest.java
deleted file mode 100644
index c42e4c7582..0000000000
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SelectorTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *
- * 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.
- *
- */
-package org.apache.qpid.test.unit.basic;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.BasicMessageProducer;
-import org.apache.qpid.client.state.StateWaiter;
-import org.apache.qpid.url.URLSyntaxException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.InvalidSelectorException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import java.util.concurrent.CountDownLatch;
-
-public class SelectorTest extends QpidTestCase implements MessageListener
-{
-    private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class);
-
-    private AMQConnection _connection;
-    private AMQDestination _destination;
-    private AMQSession _session;
-    private int count;
-    public String _connectionString = "vm://:1";
-    private static final String INVALID_SELECTOR = "Cost LIKE 5";
-    CountDownLatch _responseLatch = new CountDownLatch(1);
-
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        init((AMQConnection) getConnection("guest", "guest"));
-    }
-
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-
-    private void init(AMQConnection connection) throws JMSException
-    {
-        init(connection, new AMQQueue(connection, randomize("SessionStartTest"), true));
-    }
-
-    private void init(AMQConnection connection, AMQDestination destination) throws JMSException
-    {
-        _connection = connection;
-        _destination = destination;
-        connection.start();
-
-        String selector = null;
-        selector = "Cost = 2 AND \"property-with-hyphen\" = 'wibble'";
-        // selector = "JMSType = Special AND Cost = 2 AND AMQMessageID > 0 AND JMSDeliveryMode=" + DeliveryMode.NON_PERSISTENT;
-
-        _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
-        // _session.createConsumer(destination).setMessageListener(this);
-        _session.createConsumer(destination, selector).setMessageListener(this);
-    }
-
-    public void test() throws Exception
-    {
-        try
-        {
-
-            init((AMQConnection) getConnection("guest", "guest", randomize("Client")));
-
-            Message msg = _session.createTextMessage("Message");
-            msg.setJMSPriority(1);
-            msg.setIntProperty("Cost", 2);
-            msg.setStringProperty("property-with-hyphen", "wibble");
-            msg.setJMSType("Special");
-
-            _logger.info("Sending Message:" + msg);
-
-            ((BasicMessageProducer) _session.createProducer(_destination)).send(msg, DeliveryMode.NON_PERSISTENT);
-            _logger.info("Message sent, waiting for response...");
-
-            _responseLatch.await();
-
-            if (count > 0)
-            {
-                _logger.info("Got message");
-            }
-
-            if (count == 0)
-            {
-                fail("Did not get message!");
-                // throw new RuntimeException("Did not get message!");
-            }
-        }
-        catch (JMSException e)
-        {
-            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            if (!(e instanceof InvalidSelectorException))
-            {
-                fail("Wrong exception:" + e.getMessage());
-            }
-            else
-            {
-                System.out.println("SUCCESS!!");
-            }
-        }
-        catch (InterruptedException e)
-        {
-            _logger.debug("IE :" + e.getClass().getSimpleName() + ":" + e.getMessage());
-        }
-        catch (URLSyntaxException e)
-        {
-            _logger.debug("URL:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            fail("Wrong exception");
-        }
-        catch (AMQException e)
-        {
-            _logger.debug("AMQ:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            fail("Wrong exception");
-        }
-
-        finally
-        {
-            if (_session != null)
-            {
-                _session.close();
-            }
-            if (_connection != null)
-            {
-                _connection.close();
-            }
-        }
-    }
-
-
-    public void testInvalidSelectors() throws Exception
-    {
-        Connection connection = null;
-
-        try
-        {
-            connection = getConnection("guest", "guest", randomize("Client"));
-            _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
-        }
-        catch (JMSException e)
-        {
-            fail(e.getMessage());
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-        catch (URLSyntaxException e)
-        {
-            fail("Error:" + e.getMessage());
-        }
-
-        //Try Creating a Browser
-        try
-        {
-            _session.createBrowser(_session.createQueue("Ping"), INVALID_SELECTOR);
-        }
-        catch (JMSException e)
-        {
-            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            if (!(e instanceof InvalidSelectorException))
-            {
-                fail("Wrong exception:" + e.getMessage());
-            }
-            else
-            {
-                _logger.debug("SUCCESS!!");
-            }
-        }
-
-        //Try Creating a Consumer
-        try
-        {
-            _session.createConsumer(_session.createQueue("Ping"), INVALID_SELECTOR);
-        }
-        catch (JMSException e)
-        {
-            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            if (!(e instanceof InvalidSelectorException))
-            {
-                fail("Wrong exception:" + e.getMessage());
-            }
-            else
-            {
-                _logger.debug("SUCCESS!!");
-            }
-        }
-
-        //Try Creating a Receiever
-        try
-        {
-            _session.createReceiver(_session.createQueue("Ping"), INVALID_SELECTOR);
-        }
-        catch (JMSException e)
-        {
-            _logger.debug("JMS:" + e.getClass().getSimpleName() + ":" + e.getMessage());
-            if (!(e instanceof InvalidSelectorException))
-            {
-                fail("Wrong exception:" + e.getMessage());
-            }
-            else
-            {
-                _logger.debug("SUCCESS!!");
-            }
-        }
-
-        finally
-        {
-            if (_session != null)
-            {
-                try
-                {
-                    _session.close();
-                }
-                catch (JMSException e)
-                {
-                    fail("Error cleaning up:" + e.getMessage());
-                }
-            }
-            if (_connection != null)
-            {
-                try
-                {
-                    _connection.close();
-                }
-                catch (JMSException e)
-                {
-                    fail("Error cleaning up:" + e.getMessage());
-                }
-            }
-        }
-    }
-
-    public void onMessage(Message message)
-    {
-        count++;
-        _logger.info("Got Message:" + message);
-        _responseLatch.countDown();
-    }
-
-    private static String randomize(String in)
-    {
-        return in + System.currentTimeMillis();
-    }
-
-    public static void main(String[] argv) throws Exception
-    {
-        SelectorTest test = new SelectorTest();
-        test._connectionString = (argv.length == 0) ? "localhost:3000" : argv[0];
-
-        try
-        {
-            while (true)
-            {
-                if (test._connectionString.contains("vm://:1"))
-                {
-                    test.setUp();
-                }
-                test.test();
-
-                if (test._connectionString.contains("vm://:1"))
-                {
-                    test.tearDown();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            System.err.println(e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(SelectorTest.class);
-    }
-}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
new file mode 100644
index 0000000000..c9810e7304
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
@@ -0,0 +1,88 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.unit.client;
+
+import org.apache.qpid.test.utils.QpidTestCase;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+/**
+ * QPID-155
+ *
+ * Test to validate that setting the respective qpid.declare_queues,
+ * qpid.declare_exchanges system properties functions as expected.
+ * 
+ */
+public class DynamicQueueExchangeCreateTest extends QpidTestCase
+{
+
+    public void testQueueDeclare() throws Exception
+    {
+        setSystemProperty("qpid.declare_queues", "false");
+
+        Connection connection = getConnection();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Queue queue = session.createQueue(getTestQueueName());
+
+        try
+        {
+            session.createConsumer(queue);
+            fail("JMSException should be thrown as the queue does not exist");
+        }
+        catch (JMSException e)
+        {           
+            assertTrue("Exception should be that the queue does not exist :" +
+                       e.getMessage(),
+                       e.getMessage().contains("does not exist"));
+
+        }
+    }
+
+    public void testExchangeDeclare() throws Exception
+    {
+        setSystemProperty("qpid.declare_exchanges", "false");
+
+        Connection connection = getConnection();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        String EXCHANGE_TYPE = "test.direct";
+        Queue queue = session.createQueue("direct://" + EXCHANGE_TYPE + "/queue/queue");
+
+        try
+        {
+            session.createConsumer(queue);
+            fail("JMSException should be thrown as the exchange does not exist");
+        }
+        catch (JMSException e)
+        {
+            assertTrue("Exception should be that the exchange does not exist :" +
+                       e.getMessage(),
+                       e.getMessage().contains("Exchange " + EXCHANGE_TYPE + " does not exist"));
+        }
+    }
+
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
new file mode 100644
index 0000000000..3fb6cd3526
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
@@ -0,0 +1,119 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.unit.close;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ExchangeDeclareBody;
+import org.apache.qpid.framing.ExchangeDeclareOkBody;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+import javax.jms.Session;
+
+/** QPID-1809
+ *
+ * Race condition on error handling and close logic.
+ *
+ * See most often with SimpleACLTest as this test is the expects the server to
+ * shut the connection/channels. This sort of testing is not performed by many,
+ * if any, of the other system tests.
+ *
+ * The problem is that we have two threads
+ *
+ *  MainThread              Exception(Mina)Thread
+ *     |                          |
+ *    Performs                    |
+ *     ACtion                     |
+ *     |                      Receives Server
+ *     |                        Close
+ *  Blocks for                    |
+ *    Response                    |
+ *      |                     Starts To Notify
+ *      |                        client
+ *      |                         |
+ *      |             <----- Notify Main Thread
+ *    Notification                |
+ *     wakes client               |
+ *      |                         |
+ *     Client then                |
+ * processes Error.               |
+ *      |                         |
+ *   Potentially Attempting      Close Channel/Connection
+ *      Connection Close
+ *
+ * The two threads both attempt to close the connection but the main thread does
+ * so assuming that the connection is open and valid.
+ *
+ * The Exception thread must modify the connection so that no furter syncWait
+ * commands are performed.
+ *
+ * This test sends an ExchangeDeclare that is Asynchronous and will fail and
+ * so cause a ChannelClose error but we perform a syncWait so that we can be
+ * sure to test that the BlockingWaiter is correctly awoken.
+ *  
+ */
+public class JavaServerCloseRaceConditionTest extends QpidTestCase
+{
+    private static final String EXCHANGE_NAME = "NewExchangeNametoFailLookup";
+
+    public void test() throws Exception
+    {
+
+        AMQConnection connection = (AMQConnection) getConnection();
+
+        AMQSession session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // Set no wait true so that we block the connection
+        // Also set a different exchange class string so the attempt to declare
+        // the exchange causes an exchange. 
+        ExchangeDeclareBody body = session.getMethodRegistry().createExchangeDeclareBody(session.getTicket(), new AMQShortString(EXCHANGE_NAME), null,
+                                                                                         true, false, false, false, true, null);
+
+        AMQFrame exchangeDeclare = body.generateFrame(session.getChannelId());
+
+        try
+        {
+            // block our thread so that can times out
+            connection.getProtocolHandler().syncWrite(exchangeDeclare, ExchangeDeclareOkBody.class);
+        }
+        catch (Exception e)
+        {
+            assertTrue("Exception should say the exchange is not known.", e.getMessage().contains("Unknown exchange: " + EXCHANGE_NAME));
+        }
+
+        try
+        {
+            // Depending on if the notification thread has closed the connection
+            // or not we may get an exception here when we attempt to close the
+            // connection. If we do get one then it should be the same as above
+            // an AMQAuthenticationException.
+            connection.close();
+        }
+        catch (Exception e)
+        {
+            assertTrue("Exception should say the exchange is not known.", e.getMessage().contains("Unknown exchange: " + EXCHANGE_NAME));
+        }
+
+    }
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 9c755fcb41..b603455644 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -479,7 +479,7 @@ public class CommitRollbackTest extends QpidTestCase
         _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
         _pubSession.commit();
 
-        assertNotNull(_consumer.receive(100));
+        assertNotNull(_consumer.receive(1000));
 
         _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
new file mode 100644
index 0000000000..3f8cdb9c25
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
@@ -0,0 +1,208 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.test.utils;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.commands.objects.AllObjects;
+import org.apache.qpid.management.common.JMXConnnectionFactory;
+import org.apache.qpid.management.common.mbeans.ManagedBroker;
+import org.apache.qpid.management.common.mbeans.ManagedExchange;
+
+import javax.management.JMException;
+import javax.management.MBeanException;
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import java.io.IOException;
+import java.util.Set;
+
+/**
+ * 
+ */
+public class JMXTestUtils
+{
+    QpidTestCase _test;
+    MBeanServerConnection _mbsc;
+    JMXConnector _jmxc;
+
+    private String USER;
+    private String PASSWORD;
+
+    public JMXTestUtils(QpidTestCase test, String user, String password)
+    {
+        _test = test;
+        USER = user;
+        PASSWORD = password;
+    }
+
+    public void setUp() throws IOException, ConfigurationException, Exception
+    {
+        _test.setConfigurationProperty("management.enabled", "true");       
+    }
+
+    public void open() throws Exception
+    {
+        _jmxc = JMXConnnectionFactory.getJMXConnection(
+                5000, "127.0.0.1",
+                _test.getManagementPort(_test.getPort()), USER, PASSWORD);
+
+        _mbsc = _jmxc.getMBeanServerConnection();
+    }
+
+    public void close() throws IOException
+    {
+        _jmxc.close();
+    }
+
+    /**
+     * Create a non-durable test exchange with the current test name
+     *
+     * @throws javax.management.JMException - is thrown if a exchange with this testName already exists
+     * @throws java.io.IOException          - if there is a problem with the JMX Connection
+     * @throws javax.management.MBeanException
+     *                                      - if there is another problem creating the exchange
+     */
+    public void createExchange(String virtualHostName, String name, String type, boolean durable)
+            throws JMException, IOException, MBeanException
+    {
+        ManagedBroker managedBroker = getManagedBroker(virtualHostName);
+
+        managedBroker.createNewExchange(name, type, durable);
+    }
+
+    /**
+     * Create a non-durable queue (with no owner) that is named after the
+     * creating test.
+     *
+     * @throws JMException - is thrown if a queue with this testName already exists
+     * @throws IOException - if there is a problem with the JMX Connection
+     */
+    public void createQueue(String virtualHostName, String name, String owner, boolean durable)
+            throws JMException, IOException
+    {
+        ManagedBroker managedBroker = getManagedBroker(virtualHostName);
+
+        managedBroker.createNewQueue(name, owner, durable);
+    }
+
+    /**
+     * Retrive the ObjectName for the test Virtualhost.
+     *
+     * This is then use to create aproxy to the ManagedBroker MBean.
+     *
+     * @return the ObjectName for the 'test' VirtualHost.
+     */
+    public ObjectName getVirtualHostManagerObjectName(String vhostName)
+    {
+        // Get the name of the test manager
+        AllObjects allObject = new AllObjects(_mbsc);
+        allObject.querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=" + vhostName + ",*";
+
+        Set<ObjectName> objectNames = allObject.returnObjects();
+
+        _test.assertEquals("Incorrect number test vhosts returned", 1, objectNames.size());
+
+        // We have verified we have only one value in objectNames so return it
+        return objectNames.iterator().next();
+    }
+
+    /**
+     * Retrive the ObjectName for the given Exchange on the test Virtualhost.
+     *
+     * This is then use to create aproxy to the ManagedExchange MBean.
+     *
+     * @param queue The exchange to retireve e.g. 'direct'
+     *
+     * @return the ObjectName for the given exchange on the test VirtualHost.
+     */
+    public ObjectName getQueueObjectName(String virtualHostName, String queue)
+    {
+        // Get the name of the test manager
+        AllObjects allObject = new AllObjects(_mbsc);
+        allObject.querystring = "org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + virtualHostName + ",name=" + queue + ",*";
+
+        Set<ObjectName> objectNames = allObject.returnObjects();
+
+        _test.assertEquals("Incorrect number of exchange with name '" + queue +
+                           "' returned", 1, objectNames.size());
+
+        // We have verified we have only one value in objectNames so return it
+        return objectNames.iterator().next();
+    }
+
+    /**
+     * Retrive the ObjectName for the given Exchange on the test Virtualhost.
+     *
+     * This is then use to create aproxy to the ManagedExchange MBean.
+     *
+     * @param virtualHostName
+     * @param exchange        The exchange to retireve e.g. 'direct'
+     *
+     * @return the ObjectName for the given exchange on the test VirtualHost.
+     */
+    public ObjectName getExchangeObjectName(String virtualHostName, String exchange)
+    {
+        // Get the name of the test manager
+        AllObjects allObject = new AllObjects(_mbsc);
+        allObject.querystring = "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost=" + virtualHostName + ",name=" + exchange + ",*";
+
+        Set<ObjectName> objectNames = allObject.returnObjects();
+
+        _test.assertEquals("Incorrect number of exchange with name '" + exchange +
+                           "' returned", 1, objectNames.size());
+
+        // We have verified we have only one value in objectNames so return it
+        return objectNames.iterator().next();
+    }
+
+    public <T> T getManagedObject(Class<T> managedClass, String queryString)
+    {
+        AllObjects allObject = new AllObjects(_mbsc);
+        allObject.querystring = queryString;
+
+        Set<ObjectName> objectNames = allObject.returnObjects();
+
+        _test.assertEquals("More than one " + managedClass + " returned", 1, objectNames.size());
+
+        ObjectName objectName = objectNames.iterator().next();
+
+        return getManagedObject(managedClass, objectName);
+    }
+
+    public <T> T getManagedObject(Class<T> managedClass, ObjectName objectName)
+    {
+        return MBeanServerInvocationHandler.
+                newProxyInstance(_mbsc, objectName, managedClass, false);
+    }
+
+    public ManagedBroker getManagedBroker(String virtualHost)
+    {
+        return getManagedObject(ManagedBroker.class, getVirtualHostManagerObjectName(virtualHost).toString());
+    }
+
+    public ManagedExchange getManagedExchange(String exchangeName)
+    {
+        return MBeanServerInvocationHandler.
+                newProxyInstance(_mbsc, getExchangeObjectName("test", exchangeName),
+                                 ManagedExchange.class, false);
+    }
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index db096710dc..bed5d3242a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
 import junit.framework.TestResult;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.client.transport.TransportConnection;
@@ -30,6 +31,7 @@ import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
 import org.apache.qpid.server.store.DerbyMessageStore;
+import org.apache.qpid.url.URLSyntaxException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +75,7 @@ public class QpidTestCase extends TestCase
     protected long RECEIVE_TIMEOUT = 1000l;
 
     private Map<String, String> _setProperties = new HashMap<String, String>();
+    private XMLConfiguration _testConfiguration = new XMLConfiguration();
 
     /**
      * Some tests are excluded when the property test.excludes is set to true.
@@ -183,8 +186,7 @@ public class QpidTestCase extends TestCase
     public static final String QUEUE = "queue";
     public static final String TOPIC = "topic";
     /** Map to hold test defined environment properties */
-    private Map<String,String> _env;
-
+    private Map<String, String> _env;
 
     public QpidTestCase(String name)
     {
@@ -335,7 +337,7 @@ public class QpidTestCase extends TestCase
                         latch.countDown();
                     }
 
-                    if (latch != null && line.contains(stopped))
+                    if (!seenReady && line.contains(stopped))
                     {
                         stopLine = line;
                     }
@@ -368,7 +370,9 @@ public class QpidTestCase extends TestCase
 
     /**
      * Return the management portin use by the broker on this main port
+     *
      * @param mainPort the broker's main port.
+     *
      * @return the management port that corresponds to the broker on the given port
      */
     protected int getManagementPort(int mainPort)
@@ -415,9 +419,14 @@ public class QpidTestCase extends TestCase
     {
         port = getPort(port);
 
+        // Save any configuratio changes that have been made
+        saveTestConfiguration();
+
         Process process = null;
         if (_broker.equals(VM))
         {
+            setConfigurationProperty("management.jmxport", String.valueOf(getManagementPort(port)));
+            saveTestConfiguration();
             // create an in_VM broker
             ApplicationRegistry.initialise(new ConfigurationFileApplicationRegistry(_configFile), port);
             TransportConnection.createVMBroker(port);
@@ -438,15 +447,35 @@ public class QpidTestCase extends TestCase
             env.put("PATH", env.get("PATH").concat(File.pathSeparator + qpidHome + "/bin"));
 
             //Add the test name to the broker run.
-            env.put("QPID_PNAME", "-DPNAME=\"" + _testName + "\"");
+            // DON'T change PNAME, qpid.stop needs this value.
+            env.put("QPID_PNAME", "-DPNAME=QPBRKR -DTNAME=\"" + _testName + "\"");
             env.put("QPID_WORK", System.getProperty("QPID_WORK"));
 
             // Add all the environment settings the test requested
             if (!_env.isEmpty())
             {
-                for(Map.Entry<String,String> entry : _env.entrySet())
+                for (Map.Entry<String, String> entry : _env.entrySet())
+                {
+                    env.put(entry.getKey(), entry.getValue());
+                }
+            }
+
+            String QPID_OPTS = " ";
+            // Add all the specified system properties to QPID_OPTS
+            if (!_setProperties.isEmpty())
+            {
+                for (String key : _setProperties.keySet())
+                {
+                    QPID_OPTS += "-D" + key + "=" + System.getProperty(key) + " ";
+                }
+
+                if (env.containsKey("QPID_OPTS"))
                 {
-                    env.put(entry.getKey() ,entry.getValue());
+                    env.put("QPID_OPTS", env.get("QPID_OPTS") + QPID_OPTS);
+                }
+                else
+                {
+                    env.put("QPID_OPTS", QPID_OPTS);
                 }
             }
 
@@ -484,6 +513,27 @@ public class QpidTestCase extends TestCase
         _brokers.put(port, process);
     }
 
+    public String getTestConfigFile()
+    {
+        String path = _output == null ? System.getProperty("java.io.tmpdir") : _output;
+        return path + "/" + getTestQueueName() + ".xml";
+    }
+
+    protected void saveTestConfiguration() throws ConfigurationException
+    {
+        String testConfig = getTestConfigFile();
+        //Specifiy the test configuration
+        setSystemProperty("test.config", testConfig);
+
+        // This is a work
+        if (_testConfiguration.isEmpty())
+        {
+            _testConfiguration.addProperty("test", getTestQueueName());
+        }
+
+        _testConfiguration.save(getTestConfigFile());
+    }
+
     public void cleanBroker()
     {
         if (_brokerClean != null)
@@ -565,18 +615,12 @@ public class QpidTestCase extends TestCase
             storeClass = bdb;
         }
 
-        // First we munge the config file and, if we're in a VM, set up an additional logfile
-        XMLConfiguration configuration = new XMLConfiguration(_configFile);
-        configuration.setProperty("virtualhosts.virtualhost." + virtualhost +
+
+        _testConfiguration.setProperty("virtualhosts.virtualhost." + virtualhost +
                                   ".store.class", storeClass.getName());
-        configuration.setProperty("virtualhosts.virtualhost." + virtualhost +
+        _testConfiguration.setProperty("virtualhosts.virtualhost." + virtualhost +
                                   ".store." + DerbyMessageStore.ENVIRONMENT_PATH_PROPERTY,
-                                  "${work}/" + virtualhost);
-
-        File tmpFile = File.createTempFile("configFile", "test");
-        tmpFile.deleteOnExit();
-        configuration.save(tmpFile);
-        _configFile = tmpFile;
+                                  "${QPID_WORK}/" + virtualhost);
     }
 
     /**
@@ -591,6 +635,10 @@ public class QpidTestCase extends TestCase
      */
     protected String getConfigurationStringProperty(String property) throws ConfigurationException
     {
+        // Call save Configuration to be sure we have saved the test specific
+        // file. As the optional status
+        saveTestConfiguration();
+
         ServerConfiguration configuration = new ServerConfiguration(_configFile);
         return configuration.getConfig().getString(property);
     }
@@ -613,48 +661,9 @@ public class QpidTestCase extends TestCase
     protected void setConfigurationProperty(String property, String value)
             throws ConfigurationException, IOException
     {
-        XMLConfiguration configuration = new XMLConfiguration(_configFile);
-
-        // If we are modifying a virtualhost value then we need to do so in
-        // the virtualhost.xml file as these values overwrite the values in
-        // the main config.xml file
-        if (property.startsWith("virtualhosts"))
-        {
-            // So locate the virtualhost.xml file and use the ServerConfiguration
-            // flatConfig method to get the interpolated value.
-            String vhostConfigFile = ServerConfiguration.
-                    flatConfig(_configFile).getString("virtualhosts");
-
-            // Load the vhostConfigFile
-            XMLConfiguration vhostConfiguration = new XMLConfiguration(vhostConfigFile);
-
-            // Set the value specified in to the vhostConfig.
-            // Remembering that property will be 'virtualhosts.virtulhost....'
-            // so we need to take off the 'virtualhosts.' from the start.
-            vhostConfiguration.setProperty(property.substring(property.indexOf(".") + 1), value);
-
-            // Write out the new virtualhost config file
-            File tmpFile = File.createTempFile("virtualhost-configFile", ".xml");
-            tmpFile.deleteOnExit();
-            vhostConfiguration.save(tmpFile);
-
-            // Change the property and value to be the new virtualhosts file
-            // so that then update the value in the main config file.
-            property = "virtualhosts";
-            value = tmpFile.getAbsolutePath();
-        }
-
-        configuration.setProperty(property, value);
-
-        // Write the new server config file
-        File tmpFile = File.createTempFile("configFile", ".xml");
-        tmpFile.deleteOnExit();
-        configuration.save(tmpFile);
-
-        _logger.info("Qpid Test Case now using configuration File:"
-                     + tmpFile.getAbsolutePath());
-
-        _configFile = tmpFile;
+        //Write the value in to this configuration file which will override the
+        // defaults.
+        _testConfiguration.setProperty(property, value);
     }
 
     /**
@@ -695,14 +704,13 @@ public class QpidTestCase extends TestCase
      * Add an environtmen variable for the external broker environment
      *
      * @param property the property to set
-     * @param value the value to set it to
+     * @param value    the value to set it to
      */
     protected void setBrokerEnvironment(String property, String value)
     {
-        _env.put(property,value);
+        _env.put(property, value);
     }
 
-
     /**
      * Check whether the broker is an 0.8
      *
@@ -720,7 +728,7 @@ public class QpidTestCase extends TestCase
 
     protected boolean isJavaBroker()
     {
-        return _brokerLanguage.equals("java");
+        return _brokerLanguage.equals("java") || _broker.equals("vm");
     }
 
     protected boolean isCppBroker()
@@ -831,7 +839,7 @@ public class QpidTestCase extends TestCase
      *
      * @throws Exception if there is an error getting the connection
      */
-    public Connection getConnection(String username, String password) throws Exception
+    public Connection getConnection(String username, String password) throws JMSException, NamingException
     {
         _logger.info("get Connection");
         Connection con = getConnectionFactory().createConnection(username, password);
@@ -840,7 +848,7 @@ public class QpidTestCase extends TestCase
         return con;
     }
 
-    public Connection getConnection(String username, String password, String id) throws Exception
+    public Connection getConnection(String username, String password, String id) throws JMSException, URLSyntaxException, AMQException, NamingException
     {
         _logger.info("get Connection");
         Connection con;
@@ -860,6 +868,7 @@ public class QpidTestCase extends TestCase
     /**
      * Return a uniqueName for this test.
      * In this case it returns a queue Named by the TestCase and TestName
+     *
      * @return String name for a queue
      */
     protected String getTestQueueName()
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
index b721e27726..2b9fe8e039 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
@@ -158,18 +158,6 @@ public class LogMonitorTest extends TestCase
         validateLogDoesNotContainsMessage(_monitor, notLogged);
     }
 
-    public void testWaitForMessage_Found() throws IOException
-    {
-        String message = getName() + ": Test Message";
-
-        long TIME_OUT = 2000;
-
-        logMessageWithDelay(message, TIME_OUT / 2);
-
-        assertTrue("Message was not logged ",
-                    _monitor.waitForMessage(message, TIME_OUT));
-    }
-
     public void testWaitForMessage_Timeout() throws IOException
     {
         String message = getName() + ": Test Message";
diff --git a/qpid/java/test-profiles/010Excludes b/qpid/java/test-profiles/010Excludes
index e238934124..f03d62667d 100644
--- a/qpid/java/test-profiles/010Excludes
+++ b/qpid/java/test-profiles/010Excludes
@@ -83,3 +83,12 @@ org.apache.qpid.server.logging.*
 
 // CPP Broker does not have a JMX interface to test
 org.apache.qpid.management.jmx.*
+// JMX is used in this test for validation
+org.apache.qpid.server.queue.ModelTest#*
+
+
+// 0-10 is not supported by the MethodRegistry
+org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
+
+// QPID-2084 : this test needs more work for 0-10
+org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
diff --git a/qpid/java/test-profiles/08Excludes b/qpid/java/test-profiles/08Excludes
index 0866694854..b277c6d929 100644
--- a/qpid/java/test-profiles/08Excludes
+++ b/qpid/java/test-profiles/08Excludes
@@ -15,3 +15,8 @@ org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 org.apache.qpid.client.SessionCreateTest#*
 
 org.apache.qpid.test.client.RollbackOrderTest#*
+
+// QPID-2097 exclude it from the InVM test runs until InVM JMX Interface is reliable
+org.apache.qpid.management.jmx.ManagementActorLoggingTest#*
+org.apache.qpid.server.queue.ModelTest#*
+
diff --git a/qpid/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
index 7ef2a15e51..a72d3bc86c 100644
--- a/qpid/java/test-profiles/Excludes
+++ b/qpid/java/test-profiles/Excludes
@@ -13,5 +13,9 @@ org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownListeningTCPS
 org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownStopped
 org.apache.qpid.server.logging.VirtualHostLoggingTest#testVirtualhostClosure
 org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose
-org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#testMessageStoreClose
 
+// QPID-XXX : Test fails to start external broker due to Derby Exception.
+org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#*
+
+// QPID-2081 :The configuration changes are now highlighting the close race condition
+org.apache.qpid.server.security.acl.SimpleACLTest#*
diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile
index 1d5416fe19..b3b979c786 100644
--- a/qpid/java/test-profiles/cpp.testprofile
+++ b/qpid/java/test-profiles/cpp.testprofile
@@ -8,6 +8,7 @@ broker.executable=${broker.dir}/qpidd
 broker.module.ssl=${module.dir}/ssl.so
 broker.module.cluster=${module.dir}/cluster.so
 broker.module.store=${store.module.dir}/msgstore.so
+broker.stopped=Exception constructed
 
 broker.modules=
 broker.args=
diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
index 49d4a25b82..86a5b2efb3 100644
--- a/qpid/java/test-profiles/default.testprofile
+++ b/qpid/java/test-profiles/default.testprofile
@@ -18,9 +18,10 @@ log4j.debug=false
 
 test.port=15672
 test.mport=18999
+#Note : Management will start open second port on: mport + 100 : 19099 
 test.port.ssl=15671
-test.port.alt=15772
-test.port.alt.ssl=15771
+test.port.alt=25672
+test.port.alt.ssl=25671
 
 test.exclude=true
 profile.excludes=08TransientExcludes
author	Robert Godfrey <rgodfrey@apache.org>	2009-10-05 12:51:57 +0000
committer	Robert Godfrey <rgodfrey@apache.org>	2009-10-05 12:51:57 +0000
commit	f67026b148b3429ca9731bce94a0bd3ff2981ce5 (patch)
tree	95e7dfcfff6640d83b4171520bffb4d4b2304b9a /qpid/java
parent	69e05a6b0979d2e12588635a4ed46a09a87cdec0 (diff)
download	qpid-python-f67026b148b3429ca9731bce94a0bd3ff2981ce5.tar.gz