added store prop

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

1 files changed, 11 insertions, 2 deletions

diff --git a/java/module.xml b/java/module.xml
index af943e3b1f..c129c2ea7a 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -26,6 +26,7 @@
     <globmapper from="${project.root}${file.separator}*" to="*"/>
   </map>
 
+
   <property file="${project.root}/build.deps"/>
 
   <property name="module.build"        location="${build}/${module}"/>
@@ -166,9 +167,16 @@
   <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
   <property name="java.naming.provider.url" value="${project.root}/test-provider.properties"/>
 
-  <condition property="broker" value="${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t" else="vm">
+  <condition property="brokerdefault" value="${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t" else="vm">
     <isset property="cpp"/>
-  </condition>
+  </condition>  
+
+ <condition property="broker" value="${brokerdefault} --load-module ${store}" else="${brokerdefault}">
+    <and>
+    	<isset property="store"/>
+    	<isset property="cpp"/>
+    </and>	
+  </condition>  
 
   <condition property="broker.version" value="0-10" else="0-8">
     <isset property="cpp"/>
@@ -176,6 +184,7 @@
 
   <target name="test" depends="compile-tests" if="module.test.src.exists"
           description="execute unit tests">
+    <echo message="=------->>>>>>>>>>>>> ${broker}"/>
     <junit fork="yes" haltonfailure="no" printsummary="on" timeout="600000">
 
       <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>