QPID-5624: Remove virtualhost xml configuration. Move virtual host configuration into broker configuration store"

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1576732 13f79535-47bb-0310-9956-ffa450edef68

29 files changed, 29 insertions, 19 deletions

diff --git a/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
index 4230888a21..ed58a7d3b5 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
@@ -30,4 +30,4 @@ profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcl
 broker.clean.between.tests=true
 broker.persistent=true
 broker.version=v0_10
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
index 054eb9c1b6..32243cea61 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
@@ -34,4 +34,4 @@ broker.version=v0_8
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
index 65d86d9310..354bf6c131 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
@@ -34,4 +34,4 @@ broker.version=v0_9_1
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile b/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
index 4818cfff28..e07d1ca339 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
@@ -34,4 +34,4 @@ broker.version=v0_9
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb.0-10.testprofile b/qpid/java/test-profiles/java-bdb.0-10.testprofile
index cf5f608957..36f4123ad0 100644
--- a/qpid/java/test-profiles/java-bdb.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-10.testprofile
@@ -31,4 +31,5 @@ profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcl
 broker.clean.between.tests=true
 broker.persistent=true
 broker.version=v0_10
+messagestore.type=BDB
 
diff --git a/qpid/java/test-profiles/java-bdb.0-8.testprofile b/qpid/java/test-profiles/java-bdb.0-8.testprofile
index 09270f89b0..27284b3f13 100644
--- a/qpid/java/test-profiles/java-bdb.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-8.testprofile
@@ -35,4 +35,4 @@ broker.version=v0_8
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb.0-9-1.testprofile b/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
index 4248a55f1c..4944773e18 100644
--- a/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
@@ -25,7 +25,6 @@ broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
@@ -35,4 +34,4 @@ broker.version=v0_9_1
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-bdb.0-9.testprofile b/qpid/java/test-profiles/java-bdb.0-9.testprofile
index cff55d7bde..fdd6ce65ac 100644
--- a/qpid/java/test-profiles/java-bdb.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-9.testprofile
@@ -25,7 +25,6 @@ broker.command.windows=build${file.separator}bin${file.separator}qpid-server.bat
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
@@ -35,4 +34,4 @@ broker.version=v0_9
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-
+messagestore.type=BDB
diff --git a/qpid/java/test-profiles/java-dby-mem.0-10.testprofile b/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
index f968d58ec9..d7c7cdef5e 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
@@ -30,3 +30,4 @@ messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
+messagestore.type=DERBY
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-dby-mem.0-8.testprofile b/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
index b50e17b955..c459eb99b1 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile b/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
index d16d17d220..1e4b30a846 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby-mem.0-9.testprofile b/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
index 35f2d0aa8c..e2caf50793 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
index a3ea69a1ee..1ae7ac633a 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
@@ -29,3 +29,4 @@ messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
+messagestore.type=DERBY
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
index 8e737cec7c..d2a7654006 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
@@ -33,4 +33,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
index 9de7a4a490..3cb8054c07 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
@@ -33,4 +33,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile b/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
index 97fff81068..e26a545b6b 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
@@ -33,4 +33,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby.0-10.testprofile b/qpid/java/test-profiles/java-dby.0-10.testprofile
index 07d75577d3..68b8873abc 100644
--- a/qpid/java/test-profiles/java-dby.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-10.testprofile
@@ -30,3 +30,4 @@ messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
+messagestore.type=DERBY
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-dby.0-8.testprofile b/qpid/java/test-profiles/java-dby.0-8.testprofile
index b24dc8381d..f08c46ae8f 100644
--- a/qpid/java/test-profiles/java-dby.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-8.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby.0-9-1.testprofile b/qpid/java/test-profiles/java-dby.0-9-1.testprofile
index ec08913626..ab7f1785e8 100644
--- a/qpid/java/test-profiles/java-dby.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9-1.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-dby.0-9.testprofile b/qpid/java/test-profiles/java-dby.0-9.testprofile
index 73b1161f6b..8b588a0a07 100644
--- a/qpid/java/test-profiles/java-dby.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9.testprofile
@@ -34,4 +34,4 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-
+messagestore.type=DERBY
diff --git a/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
index c2f2976d5f..15a1d365af 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
@@ -30,3 +30,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-10
 profile.excludes=JavaTransientExcludes Java010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
index 74da76edc4..2f6a5d8c1c 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
@@ -30,3 +30,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-8
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
index 4438a4293f..f9b12d5eb5 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
@@ -30,3 +30,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-91
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile b/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
index 828ad3fedf..8fd760bca7 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
@@ -30,3 +30,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-9
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms.0-10.testprofile b/qpid/java/test-profiles/java-mms.0-10.testprofile
index 33e90b940a..480d6307b1 100644
--- a/qpid/java/test-profiles/java-mms.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-10.testprofile
@@ -28,3 +28,4 @@ qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 
 profile.excludes=JavaTransientExcludes Java010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms.0-8.testprofile b/qpid/java/test-profiles/java-mms.0-8.testprofile
index 93365e2e5c..b263cb6c9c 100644
--- a/qpid/java/test-profiles/java-mms.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-8.testprofile
@@ -31,3 +31,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-8
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms.0-9-1.testprofile b/qpid/java/test-profiles/java-mms.0-9-1.testprofile
index 78a4629c9b..37f65d3332 100644
--- a/qpid/java/test-profiles/java-mms.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9-1.testprofile
@@ -31,3 +31,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-91
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/java-mms.0-9.testprofile b/qpid/java/test-profiles/java-mms.0-9.testprofile
index c5edf32bee..a3d2abfb8a 100644
--- a/qpid/java/test-profiles/java-mms.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9.testprofile
@@ -31,3 +31,4 @@ broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 #qpid.amqp.version=0-9
 profile.excludes=JavaTransientExcludes XAExcludes JavaPre010Excludes
+messagestore.type=Memory
\ No newline at end of file
diff --git a/qpid/java/test-profiles/testprofile.defaults b/qpid/java/test-profiles/testprofile.defaults
index ccd31a5d1e..4b6a8e5906 100644
--- a/qpid/java/test-profiles/testprofile.defaults
+++ b/qpid/java/test-profiles/testprofile.defaults
@@ -63,6 +63,6 @@ exclude.modules=none
 
 profile.clustered=false
 broker.config-store-type=json
-broker.virtualhosts-config="${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml"
+