Change test-profiles to remove references to messagestore class

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

29 files changed, 21 insertions, 49 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 ed58a7d3b5..fca5c39a6d 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
@@ -25,9 +25,8 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 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 32243cea61..74ee344ced 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
@@ -25,7 +25,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 354bf6c131..c747b8703d 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
@@ -25,7 +25,7 @@ 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
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 e07d1ca339..6d0c4be6da 100644
--- a/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
@@ -25,7 +25,7 @@ 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
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 36f4123ad0..373647368f 100644
--- a/qpid/java/test-profiles/java-bdb.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-10.testprofile
@@ -26,10 +26,9 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 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 27284b3f13..1882d916f5 100644
--- a/qpid/java/test-profiles/java-bdb.0-8.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-8.testprofile
@@ -26,7 +26,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -35,4 +35,3 @@ 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 4944773e18..36ec86f833 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,7 @@ 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
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 fdd6ce65ac..b493181894 100644
--- a/qpid/java/test-profiles/java-bdb.0-9.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-9.testprofile
@@ -25,7 +25,7 @@ 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
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 d7c7cdef5e..196eccb366 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
@@ -26,8 +26,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 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 c459eb99b1..670d8d1f3e 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
@@ -26,7 +26,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 1e4b30a846..2f345a8fb5 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
@@ -26,7 +26,7 @@ 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-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 e2caf50793..1ffd0b1372 100644
--- a/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
@@ -26,7 +26,7 @@ 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-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 1ae7ac633a..325e84adeb 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
@@ -25,8 +25,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 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 d2a7654006..22a293645c 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
@@ -25,7 +25,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +33,3 @@ 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 3cb8054c07..ac4b71058c 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
@@ -25,7 +25,7 @@ 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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +33,3 @@ 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 e26a545b6b..5d68fc5a52 100644
--- a/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
@@ -25,7 +25,7 @@ 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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +33,3 @@ 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 68b8873abc..d850594c1d 100644
--- a/qpid/java/test-profiles/java-dby.0-10.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-10.testprofile
@@ -26,8 +26,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 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 f08c46ae8f..f296126aaf 100644
--- a/qpid/java/test-profiles/java-dby.0-8.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-8.testprofile
@@ -26,7 +26,7 @@ broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
 broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 ab7f1785e8..5cb5e27937 100644
--- a/qpid/java/test-profiles/java-dby.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9-1.testprofile
@@ -26,7 +26,7 @@ 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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 8b588a0a07..9314e3e9ee 100644
--- a/qpid/java/test-profiles/java-dby.0-9.testprofile
+++ b/qpid/java/test-profiles/java-dby.0-9.testprofile
@@ -26,7 +26,7 @@ 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-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +34,3 @@ 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 15a1d365af..c2f2976d5f 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
@@ -30,4 +30,3 @@ 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 2f6a5d8c1c..74da76edc4 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
@@ -30,4 +30,3 @@ 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 f9b12d5eb5..4438a4293f 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,4 +30,3 @@ 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 8fd760bca7..828ad3fedf 100644
--- a/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
@@ -30,4 +30,3 @@ 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 480d6307b1..33e90b940a 100644
--- a/qpid/java/test-profiles/java-mms.0-10.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-10.testprofile
@@ -28,4 +28,3 @@ 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 b263cb6c9c..93365e2e5c 100644
--- a/qpid/java/test-profiles/java-mms.0-8.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-8.testprofile
@@ -31,4 +31,3 @@ 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 37f65d3332..78a4629c9b 100644
--- a/qpid/java/test-profiles/java-mms.0-9-1.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9-1.testprofile
@@ -31,4 +31,3 @@ 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 a3d2abfb8a..c5edf32bee 100644
--- a/qpid/java/test-profiles/java-mms.0-9.testprofile
+++ b/qpid/java/test-profiles/java-mms.0-9.testprofile
@@ -31,4 +31,3 @@ 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 4b6a8e5906..93f3c20541 100644
--- a/qpid/java/test-profiles/testprofile.defaults
+++ b/qpid/java/test-profiles/testprofile.defaults
@@ -21,7 +21,7 @@ java.naming.provider.url=${test.profiles}${file.separator}test-provider.properti
 
 broker.ready=Listening on TCP
 broker.config=build/etc/config-systests.json
-messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
+messagestore.type=Memory
 broker.protocol.excludes=
 broker.persistent=false