From cedeb1eb580e6715f9948be55bdd327dc7bc579d Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 16 Jan 2012 15:40:13 +0000 Subject: QPID-3761: rename the fallback config to ensure it isnt just picked up by Log4J automatically scanning the classpath git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1232031 13f79535-47bb-0310-9956-ffa450edef68 --- .../broker/src/main/java/fallback-log4j.properties | 24 ++++++++++++++++++++++ java/broker/src/main/java/log4j.properties | 24 ---------------------- .../main/java/org/apache/qpid/server/Broker.java | 6 +++--- java/client/test/example_build.xml | 2 +- java/module.xml | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 java/broker/src/main/java/fallback-log4j.properties delete mode 100644 java/broker/src/main/java/log4j.properties (limited to 'java') diff --git a/java/broker/src/main/java/fallback-log4j.properties b/java/broker/src/main/java/fallback-log4j.properties new file mode 100644 index 0000000000..7b95a89924 --- /dev/null +++ b/java/broker/src/main/java/fallback-log4j.properties @@ -0,0 +1,24 @@ +# +# 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.rootCategory=${amqj.logging.level}, 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/broker/src/main/java/log4j.properties b/java/broker/src/main/java/log4j.properties deleted file mode 100644 index 6788c65463..0000000000 --- a/java/broker/src/main/java/log4j.properties +++ /dev/null @@ -1,24 +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.rootCategory=${amqj.logging.level}, 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/broker/src/main/java/org/apache/qpid/server/Broker.java b/java/broker/src/main/java/org/apache/qpid/server/Broker.java index 1632effaf0..6a135d1196 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/Broker.java +++ b/java/broker/src/main/java/org/apache/qpid/server/Broker.java @@ -409,12 +409,12 @@ public class Broker else { System.err.println("Logging configuration error: unable to read file " + logConfigFile.getAbsolutePath()); - System.err.println("Using the fallback internal log4j.properties configuration"); + System.err.println("Using the fallback internal fallback-log4j.properties configuration"); - InputStream propsFile = this.getClass().getResourceAsStream("/log4j.properties"); + InputStream propsFile = this.getClass().getResourceAsStream("/fallback-log4j.properties"); if(propsFile == null) { - throw new IOException("Unable to load the fallback internal log4j.properties configuration file"); + throw new IOException("Unable to load the fallback internal fallback-log4j.properties configuration file"); } else { diff --git a/java/client/test/example_build.xml b/java/client/test/example_build.xml index 329c12982c..dda3cb4263 100644 --- a/java/client/test/example_build.xml +++ b/java/client/test/example_build.xml @@ -73,7 +73,7 @@ - + diff --git a/java/module.xml b/java/module.xml index 349fb91e4a..a3b8606525 100644 --- a/java/module.xml +++ b/java/module.xml @@ -264,7 +264,7 @@ - + @@ -285,7 +285,7 @@ - + -- cgit v1.2.1