Author: kwall
Date: Mon Jul 13 05:52:22 2015
New Revision: 1690569
URL: http://svn.apache.org/r1690569
Log:
QPID-6533: [Java Client & Perftest] Remove test dependency on log4j
Added:
qpid/java/trunk/perftests/etc/logback.xml
Removed:
qpid/java/trunk/perftests/etc/log4j.properties
qpid/java/trunk/perftests/example/log4j-client.properties
qpid/java/trunk/perftests/example/log4j.properties
Modified:
qpid/java/trunk/client/pom.xml
qpid/java/trunk/perftests/etc/ha/readme.txt
qpid/java/trunk/perftests/example/run-client.sh
qpid/java/trunk/perftests/pom.xml
qpid/java/trunk/perftests/visualisation-jfc/pom.xml
Modified: qpid/java/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/pom.xml?rev=1690569&r1=1690568&r2=1690569&view=diff
==============================================================================
--- qpid/java/trunk/client/pom.xml (original)
+++ qpid/java/trunk/client/pom.xml Mon Jul 13 05:52:22 2015
@@ -61,18 +61,12 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: qpid/java/trunk/perftests/etc/ha/readme.txt
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/ha/readme.txt?rev=1690569&r1=1690568&r2=1690569&view=diff
==============================================================================
--- qpid/java/trunk/perftests/etc/ha/readme.txt (original)
+++ qpid/java/trunk/perftests/etc/ha/readme.txt Mon Jul 13 05:52:22 2015
@@ -29,5 +29,5 @@ perfetsts> java -cp './target/*:./target
Graphs can be built with:
perfetsts> java -cp
'./visualisation-jfc/target/dependency/*:./visualisation-jfc/target/*'
-Djava.awt.headless=true \
- -Dlog4j.configuration=file://./etc/log4j.properties
-DcsvCurrentDir=. -DcsvBaselineDir=. -DbaselineName=na \
+ -DcsvCurrentDir=. -DcsvBaselineDir=. -DbaselineName=na \
org.apache.qpid.disttest.charting.ChartingUtil
chart-defs=./etc/ha/1001-ScalingParticipants.chartdef
Added: qpid/java/trunk/perftests/etc/logback.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/logback.xml?rev=1690569&view=auto
==============================================================================
--- qpid/java/trunk/perftests/etc/logback.xml (added)
+++ qpid/java/trunk/perftests/etc/logback.xml Mon Jul 13 05:52:22 2015
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ ~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~
+ -->
+<configuration>
+ <contextName>qpid-perftests</contextName>
+
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <target>System.out</target>
+ <encoder>
+ <pattern>%date %-7X{origin} %-5level [%thread] %logger{10}
%msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.apache.qpid" level="warn" />
+ <logger name="org.apache.qpid.disttest" level="info" />
+
+ <root level="error">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</configuration>
Modified: qpid/java/trunk/perftests/example/run-client.sh
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/example/run-client.sh?rev=1690569&r1=1690568&r2=1690569&view=diff
==============================================================================
--- qpid/java/trunk/perftests/example/run-client.sh (original)
+++ qpid/java/trunk/perftests/example/run-client.sh Mon Jul 13 05:52:22 2015
@@ -18,4 +18,4 @@
# under the License.
#
-java -cp ".:${QPID_HOME}/lib/*" -Dlog4j.configuration=log4j-client.properties
-Dqpid.dest_syntax=BURL org.apache.qpid.disttest.ClientRunner
jndi-config=perftests-jndi.properties
+java -cp ".:${QPID_HOME}/lib/*" -Dqpid.dest_syntax=BURL
org.apache.qpid.disttest.ClientRunner jndi-config=perftests-jndi.properties
Modified: qpid/java/trunk/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1690569&r1=1690568&r2=1690569&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Mon Jul 13 05:52:22 2015
@@ -160,9 +160,6 @@
</arguments>
<systemProperties>
<systemProperty>
-
<key>log4j.configuration</key><value>file:log4j.properties</value>
- </systemProperty>
- <systemProperty>
<key>qpid.amqp.version</key><value>0-91</value>
</systemProperty>
<systemProperty>
Modified: qpid/java/trunk/perftests/visualisation-jfc/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/visualisation-jfc/pom.xml?rev=1690569&r1=1690568&r2=1690569&view=diff
==============================================================================
--- qpid/java/trunk/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/java/trunk/perftests/visualisation-jfc/pom.xml Mon Jul 13 05:52:22 2015
@@ -142,9 +142,6 @@
</arguments>
<systemProperties>
<systemProperty>
-
<key>log4j.configuration</key><value>file:log4j.properties</value>
- </systemProperty>
- <systemProperty>
<key>java.awt.headless</key><value>true</value>
</systemProperty>
<systemProperty>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
