From f49bc309288098d2ab4858a6555fc30e014e949c Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 7 Jul 2011 15:16:33 +0000
Subject: QPID-3343: refactor test profiles to allow testing within the same
 JVM for all protocols, remove vm:// transport support and associated forked
 Mina classes

Applied patch by Keith Wall and myself

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1143874 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/module.xml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'qpid/java/module.xml')

diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 8c6a05e035..c7819febf4 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -295,7 +295,7 @@
   </target>
 
 
-  <property name="profile" value="default"/>
+  <property name="profile" value="java-mms.0-10"/>
   <property name="testprofile.file" value="${test.profiles}/${profile}.testprofile"/>
   
   <available file="${testprofile.file}" property="testprofile.file.present"/>
@@ -303,15 +303,14 @@
 
   <property file="${testprofile.file}" prefix="preload"/>
   <property name="preload.include" value=""/>
-  <condition property="profiles"
-             value="${preload.include} ${profile}"
-             else="default ${preload.include} ${profile}">
-    <equals arg1="${profile}" arg2="default"/>
-  </condition>
+  <property name="profiles" value="${preload.include} ${profile}"/>
   <map property="_profile_files" value="${profiles}" join=" ">
     <globmapper from="*" to="*.testprofile"/>
   </map>
+  
+  <delete file="${build.scratch}/test-${profile}.properties" quiet="true"/>
   <concat destfile="${build.scratch}/test-${profile}.properties" force="no" fixlastline="yes">
+    <filelist dir="${test.profiles}" files="testprofile.defaults"/>
     <filelist dir="${test.profiles}" files="${_profile_files}"/>
   </concat>
   <property file="${build.scratch}/test-${profile}.properties"/>
@@ -320,7 +319,6 @@
     <globmapper from="*" to="${test.profiles}/*"/>
   </map>
 
-
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />
   </condition>
@@ -348,15 +346,6 @@
       <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
       <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
       <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
-      <sysproperty key="broker" value="${broker}"/>
-      <sysproperty key="broker.clean" value="${broker.clean}"/>
-      <sysproperty key="broker.clean.between.tests" value="${broker.clean.between.tests}"/>
-      <sysproperty key="broker.existing.qpid.work" value="${broker.existing.qpid.work}"/>
-      <sysproperty key="broker.persistent" value="${broker.persistent}"/>
-      <sysproperty key="broker.version" value="${broker.version}"/>
-      <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}"/>
-- 
cgit v1.2.1