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, 118 deletions

diff --git a/qpid/java/client/example/src/main/java/log4j.xml b/qpid/java/client/example/src/main/java/log4j.xml
deleted file mode 100644
index 0b38b14c02..0000000000
--- a/qpid/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/qpid/java/client/src/main/java/client.log4j b/qpid/java/client/src/main/java/client.log4j
deleted file mode 100644
index 19cc946118..0000000000
--- a/qpid/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/qpid/java/client/src/main/java/log4j.xml b/qpid/java/client/src/main/java/log4j.xml
deleted file mode 100644
index c27acba818..0000000000
--- a/qpid/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>