QPID-1185: replaced occurrances of with , also made default.testprofile always load so that all other testprofiles only need to override values that are different

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

6 files changed, 11 insertions, 76 deletions

diff --git a/qpid/java/cpp.async.testprofile b/qpid/java/cpp.async.testprofile
index ad0317472e..c7554165f0 100644
--- a/qpid/java/cpp.async.testprofile
+++ b/qpid/java/cpp.async.testprofile
@@ -1,20 +1,3 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --auth no
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-java.naming.provider.url=${project.root}/test-provider.properties
-max_prefetch=1000
-test.excludes=true
 test.excludesfile=${project.root}/010ExcludeList-store
-log=info
-amqj.logging.level=$log
-amqj.protocol.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
-log4j.debug=false
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
diff --git a/qpid/java/cpp.sync.testprofile b/qpid/java/cpp.sync.testprofile
index 643e2eba79..961b595f89 100644
--- a/qpid/java/cpp.sync.testprofile
+++ b/qpid/java/cpp.sync.testprofile
@@ -1,20 +1,3 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --store-async no --auth no
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-java.naming.provider.url=${project.root}/test-provider.properties
-test.excludes=true
-max_prefetch=1000
 test.excludesfile=${project.root}/010ExcludeList-store
-log=info
-amqj.logging.level=$log
-amqj.protocol.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
-log4j.debug=false
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
diff --git a/qpid/java/cpp.testprofile b/qpid/java/cpp.testprofile
index e4db7fcd3a..68ac8b8be8 100644
--- a/qpid/java/cpp.testprofile
+++ b/qpid/java/cpp.testprofile
@@ -1,20 +1,3 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --auth no
-broker.clean=${project.root}/clean-dir ${build.data}
-broker.ready=Listening on TCP port
-java.naming.provider.url=${project.root}/test-provider.properties
-max_prefetch=1000
-test.excludes=true
 test.excludesfile=${project.root}/010ExcludeList
-log=info
-amqj.logging.level=$log
-amqj.protocol.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
-log4j.debug=false
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
diff --git a/qpid/java/default-longrunning.testprofile b/qpid/java/default-longrunning.testprofile
index 819e873370..155e78ad0a 100644
--- a/qpid/java/default-longrunning.testprofile
+++ b/qpid/java/default-longrunning.testprofile
@@ -1,20 +1 @@
-broker.version=0-8
-broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
-java.naming.provider.url=${project.root}/test-provider.properties
-test.excludes=true
-test.excludesfile=${project.root}/08ExcludeList
 test.includesfile=${project.root}/08LongRunningList
-log=info
-max_prefetch=1000
-amqj.logging.level=$log
-amqj.protocol.logging.level=$log
-root.logging.level=$log
-log4j.configuration=file:///${project.root}/log4j-test.xml
-log4j.debug=false
-test.fork=no
-test.mem=512M
-test=*Test
-haltonfailure=no
-haltonerror=no
-exclude.modules=none
diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile
index 30e13f9b38..7354cbda48 100644
--- a/qpid/java/default.testprofile
+++ b/qpid/java/default.testprofile
@@ -1,16 +1,20 @@
 broker.version=0-8
 broker=vm
 broker.clean=${project.root}/clean-dir ${build.data}
+broker.ready=Listening on TCP port
+
 java.naming.provider.url=${project.root}/test-provider.properties
-test.excludes=true
-test.excludesfile=${project.root}/08ExcludeList
-log=info
 max_prefetch=1000
-amqj.logging.level=$log
-amqj.protocol.logging.level=$log
-root.logging.level=$log
+
+log=debug
+amqj.logging.level=${log}
+amqj.protocol.logging.level=${log}
+root.logging.level=${log}
 log4j.configuration=file:///${project.root}/log4j-test.xml
 log4j.debug=false
+
+test.excludes=true
+test.excludesfile=${project.root}/08ExcludeList
 test.fork=no
 test.mem=512M
 test=*Test
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 38f8a1a779..84b3b0f2f3 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -193,6 +193,7 @@
 
 
   <property file="${project.root}/${config}"/>
+  <property file="${project.root}/default.testprofile"/>
 
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />