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/qpid@943339 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 0 insertions, 499 deletions

diff --git a/java/client/example/src/main/java/log4j.xml b/java/client/example/src/main/java/log4j.xml
deleted file mode 100644
index 0b38b14c02..0000000000
--- a/java/client/example/src/main/java/log4j.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
-        <param name="File" value="qpid_messaging.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <logger name="org.apache">
-        <!-- Print only messages of level warn or above in the package org.apache -->
-        <level value="warn"/>
-    </logger>
-
-    <root>
-        <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
-        <!-- <appender-ref ref="FileAppender"/> -->
-    </root>
-</log4j:configuration>
\ No newline at end of file
diff --git a/java/client/src/main/java/client.log4j b/java/client/src/main/java/client.log4j
deleted file mode 100644
index 19cc946118..0000000000
--- a/java/client/src/main/java/client.log4j
+++ /dev/null
@@ -1,33 +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=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/client/src/main/java/log4j.xml b/java/client/src/main/java/log4j.xml
deleted file mode 100644
index c27acba818..0000000000
--- a/java/client/src/main/java/log4j.xml
+++ /dev/null
@@ -1,36 +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:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <appender name="console" class="org.apache.log4j.ConsoleAppender"> 
-     <param name="Target" value="System.out"/> 
-     <layout class="org.apache.log4j.PatternLayout"> 
-           <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/> 
-     </layout> 
-  </appender> 
-
-  <logger name="org.apache.qpid">
-    <level value="warn"/> 
-    <appender-ref ref="console" />
-  </logger>
-
-</log4j:configuration>
diff --git a/java/common/src/main/java/log4j.properties b/java/common/src/main/java/log4j.properties
deleted file mode 100644
index 44f89dc805..0000000000
--- a/java/common/src/main/java/log4j.properties
+++ /dev/null
@@ -1,31 +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.qpid.protocol=${amqj.protocol.logging.level}, console
-log4j.additivity.qpid.protocol=false
-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/integrationtests/src/resources/sustained-log4j.xml b/java/integrationtests/src/resources/sustained-log4j.xml
deleted file mode 100644
index c5ab3137bf..0000000000
--- a/java/integrationtests/src/resources/sustained-log4j.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-
-    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p (%F:%L) - %m%n"/>
-            <!--param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/-->
-        </layout>
-    </appender>
-
-    <category name="SustainedTest">
-        <priority value="${sustained.level}"/>
-    </category>
-
-    <category name="org.apache">
-        <priority value="warn"/>
-    </category>
-
-    <category name="org.apache.qpid.interop">
-        <priority value="${interop.logging.level}"/>
-    </category>
-
-
-    <category name="org.apache.qpid.sustained">
-        <priority value="${amqj.logging.level}"/>
-    </category>
-
-    <!--category name="org.apache.qpid.server.txn">
-        <priority value="debug"/>
-    </category>-->
-
-    <root>
-        <priority value="all"/>
-        <appender-ref ref="STDOUT"/>
-        <!--appender-ref ref="ArchivingFileAppender"/-->
-    </root>
-</log4j:configuration>
diff --git a/java/management/client/etc/log4j.xml b/java/management/client/etc/log4j.xml
deleted file mode 100644
index 14ee3b2441..0000000000
--- a/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/java/management/client/etc/qman.log4j b/java/management/client/etc/qman.log4j
deleted file mode 100644
index bf6f940a6c..0000000000
--- a/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/java/management/client/src/test/java/log4j.xml b/java/management/client/src/test/java/log4j.xml
deleted file mode 100644
index 891e7908e2..0000000000
--- a/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>
diff --git a/java/perftests/etc/perftests.log4j b/java/perftests/etc/perftests.log4j
deleted file mode 100644
index af8c1b0784..0000000000
--- a/java/perftests/etc/perftests.log4j
+++ /dev/null
@@ -1,46 +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.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
deleted file mode 100644
index 6d596d1d19..0000000000
--- a/java/systests/src/main/java/systests.log4j
+++ /dev/null
@@ -1,28 +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.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
deleted file mode 100644
index b574a7b5b7..0000000000
--- a/java/tools/etc/test.log4j
+++ /dev/null
@@ -1,28 +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.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
-