This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch new-logging in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 535552f6fc8d8afd25b92a53cada3e3edfa49574 Author: Robbie Gemmell <[email protected]> AuthorDate: Tue Aug 16 11:40:22 2022 +0100 delete old Log4J 1.x log4j.properties files that shouldnt be doing anything, build isnt using log4j 1.x / reload4j anymore --- TODO-new-logging.txt | 1 - .../src/main/resources/log4j.properties | 23 ----------- .../src/test/java/log4j.properties | 46 ---------------------- .../src/test/resources/log4j.properties | 46 ---------------------- 4 files changed, 116 deletions(-) diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt index 872c92f57f..6d67a58ce2 100644 --- a/TODO-new-logging.txt +++ b/TODO-new-logging.txt @@ -4,7 +4,6 @@ TODOs not explicitly noted in the code itself already: - Remove JBL use from last remaining tests etc tests still using it - Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it. - Replace logging.config files in remaining tests/examples needing their own custom config -- Remove stale log4j.properties file(s) from activemq5-unit-tests - Restore the NettySecurityClientTest and figure out what needs changed to make it work. - Restore the Travis config file - Delete the old DELETE-ME-logging.properties and DELETE-ME-tests-logging.properties files once all needed comparisons during old test etc config replacements are done. diff --git a/artemis-hawtio/artemis-plugin/src/main/resources/log4j.properties b/artemis-hawtio/artemis-plugin/src/main/resources/log4j.properties deleted file mode 100644 index 52537ea702..0000000000 --- a/artemis-hawtio/artemis-plugin/src/main/resources/log4j.properties +++ /dev/null @@ -1,23 +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=INFO, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%-5p | %t | %m%n - diff --git a/tests/activemq5-unit-tests/src/test/java/log4j.properties b/tests/activemq5-unit-tests/src/test/java/log4j.properties deleted file mode 100644 index 4704dbc325..0000000000 --- a/tests/activemq5-unit-tests/src/test/java/log4j.properties +++ /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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, out, stdout - -#log4j.logger.org.apache.activemq.broker.scheduler=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.scheduler=DEBUG -#log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG -#log4j.logger.org.apache.activemq.transport.failover=TRACE -#log4j.logger.org.apache.activemq.store.jdbc=TRACE -#log4j.logger.org.apache.activemq.store.kahadb=TRACE -#log4j.logger.org.apache.activemq.broker.region.cursors.AbstractStoreCursor=DEBUG -#log4j.logger.org.apache.activemq.store.jdbc.JDBCMessageStore=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.disk.journal=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.AbstractKahaDBStore=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n -log4j.appender.out.file=target/activemq-test.log -log4j.appender.out.append=true diff --git a/tests/activemq5-unit-tests/src/test/resources/log4j.properties b/tests/activemq5-unit-tests/src/test/resources/log4j.properties deleted file mode 100644 index 4704dbc325..0000000000 --- a/tests/activemq5-unit-tests/src/test/resources/log4j.properties +++ /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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, out, stdout - -#log4j.logger.org.apache.activemq.broker.scheduler=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.scheduler=DEBUG -#log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG -#log4j.logger.org.apache.activemq.transport.failover=TRACE -#log4j.logger.org.apache.activemq.store.jdbc=TRACE -#log4j.logger.org.apache.activemq.store.kahadb=TRACE -#log4j.logger.org.apache.activemq.broker.region.cursors.AbstractStoreCursor=DEBUG -#log4j.logger.org.apache.activemq.store.jdbc.JDBCMessageStore=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.disk.journal=DEBUG -#log4j.logger.org.apache.activemq.store.kahadb.AbstractKahaDBStore=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n -log4j.appender.out.file=target/activemq-test.log -log4j.appender.out.append=true
