diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /java/test-profiles/testprofile.defaults | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/test-profiles/testprofile.defaults')
| -rw-r--r-- | java/test-profiles/testprofile.defaults | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults index 47992b9334..033da12a97 100644 --- a/java/test-profiles/testprofile.defaults +++ b/java/test-profiles/testprofile.defaults @@ -20,7 +20,7 @@ java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFac java.naming.provider.url=${test.profiles}/test-provider.properties broker.ready=Listening on TCP -broker.config=build/etc/config-systests.xml +broker.config=build/etc/config-systests.json messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore broker.protocol.excludes= broker.persistent=false @@ -33,13 +33,20 @@ amqj.logging.level=${log} amqj.server.logging.level=${log} amqj.protocol.logging.level=${log} root.logging.level=warn -log4j.configuration=test-profiles/log4j-test.xml + +# System property log4j.configuration is used by log4j. +# QpidBrokerTestCase uses log4j.configuration.file to construct a java.io.File, eg for log configuration of spawned brokers. +log4j.configuration.file=${test.profiles}/log4j-test.xml +log4j.configuration=file:///${log4j.configuration.file} + log4j.debug=false # Note test-provider.properties also has variables of same name. # Keep in sync test.port=15672 test.mport=18999 +test.cport=19099 +test.hport=18080 #Note : Management will start open second port on: mport + 100 : 19099 test.port.ssl=15671 test.port.alt=25672 @@ -55,5 +62,7 @@ haltonerror=no exclude.modules=none profile.clustered=false +broker.config-store-type=json +broker.virtualhosts-config="${QPID_HOME}/etc/virtualhosts-systests.xml" |