synchronized with trunk except for ruby dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 45 deletions

diff --git a/java/perftests/src/main/java/perftests.log4j b/java/perftests/src/main/java/perftests.log4j
deleted file mode 100644
index 3bd8c201f8..0000000000
--- a/java/perftests/src/main/java/perftests.log4j
+++ /dev/null
@@ -1,45 +0,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.

-#

-log4j.rootLogger=${root.logging.level}

-

-

-log4j.logger.org.apache.qpid=${amqj.logging.level}, console

-log4j.additivity.org.apache.qpid=false

-

-log4j.logger.org.apache.qpid.requestreply=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.pingpong=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.ping=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.topic=${amqj.test.logging.level}

-

-

-log4j.logger.uk.co.thebadgerset.junit.extensions=${badger.level}, console

-log4j.additivity.uk.co.thebadgerset.junit.extensions=false

-

-log4j.appender.console=org.apache.log4j.ConsoleAppender

-log4j.appender.console.Threshold=all

-log4j.appender.console.layout=org.apache.log4j.PatternLayout

-

-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

-#log4j.appender.console.layout.ConversionPattern=%t %p [%c] %m%n

-

-log4j.appender.fileApp=org.apache.log4j.FileAppender

-log4j.appender.fileApp.file=${log.dir}/perftests.volumetest.log

-log4j.appender.fileApp.Threshold=info

-log4j.appender.fileApp.append=false

-log4j.appender.fileApp.layout=org.apache.log4j.PatternLayout