9 files changed, 29 insertions, 15 deletions
diff --git a/qpid/java/broker-plugins/experimental/info/build.xml b/qpid/java/broker-plugins/experimental/info/build.xml
index caf4b138a4..c5881aa839 100644
--- a/qpid/java/broker-plugins/experimental/info/build.xml
+++ b/qpid/java/broker-plugins/experimental/info/build.xml
@@ -21,7 +21,7 @@ nn - or more contributor license agreements.  See the NOTICE file
 <project name="AMQ Broker Info Plugin" default="build">
 
     <property name="module.depends" value="common broker broker-plugins"/>
-    <property name="module.test.depends" value="test broker/test management/common client systests"/>
+    <property name="module.test.depends" value="test broker/test management/common client systests common/test"/>
     <property name="module.manifest" value="MANIFEST.MF"/>
     <property name="module.plugin" value="true"/>
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index f731988a8e..99053ca45a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.util;
 
-import junit.framework.TestCase;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.common.AMQPFilterTypes;
@@ -44,10 +43,11 @@ import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.MockChannel;
 
 
-public class InternalBrokerBaseCase extends TestCase
+public class InternalBrokerBaseCase extends QpidTestCase
 {
     protected IApplicationRegistry _registry;
     protected MessageStore _messageStore;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
index d5b87be5d1..8b470d555e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
 public class QpidTestCase extends TestCase
 {
     protected static final Logger _logger = Logger.getLogger(QpidTestCase.class);
-    
+
     /**
      * Some tests are excluded when the property test.excludes is set to true.
      * An exclusion list is either a file (prop test.excludesfile) which contains one test name
@@ -91,8 +91,21 @@ public class QpidTestCase extends TestCase
         }
     }
     
+    protected static final String MS_CLASS_NAME_KEY = "messagestore.class.name";
+    protected static final String MEMORY_STORE_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStore";
+    
     private static List<String> _exclusionList;
     
+    public QpidTestCase()
+    {
+        this("QpidTestCase");
+    }
+
+    public QpidTestCase(String name)
+    {
+        super(name);
+    }
+
     public void run(TestResult testResult)
     {
         if (_exclusionList != null && (_exclusionList.contains(getClass().getPackage().getName() + ".*") ||
@@ -107,14 +120,11 @@ public class QpidTestCase extends TestCase
             super.run(testResult);
         }
     }
-    
-    public QpidTestCase(String name)
-    {
-        super(name);
-    }
-    
-    public QpidTestCase()
+
+    public String getTestProfileMessageStoreClassName()
     {
-        this("QpidTestCase");
+        String storeClass = System.getProperty(MS_CLASS_NAME_KEY);
+        
+        return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
     }
 }
diff --git a/qpid/java/integrationtests/build.xml b/qpid/java/integrationtests/build.xml
index 29d066edb7..ae870c5675 100644
--- a/qpid/java/integrationtests/build.xml
+++ b/qpid/java/integrationtests/build.xml
@@ -20,7 +20,7 @@
  -->
 <project name="Integration Tests" default="build">
 
-    <property name="module.depends" value="systests client common junit-toolkit"/>
+    <property name="module.depends" value="systests client common common/test junit-toolkit"/>
     <property name="module.dist" value="false"/>
 
     <import file="../module.xml"/>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 228f2fd722..d4007e067c 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -324,6 +324,7 @@
       <sysproperty key="broker.ready" value="${broker.ready}" />
       <sysproperty key="broker.stopped" value="${broker.stopped}" />
       <sysproperty key="broker.config" value="${broker.config}" />
+      <sysproperty key="messagestore.class.name" value="${messagestore.class.name}" />
       <sysproperty key="test.output" value="${module.results}"/>
       <sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>
 
diff --git a/qpid/java/perftests/build.xml b/qpid/java/perftests/build.xml
index 19cccb34a5..497bfc8035 100644
--- a/qpid/java/perftests/build.xml
+++ b/qpid/java/perftests/build.xml
@@ -20,7 +20,7 @@
  -->
 <project name="Performance Tests" default="build">
 
-    <property name="module.depends" value="systests client broker common junit-toolkit"/>
+    <property name="module.depends" value="systests client broker common common/test junit-toolkit"/>
 
     <import file="../module.xml"/>
 
diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
index 4ab1f484d9..ebab069af9 100644
--- a/qpid/java/test-profiles/default.testprofile
+++ b/qpid/java/test-profiles/default.testprofile
@@ -5,9 +5,10 @@ broker.version=0-8
 broker=vm
 broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=Listening on TCP port
-broker.config=${project.root}/build/etc/config-systests.xml
 broker.start=${test.profiles}/start-broker
 broker.kill=${test.profiles}/kill-broker
+broker.config=${project.root}/build/etc/config-systests.xml
+messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
 
 max_prefetch=1000
 qpid.dest_syntax=BURL
diff --git a/qpid/java/test-profiles/java-derby.0.10.testprofile b/qpid/java/test-profiles/java-derby.0.10.testprofile
index 511e51ec1d..8c53a9423a 100644
--- a/qpid/java/test-profiles/java-derby.0.10.testprofile
+++ b/qpid/java/test-profiles/java-derby.0.10.testprofile
@@ -5,6 +5,7 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=${project.root}/build/etc/config-systests-derby.xml
+messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
diff --git a/qpid/java/test-profiles/java-derby.testprofile b/qpid/java/test-profiles/java-derby.testprofile
index 742af29ffa..a88f2d852d 100644
--- a/qpid/java/test-profiles/java-derby.testprofile
+++ b/qpid/java/test-profiles/java-derby.testprofile
@@ -4,6 +4,7 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=${project.root}/build/etc/config-systests-derby.xml
+messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes
 broker.clean.between.tests=true
 broker.persistent=true