Author: rhs
Date: Sun Jul 20 01:46:55 2008
New Revision: 678260
URL: http://svn.apache.org/viewvc?rev=678260&view=rev
Log:
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
Modified:
incubator/qpid/trunk/qpid/java/cpp.async.testprofile
incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
incubator/qpid/trunk/qpid/java/cpp.testprofile
incubator/qpid/trunk/qpid/java/default-longrunning.testprofile
incubator/qpid/trunk/qpid/java/default.testprofile
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.async.testprofile?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.async.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.async.testprofile Sun Jul 20 01:46:55
2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.sync.testprofile?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.sync.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.sync.testprofile Sun Jul 20 01:46:55 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/cpp.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.testprofile?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.testprofile Sun Jul 20 01:46:55 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/default-longrunning.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default-longrunning.testprofile?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default-longrunning.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default-longrunning.testprofile Sun Jul 20
01:46:55 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/default.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default.testprofile?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default.testprofile Sun Jul 20 01:46:55 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=678260&r1=678259&r2=678260&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Sun Jul 20 01:46:55 2008
@@ -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}" />
