QPID-2599

Removing all log4j xml and property files from the code base, except for the ones in test-profile folder and broker/etc folder.


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

3 files changed, 0 insertions, 179 deletions

diff --git a/qpid/java/management/client/etc/log4j.xml b/qpid/java/management/client/etc/log4j.xml
deleted file mode 100644
index 14ee3b2441..0000000000
--- a/qpid/java/management/client/etc/log4j.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 
- 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.
- 
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-	<!-- QMan Appender-->
-	<appender name="QMAN_LOG"
-		class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="../log/qman.log" />
-		<param name="Append" value="true" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />
-		</layout>
-	</appender>
-
-	<!-- XML messages appender -->
-	<appender name="MESSAGES_LOG"
-		class="org.apache.log4j.DailyRollingFileAppender">
-<!--		<param name="File" value="../log/messages.log" /> -->
-		<param name="File" value="../log/messages.log"/>
-		<param name="Append" value="true" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d%n %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Web Server Appender-->
-	<appender name="SERVER_LOG"
-		class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="../log/server.log" />
-		<param name="Append" value="true" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Write to stdout -->
-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<param name="Threshold" value="DEBUG" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern"
-				value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Category for QMan module -->
-	<category name="org.apache.qpid.management">
-		<priority value="INFO" />
-		<appender-ref ref="QMAN_LOG" />
-	</category>
-
-	<!-- Category for Jetty module : if you are using the JMX distribution you don't need this category-->
-	<category name="org.mortbay">
-		<priority value="INFO" />
-		<appender-ref ref="SERVER_LOG" />
-	</category>
-	
-	<category name="org.apache.qpid.qman.debug.XmlDebugger">
-		<priority value="INFO" />
-		<appender-ref ref="MESSAGES_LOG" />
-	</category>	
-	
-	<category name="org.apache.qpid.qman.debug.WsdlDebugger">
-		<priority value="INFO" />
-		<appender-ref ref="MESSAGES_LOG" />
-	</category>	
-	
-	<root>
-		<priority value="ERROR" />
-	</root>
-	
-</log4j:configuration>
diff --git a/qpid/java/management/client/etc/qman.log4j b/qpid/java/management/client/etc/qman.log4j
deleted file mode 100644
index bf6f940a6c..0000000000
--- a/qpid/java/management/client/etc/qman.log4j
+++ /dev/null
@@ -1,29 +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=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/qpid/java/management/client/src/test/java/log4j.xml b/qpid/java/management/client/src/test/java/log4j.xml
deleted file mode 100644
index 891e7908e2..0000000000
--- a/qpid/java/management/client/src/test/java/log4j.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 
- 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.
- 
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-	<!-- Write to stdout -->
-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<param name="Threshold" value="DEBUG" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern"
-				value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
-		</layout>
-	</appender>
-	<category name="org.apache.qpid.management">
-		<priority value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</category>	
-
-	<category name="org.mortbay">
-		<priority value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</category>	
-
-	<category name="org.apache.qpid.qman.debug.XmlDebugger">
-		<priority value="DEBUG" />
-		<appender-ref ref="CONSOLE" />
-	</category>	
-	<root>
-		<priority value="ERROR" />
-	</root>
-	
-</log4j:configuration>