From a98800a1e8e6c1384ebce60966020245b5ae21ee Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 4 Jun 2010 14:37:50 +0000 Subject: QPID-2599: restore log4j settings files which are not named log4j.xml or log4j.properties and so need not be removed completely since they wont be automatically applied by log4j if found on the classpath like the others will git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951419 13f79535-47bb-0310-9956-ffa450edef68 --- java/client/src/main/java/client.log4j | 33 +++++++++++ .../src/resources/sustained-log4j.xml | 69 ++++++++++++++++++++++ java/management/client/etc/qman.log4j | 29 +++++++++ java/perftests/etc/perftests.log4j | 46 +++++++++++++++ java/systests/src/main/java/systests.log4j | 28 +++++++++ java/tools/etc/test.log4j | 28 +++++++++ 6 files changed, 233 insertions(+) create mode 100644 java/client/src/main/java/client.log4j create mode 100644 java/integrationtests/src/resources/sustained-log4j.xml create mode 100644 java/management/client/etc/qman.log4j create mode 100644 java/perftests/etc/perftests.log4j create mode 100644 java/systests/src/main/java/systests.log4j create mode 100644 java/tools/etc/test.log4j (limited to 'java') diff --git a/java/client/src/main/java/client.log4j b/java/client/src/main/java/client.log4j new file mode 100644 index 0000000000..19cc946118 --- /dev/null +++ b/java/client/src/main/java/client.log4j @@ -0,0 +1,33 @@ +# +# 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=ERROR, console +log4j.additivity.org.apache.qpid=false + +#log4j.logger.org.apache.qpid.client.message.AbstractBytesTypedMessage=DEBUG, console + +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 diff --git a/java/integrationtests/src/resources/sustained-log4j.xml b/java/integrationtests/src/resources/sustained-log4j.xml new file mode 100644 index 0000000000..c5ab3137bf --- /dev/null +++ b/java/integrationtests/src/resources/sustained-log4j.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/etc/qman.log4j b/java/management/client/etc/qman.log4j new file mode 100644 index 0000000000..bf6f940a6c --- /dev/null +++ b/java/management/client/etc/qman.log4j @@ -0,0 +1,29 @@ +# +# 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=ERROR, console +log4j.additivity.org.apache.qpid=false + +log4j.logger.org.apache.qpid.management.client=DEBUG, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.Threshold=error +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n diff --git a/java/perftests/etc/perftests.log4j b/java/perftests/etc/perftests.log4j new file mode 100644 index 0000000000..af8c1b0784 --- /dev/null +++ b/java/perftests/etc/perftests.log4j @@ -0,0 +1,46 @@ +# +# 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.mina=${amqj.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.org.apache.qpid.junit.extensions=${badger.level}, console +log4j.additivity.org.apache.qpid.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 diff --git a/java/systests/src/main/java/systests.log4j b/java/systests/src/main/java/systests.log4j new file mode 100644 index 0000000000..6d596d1d19 --- /dev/null +++ b/java/systests/src/main/java/systests.log4j @@ -0,0 +1,28 @@ +# +# 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.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 diff --git a/java/tools/etc/test.log4j b/java/tools/etc/test.log4j new file mode 100644 index 0000000000..b574a7b5b7 --- /dev/null +++ b/java/tools/etc/test.log4j @@ -0,0 +1,28 @@ +# +# 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=ERROR, console +log4j.additivity.org.apache.qpid=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 + -- cgit v1.2.1