Author: rhs
Date: Tue Jul 14 19:51:03 2009
New Revision: 794037
URL: http://svn.apache.org/viewvc?rev=794037&view=rev
Log:
added support for profile inheritence and refactored profiles to permit
convenient overriding of broker location and additional broker arguments
Modified:
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.testprofile
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Jul 14 19:51:03 2009
@@ -231,6 +231,9 @@
<property file="${test.profiles}/${config}"/>
+ <foreach property="_profile_" list="${profile.inherit}">
+ <property file="${test.profiles}/${_profile_}.testprofile"/>
+ </foreach>
<property file="${test.profiles}/default.testprofile"/>
<condition property="dontruntest" value="dontruntest" else="runtest">
Modified: qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile Tue Jul 14
19:51:03 2009
@@ -1,3 +1,3 @@
-broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir
${build.data}/@PORT -t --load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no
+profile.inherit=cpp
+broker.modules=--load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
test.excludesfile=${test.profiles}/ExcludeList
${test.profiles}/010ExcludeList-store
Modified: qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile Tue Jul 14
19:51:03 2009
@@ -1,5 +1,5 @@
-broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd --load-module
${project.root}/../cpp/src/.libs/cluster.so --cluster-name
cpp-java-test-cluster -p @PORT --data-dir ${build.data}/@PORT -t --auth no
+profile.inherit=cpp
+broker.modules=--load-module ${project.root}/../cpp/src/.libs/cluster.so
--cluster-name cpp-java-test-cluster
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList
${test.profiles}/010ExcludeList
profile.clustered=true
Modified: qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile Tue Jul 14
19:51:03 2009
@@ -1,4 +1,4 @@
-broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir
${build.data}/@PORT -t --load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no
+profile.inherit=cpp
+broker.modules=--load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
test.excludesfile=${test.profiles}/ExcludeList
${test.profiles}/010ExcludeList-noPrefetch
max_prefetch=0
Modified: qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile Tue Jul 14 19:51:03
2009
@@ -1,5 +1,5 @@
-broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module
${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain
--ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile
--ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/
--ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no
+profile.inherit=cpp
+broker.modules=--load-module ${project.root}/../cpp/src/.libs/ssl.so
--ssl-cert-name localhost.localdomain --ssl-cert-password-file
${test.profiles}/test_resources/ssl/pfile --ssl-cert-db
${test.profiles}/test_resources/ssl/server_db/
--ssl-require-client-authentication
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
${test.profiles}/010ExcludeList-ssl
test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
profile.use_ssl=true
Modified: qpid/trunk/qpid/java/test-profiles/cpp.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.testprofile?rev=794037&r1=794036&r2=794037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.testprofile Tue Jul 14 19:51:03 2009
@@ -1,3 +1,6 @@
broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir
${build.data}/@PORT -t --auth no
+broker.command=${project.root}/../cpp/src/qpidd
+broker.modules=
+broker.args=
+broker=${broker.command} -p @PORT --data-dir ${build.data}/@PORT -t --auth no
${broker.modules} ${broker.args}
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
