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/perftests/example | |
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/perftests/example')
-rw-r--r-- | java/perftests/example/brokerconfig/log4j.xml | 2 | ||||
-rw-r--r-- | java/perftests/example/perftests-jndi.properties | 3 | ||||
-rwxr-xr-x | java/perftests/example/run.sh | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/java/perftests/example/brokerconfig/log4j.xml b/java/perftests/example/brokerconfig/log4j.xml index 7dbb1bc87d..7e53d2667b 100644 --- a/java/perftests/example/brokerconfig/log4j.xml +++ b/java/perftests/example/brokerconfig/log4j.xml @@ -68,7 +68,7 @@ <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/> + <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/> </layout> </appender> diff --git a/java/perftests/example/perftests-jndi.properties b/java/perftests/example/perftests-jndi.properties index 04a8ad9101..1c0fd57663 100644 --- a/java/perftests/example/perftests-jndi.properties +++ b/java/perftests/example/perftests-jndi.properties @@ -24,3 +24,6 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF connectionfactory.connectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672' destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true' + +driverName=org.apache.derby.jdbc.EmbeddedDriver +jdbcUrl=jdbc:derby:/tmp/perftestResultsDb;create=true diff --git a/java/perftests/example/run.sh b/java/perftests/example/run.sh index cb68c52853..31124a060a 100755 --- a/java/perftests/example/run.sh +++ b/java/perftests/example/run.sh @@ -18,5 +18,5 @@ # under the License. # -java -cp ".:${QPID_HOME}/lib/*" -Dqpid.dest_syntax=BURL org.apache.qpid.disttest.ControllerRunner jndi-config=perftests-jndi.properties test-config=$1 distributed=false +java -cp ".:${QPID_HOME}/lib/*" -Dqpid.dest_syntax=BURL org.apache.qpid.disttest.ControllerRunner jndi-config=perftests-jndi.properties test-config=$1 distributed=false writeToDb=true |