diff --git a/deployer/kar/src/test/resources/log4j.properties b/deployer/kar/src/test/resources/log4j2.properties similarity index 71% rename from deployer/kar/src/test/resources/log4j.properties rename to deployer/kar/src/test/resources/log4j2.properties index e1a65905bd2..a4ce584aacd 100644 --- a/deployer/kar/src/test/resources/log4j.properties +++ b/deployer/kar/src/test/resources/log4j2.properties @@ -17,11 +17,14 @@ # ################################################################################ -log4j.rootLogger=DEBUG, stdout +# The logging properties used during tests.. +rootLogger.level = DEBUG +rootLogger.appenderRef.stdout.ref = stdout -#The logging properties used during tests.. -# 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=%-5p %-30.30c{1} - %m%n -log4j.appender.stdout.threshold=DEBUG +# CONSOLE appender +appender.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %-5p %-30.30c{1} - %m%n +appender.stdout.filter.threshold.type = ThresholdFilter +appender.stdout.filter.threshold.level = DEBUG diff --git a/features/core/src/test/resources/log4j.properties b/features/core/src/test/resources/log4j.properties deleted file mode 100644 index 696136e28dd..00000000000 --- a/features/core/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +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=DEBUG, console, file -log4j.logger.org.apache.karaf.features.internal.service=TRACE - -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} [%-5.5p] {%t} %c{1} (%F:%L) : %m%n -#log4j.appender.console.threshold=WARN - -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true diff --git a/jaas/jasypt/src/test/resources/log4j.properties b/features/core/src/test/resources/log4j2.properties similarity index 60% rename from jaas/jasypt/src/test/resources/log4j.properties rename to features/core/src/test/resources/log4j2.properties index 3822baddd67..21912cf99da 100644 --- a/jaas/jasypt/src/test/resources/log4j.properties +++ b/features/core/src/test/resources/log4j2.properties @@ -18,17 +18,23 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = DEBUG +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -#log4j.appender.console.threshold=WARN +logger.karaf-features.name = org.apache.karaf.features.internal.service +logger.karaf-features.level = TRACE -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} [%-5.5p] {%t} %c{1} (%F:%L) : %m%n + +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/itests/test/src/test/resources/log4j.properties b/itests/test/src/test/resources/log4j2.properties similarity index 63% rename from itests/test/src/test/resources/log4j.properties rename to itests/test/src/test/resources/log4j2.properties index 51d6f315f32..cd056589f9f 100644 --- a/itests/test/src/test/resources/log4j.properties +++ b/itests/test/src/test/resources/log4j2.properties @@ -18,16 +18,20 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file -# Console will only display warnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-32.32C %4L | %m%n +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-32.32C %4L | %m%n -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/management/server/src/test/resources/log4j.properties b/jaas/blueprint/jasypt/src/test/resources/log4j2.properties similarity index 60% rename from management/server/src/test/resources/log4j.properties rename to jaas/blueprint/jasypt/src/test/resources/log4j2.properties index a75bae25e40..04d71f593db 100644 --- a/management/server/src/test/resources/log4j.properties +++ b/jaas/blueprint/jasypt/src/test/resources/log4j2.properties @@ -18,17 +18,20 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file -# Console will only display warnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -log4j.appender.console.threshold=WARN +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/jaas/blueprint/jasypt/src/test/resources/log4j.properties b/jaas/jasypt/src/test/resources/log4j2.properties similarity index 60% rename from jaas/blueprint/jasypt/src/test/resources/log4j.properties rename to jaas/jasypt/src/test/resources/log4j2.properties index 3822baddd67..04d71f593db 100644 --- a/jaas/blueprint/jasypt/src/test/resources/log4j.properties +++ b/jaas/jasypt/src/test/resources/log4j2.properties @@ -18,17 +18,20 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -#log4j.appender.console.threshold=WARN +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/jaas/modules/src/test/resources/log4j.properties b/jaas/modules/src/test/resources/log4j2.properties similarity index 57% rename from jaas/modules/src/test/resources/log4j.properties rename to jaas/modules/src/test/resources/log4j2.properties index 485e43b20d0..26c613af15a 100644 --- a/jaas/modules/src/test/resources/log4j.properties +++ b/jaas/modules/src/test/resources/log4j2.properties @@ -18,20 +18,26 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file # Suppress logging of WriteToClosedSessionException -log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=OFF +logger.ldap.name = org.apache.directory.server.ldap.LdapProtocolHandler +logger.ldap.level = OFF -# Console will only display warnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -log4j.appender.console.threshold=WARN +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = WARN -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/jaas/spring-security-crypto/src/test/resources/log4j2.properties b/jaas/spring-security-crypto/src/test/resources/log4j2.properties new file mode 100644 index 00000000000..04d71f593db --- /dev/null +++ b/jaas/spring-security-crypto/src/test/resources/log4j2.properties @@ -0,0 +1,37 @@ +## --------------------------------------------------------------------------- +## 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.. +# +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file + +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n + +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/jaas/spring-security-crypto/src/test/resources/log4j.properties b/management/server/src/test/resources/log4j2.properties similarity index 59% rename from jaas/spring-security-crypto/src/test/resources/log4j.properties rename to management/server/src/test/resources/log4j2.properties index 3822baddd67..c830b499e83 100644 --- a/jaas/spring-security-crypto/src/test/resources/log4j.properties +++ b/management/server/src/test/resources/log4j2.properties @@ -18,17 +18,22 @@ # # The logging properties used during tests.. # -log4j.rootLogger=INFO, console, file +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -#log4j.appender.console.threshold=WARN +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = WARN -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/maven/core/src/test/resources/log4j.properties b/maven/core/src/test/resources/log4j.properties deleted file mode 100644 index e1cbdd1cd48..00000000000 --- a/maven/core/src/test/resources/log4j.properties +++ /dev/null @@ -1,34 +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=DEBUG, console, file - -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n -#log4j.appender.console.threshold=WARN - -# File appender will contain all info messages -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n -log4j.appender.file.file=target/test.log -log4j.appender.file.append=true diff --git a/maven/core/src/test/resources/log4j2.properties b/maven/core/src/test/resources/log4j2.properties new file mode 100644 index 00000000000..f78703cc435 --- /dev/null +++ b/maven/core/src/test/resources/log4j2.properties @@ -0,0 +1,37 @@ +## --------------------------------------------------------------------------- +## 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.. +# +rootLogger.level = DEBUG +rootLogger.appenderRef.console.ref = console +rootLogger.appenderRef.file.ref = file + +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n + +# File appender +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n diff --git a/profile/src/test/resources/log4j.properties b/profile/src/test/resources/log4j2.properties similarity index 78% rename from profile/src/test/resources/log4j.properties rename to profile/src/test/resources/log4j2.properties index 8c07c5c1b8c..2eed9a29dfb 100644 --- a/profile/src/test/resources/log4j.properties +++ b/profile/src/test/resources/log4j2.properties @@ -18,9 +18,11 @@ # # The logging properties used during tests.. # -log4j.rootLogger=DEBUG, console +rootLogger.level = DEBUG +rootLogger.appenderRef.console.ref = console -# Console will only display warnnings -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ISO8601} [%5p] {%t} %C (%F:%L) %m%n +# Console appender +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} [%5p] {%t} %C (%F:%L) %m%n