From 631ea4e3864ef078a2c7b336a8434a46bca9a24a Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 11 May 2010 23:33:55 +0000 Subject: 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 --- qpid/java/client/example/src/main/java/log4j.xml | 49 ----------- qpid/java/client/src/main/java/client.log4j | 33 -------- qpid/java/client/src/main/java/log4j.xml | 36 -------- qpid/java/common/src/main/java/log4j.properties | 31 ------- .../src/resources/sustained-log4j.xml | 69 --------------- qpid/java/management/client/etc/log4j.xml | 97 ---------------------- qpid/java/management/client/etc/qman.log4j | 29 ------- .../java/management/client/src/test/java/log4j.xml | 53 ------------ qpid/java/perftests/etc/perftests.log4j | 46 ---------- qpid/java/systests/src/main/java/systests.log4j | 28 ------- qpid/java/tools/etc/test.log4j | 28 ------- 11 files changed, 499 deletions(-) delete mode 100644 qpid/java/client/example/src/main/java/log4j.xml delete mode 100644 qpid/java/client/src/main/java/client.log4j delete mode 100644 qpid/java/client/src/main/java/log4j.xml delete mode 100644 qpid/java/common/src/main/java/log4j.properties delete mode 100644 qpid/java/integrationtests/src/resources/sustained-log4j.xml delete mode 100644 qpid/java/management/client/etc/log4j.xml delete mode 100644 qpid/java/management/client/etc/qman.log4j delete mode 100644 qpid/java/management/client/src/test/java/log4j.xml delete mode 100644 qpid/java/perftests/etc/perftests.log4j delete mode 100644 qpid/java/systests/src/main/java/systests.log4j delete mode 100644 qpid/java/tools/etc/test.log4j (limited to 'qpid/java') 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - diff --git a/qpid/java/common/src/main/java/log4j.properties b/qpid/java/common/src/main/java/log4j.properties deleted file mode 100644 index 44f89dc805..0000000000 --- a/qpid/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/qpid/java/integrationtests/src/resources/sustained-log4j.xml b/qpid/java/integrationtests/src/resources/sustained-log4j.xml deleted file mode 100644 index c5ab3137bf..0000000000 --- a/qpid/java/integrationtests/src/resources/sustained-log4j.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/java/perftests/etc/perftests.log4j b/qpid/java/perftests/etc/perftests.log4j deleted file mode 100644 index af8c1b0784..0000000000 --- a/qpid/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/qpid/java/systests/src/main/java/systests.log4j b/qpid/java/systests/src/main/java/systests.log4j deleted file mode 100644 index 6d596d1d19..0000000000 --- a/qpid/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/qpid/java/tools/etc/test.log4j b/qpid/java/tools/etc/test.log4j deleted file mode 100644 index b574a7b5b7..0000000000 --- a/qpid/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 - -- cgit v1.2.1