You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/08/17 16:31:46 UTC
[activemq-artemis] branch new-logging updated (2a24f9cc0e -> fbe5b0a222)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from 2a24f9cc0e remove commons-logging slf4j bridge now the karaf bits dont cause beanutils log spam
new 4145dc9e12 replace logging.properties files for e2e-tests server configs
new e0874645db remove a couple of properties that override parent definitions and break use of the e2e-tests profile
new fa9bec3476 move another old log config file out to root, for any later comparisons needed
new 1db15a5b08 add another TODO note
new c560e160e5 remove now-stale comments missed in previous clearup when switching to cp files
new fbe5b0a222 remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...I.properties => DELETE-ME-logging-CI.properties | 0
TODO-new-logging.txt | 2 +-
tests/compatibility-tests/pom.xml | 35 +-----
.../logs/JBossLoggingApacheLoggerBridge.java | 131 ---------------------
.../tests/compatibility/base/ClasspathBase.java | 9 +-
.../tests/compatibility/base/VersionedBase.java | 5 +-
tests/e2e-tests/pom.xml | 2 -
.../serverA}/log4j2-config.properties | 10 +-
.../brokerConnect/serverA/logging.properties | 86 --------------
.../serverB}/log4j2-config.properties | 10 +-
.../brokerConnect/serverB/logging.properties | 86 --------------
.../splitMirror/serverA}/log4j2-config.properties | 10 +-
.../splitMirror/serverA/logging.properties | 86 --------------
.../splitMirror/serverB}/log4j2-config.properties | 10 +-
.../splitMirror/serverB/logging.properties | 86 --------------
.../serverRoot}/log4j2-config.properties | 10 +-
.../splitMirror/serverRoot/logging.properties | 86 --------------
17 files changed, 41 insertions(+), 623 deletions(-)
rename tests/config/logging-CI.properties => DELETE-ME-logging-CI.properties (100%)
delete mode 100644 tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
copy tests/{smoke-tests/src/main/resources/servers/nettynative => e2e-tests/src/main/resources/servers/brokerConnect/serverA}/log4j2-config.properties (93%)
delete mode 100644 tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties
copy tests/{smoke-tests/src/main/resources/servers/nettynative => e2e-tests/src/main/resources/servers/brokerConnect/serverB}/log4j2-config.properties (93%)
delete mode 100644 tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties
copy tests/{smoke-tests/src/main/resources/servers/nettynative => e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA}/log4j2-config.properties (93%)
delete mode 100644 tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties
copy tests/{smoke-tests/src/main/resources/servers/nettynative => e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB}/log4j2-config.properties (93%)
delete mode 100644 tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties
copy tests/{smoke-tests/src/main/resources/servers/nettynative => e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot}/log4j2-config.properties (93%)
delete mode 100644 tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties
[activemq-artemis] 05/06: remove now-stale comments missed in previous clearup when switching to cp files
Posted by ro...@apache.org.
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 c560e160e5bdc61b1277c58533a5592cf05beeb7
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 17:16:33 2022 +0100
remove now-stale comments missed in previous clearup when switching to cp files
---
tests/compatibility-tests/pom.xml | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index e1cffb6d76..67337648c2 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -340,8 +340,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-263.cp</file>
</configuration>
</execution>
@@ -364,8 +362,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-270.cp</file>
</configuration>
</execution>
@@ -390,8 +386,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-2_10_0.cp</file>
</configuration>
</execution>
@@ -416,8 +410,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-2_17_0.cp</file>
</configuration>
</execution> <execution>
@@ -441,8 +433,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-2_18_0.cp</file>
</configuration>
</execution>
@@ -468,8 +458,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-2_22_0.cp</file>
</configuration>
</execution>
@@ -493,8 +481,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-240.cp</file>
</configuration>
</execution>
@@ -518,8 +504,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-210.cp</file>
</configuration>
</execution>
@@ -543,8 +527,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-200.cp</file>
</configuration>
</execution>
@@ -567,8 +549,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-140.cp</file>
</configuration>
</execution>
@@ -592,8 +572,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/ARTEMIS-155.cp</file>
</configuration>
</execution>
@@ -617,8 +595,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/HORNETQ-235.cp</file>
</configuration>
</execution>
@@ -642,8 +618,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/HORNETQ-247.cp</file>
</configuration>
</execution>
@@ -663,8 +637,6 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
- <!-- for future maintainers, notice that if you add new variables you also need to add the system property
- otherwise this is not captured, search for the word @@@@ on this pom where I left anothr comment -->
<file>${basedir}/target/AMQ_5_11.cp</file>
</configuration>
</execution>
[activemq-artemis] 02/06: remove a couple of properties that override parent definitions and break use of the e2e-tests profile
Posted by ro...@apache.org.
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 e0874645db1306453feace540ac8be1da204ad0c
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 16:42:04 2022 +0100
remove a couple of properties that override parent definitions and break use of the e2e-tests profile
---
tests/e2e-tests/pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests/e2e-tests/pom.xml b/tests/e2e-tests/pom.xml
index 42da3f3865..023b176d89 100644
--- a/tests/e2e-tests/pom.xml
+++ b/tests/e2e-tests/pom.xml
@@ -31,8 +31,6 @@
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
<e2e-tests.surefire-extra-args />
<e2e-tests.dockerfile>Dockerfile-centos</e2e-tests.dockerfile>
- <e2e-tests.skipImageBuild>true</e2e-tests.skipImageBuild>
- <e2e-tests.skipTests>true</e2e-tests.skipTests>
<distributionDir>${activemq.basedir}/artemis-distribution/target/apache-artemis-${project.version}-bin/apache-artemis-${project.version}</distributionDir>
<container-service-argline>-DContainerService.artemis-image.version=${project.version} -DContainerService.artemis-image.userid="1000"</container-service-argline>
</properties>
[activemq-artemis] 03/06: move another old log config file out to root, for any later comparisons needed
Posted by ro...@apache.org.
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 fa9bec3476bf448325c259a8c553b5cacdd588ec
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 16:42:30 2022 +0100
move another old log config file out to root, for any later comparisons needed
---
tests/config/logging-CI.properties => DELETE-ME-logging-CI.properties | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/config/logging-CI.properties b/DELETE-ME-logging-CI.properties
similarity index 100%
rename from tests/config/logging-CI.properties
rename to DELETE-ME-logging-CI.properties
[activemq-artemis] 06/06: remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
Posted by ro...@apache.org.
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 fbe5b0a22200165eea5e33d758b8de1414510f58
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 17:28:27 2022 +0100
remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
removes seemingly unused artemis-rest dependency
---
tests/compatibility-tests/pom.xml | 7 +-
.../logs/JBossLoggingApacheLoggerBridge.java | 131 ---------------------
.../tests/compatibility/base/ClasspathBase.java | 9 +-
.../tests/compatibility/base/VersionedBase.java | 5 +-
4 files changed, 10 insertions(+), 142 deletions(-)
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 67337648c2..6b71156f50 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -129,11 +129,6 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.activemq.rest</groupId>
- <artifactId>artemis-rest</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
@@ -288,6 +283,7 @@
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
+ <arg>org.apache.activemq:artemis-unit-test-support:${project.version}</arg>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-SNAPSHOT.cp</file>
@@ -316,6 +312,7 @@
<arg>org.apache.activemq:artemis-jakarta-server:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-client:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-service-extensions:${project.version}</arg>
+ <arg>org.apache.activemq:artemis-unit-test-support:${project.version}</arg>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-JAKARTAEE.cp</file>
diff --git a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
deleted file mode 100644
index c71c70d4e4..0000000000
--- a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
+++ /dev/null
@@ -1,131 +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.
- */
-
-package org.apache.activemq.artemis.logs;
-
-import org.apache.commons.logging.Log;
-import org.jboss.logging.Logger;
-
-/**
- * This is a necessary copy of the JBossLoggingApacheLoggerBridge on artemis-commons package.
- * Since we define -Dorg.apache.commons.logging.Log=org.apache.activemq.artemis.logs.JBossLoggingApacheLoggerBridge
- * We need to have the class defined.
- * However I cannot import commons into older versions.
- * For that reason this class was needed as a duplicate.
- * */
-public class JBossLoggingApacheLoggerBridge implements Log {
-
- final Logger bridgeLog;
-
- public JBossLoggingApacheLoggerBridge(Class clazz) {
- bridgeLog = Logger.getLogger(clazz);
- }
-
- public JBossLoggingApacheLoggerBridge(String name) {
- bridgeLog = Logger.getLogger(name);
- }
-
- @Override
- public void debug(Object message) {
- bridgeLog.debug(message);
- }
-
- @Override
- public void debug(Object message, Throwable t) {
- bridgeLog.debug(message, t);
- }
-
- @Override
- public void error(Object message) {
- bridgeLog.error(message);
- }
-
- @Override
- public void error(Object message, Throwable t) {
- bridgeLog.error(message, t);
- }
-
- @Override
- public void fatal(Object message) {
- bridgeLog.fatal(message);
- }
-
- @Override
- public void fatal(Object message, Throwable t) {
- bridgeLog.fatal(message, t);
- }
-
- @Override
- public void info(Object message) {
- bridgeLog.info(message);
- }
-
- @Override
- public void info(Object message, Throwable t) {
- bridgeLog.info(message, t);
- }
-
- @Override
- public boolean isDebugEnabled() {
- return bridgeLog.isDebugEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return bridgeLog.isEnabled(Logger.Level.ERROR);
- }
-
- @Override
- public boolean isFatalEnabled() {
- return bridgeLog.isEnabled(Logger.Level.FATAL);
- }
-
- @Override
- public boolean isInfoEnabled() {
- return bridgeLog.isInfoEnabled();
- }
-
- @Override
- public boolean isTraceEnabled() {
- return bridgeLog.isTraceEnabled();
- }
-
- @Override
- public boolean isWarnEnabled() {
- return bridgeLog.isEnabled(Logger.Level.WARN);
- }
-
- @Override
- public void trace(Object message) {
- bridgeLog.trace(message);
- }
-
- @Override
- public void trace(Object message, Throwable t) {
- bridgeLog.trace(message, t);
- }
-
- @Override
- public void warn(Object message) {
- bridgeLog.warn(message);
- }
-
- @Override
- public void warn(Object message, Throwable t) {
- bridgeLog.warn(message, t);
- }
-}
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
index eb504b3a94..c24cedf82f 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Map;
import org.apache.activemq.artemis.tests.compatibility.GroovyRun;
-import org.jboss.logging.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
@@ -36,6 +35,8 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
@@ -43,7 +44,7 @@ import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT
public class ClasspathBase {
- private static final Logger logger = Logger.getLogger(ClasspathBase.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClasspathBase.class);
private final Logger instanceLog = logger;
@@ -52,12 +53,12 @@ public class ClasspathBase {
@Override
protected void starting(Description description) {
- instanceLog.info(String.format("**** start #test %s() ***", ClasspathBase.this.getClass().getName() + "::" + description.getMethodName()));
+ instanceLog.info("**** start #test {}::{}() ***", ClasspathBase.this.getClass().getName(), description.getMethodName());
}
@Override
protected void finished(Description description) {
- instanceLog.info(String.format("**** end #test %s() ***", ClasspathBase.this.getClass().getName() + "::" + description.getMethodName()));
+ instanceLog.info("**** end #test {}::{}() ***", ClasspathBase.this.getClass().getName(), description.getMethodName());
}
};
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
index e3e56ef60c..706d8adff4 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
@@ -21,11 +21,12 @@ import java.io.File;
import java.util.LinkedList;
import java.util.List;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class VersionedBase extends ClasspathBase {
- private static final Logger logger = Logger.getLogger(VersionedBase.class);
+ private static final Logger logger = LoggerFactory.getLogger(VersionedBase.class);
protected final String server;
protected final String sender;
[activemq-artemis] 01/06: replace logging.properties files for e2e-tests server configs
Posted by ro...@apache.org.
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 4145dc9e12c44798cb7904900fec00cb4e7abd55
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 16:41:54 2022 +0100
replace logging.properties files for e2e-tests server configs
---
TODO-new-logging.txt | 1 -
.../brokerConnect/serverA/log4j2-config.properties | 95 ++++++++++++++++++++++
.../brokerConnect/serverA/logging.properties | 86 --------------------
.../brokerConnect/serverB/log4j2-config.properties | 95 ++++++++++++++++++++++
.../brokerConnect/serverB/logging.properties | 86 --------------------
.../splitMirror/serverA/log4j2-config.properties | 95 ++++++++++++++++++++++
.../splitMirror/serverA/logging.properties | 86 --------------------
.../splitMirror/serverB/log4j2-config.properties | 95 ++++++++++++++++++++++
.../splitMirror/serverB/logging.properties | 86 --------------------
.../serverRoot/log4j2-config.properties | 95 ++++++++++++++++++++++
.../splitMirror/serverRoot/logging.properties | 86 --------------------
11 files changed, 475 insertions(+), 431 deletions(-)
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index 6d67a58ce2..7ffa30c247 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -1,6 +1,5 @@
TODOs not explicitly noted in the code itself already:
-- Update e2e-tests instance logging config and scripts/profiles
- 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
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties
new file mode 100644
index 0000000000..d116f440ce
--- /dev/null
+++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/log4j2-config.properties
@@ -0,0 +1,95 @@
+# 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 2 configuration
+
+rootLogger = INFO, console, log_file
+
+# Additional loggers for debugging mirror, candidates to eventually debug:
+logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+logger.mirror_controller_target.level=INFO
+
+# Regular config
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
+appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.audit_log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverA/logging.properties
+++ /dev/null
@@ -1,86 +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.
-#
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.utils.critical,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource,org.apache.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...]
-
-# Special logger to debug mirror Security
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-
-# These levels are candidates to eventually debug
-logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.level=INFO
-
-logger.org.eclipse.jetty.level=WARN
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=false
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=TRACE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=suffix,append,autoFlush,fileName
-handler.FILE.suffix=.yyyy-MM-dd
-handler.FILE.append=true
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${artemis.instance}/log/artemis.log
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=[%t] %d %-5p [%c] %s%E%n
-
-#Audit logger
-handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
-handler.AUDIT_FILE.suffix=.yyyy-MM-dd
-handler.AUDIT_FILE.append=true
-handler.AUDIT_FILE.autoFlush=true
-handler.AUDIT_FILE.fileName=${artemis.instance}/log/audit.log
-handler.AUDIT_FILE.formatter=AUDIT_PATTERN
-
-formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.AUDIT_PATTERN.properties=pattern
-formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties
new file mode 100644
index 0000000000..d116f440ce
--- /dev/null
+++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/log4j2-config.properties
@@ -0,0 +1,95 @@
+# 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 2 configuration
+
+rootLogger = INFO, console, log_file
+
+# Additional loggers for debugging mirror, candidates to eventually debug:
+logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+logger.mirror_controller_target.level=INFO
+
+# Regular config
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
+appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.audit_log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/serverB/logging.properties
+++ /dev/null
@@ -1,86 +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.
-#
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.utils.critical,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource,org.apache.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...]
-
-# Special logger to debug mirror Security
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-
-# These levels are candidates to eventually debug
-logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.level=INFO
-
-logger.org.eclipse.jetty.level=WARN
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=false
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=TRACE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=suffix,append,autoFlush,fileName
-handler.FILE.suffix=.yyyy-MM-dd
-handler.FILE.append=true
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${artemis.instance}/log/artemis.log
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=[%t] %d %-5p [%c] %s%E%n
-
-#Audit logger
-handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
-handler.AUDIT_FILE.suffix=.yyyy-MM-dd
-handler.AUDIT_FILE.append=true
-handler.AUDIT_FILE.autoFlush=true
-handler.AUDIT_FILE.fileName=${artemis.instance}/log/audit.log
-handler.AUDIT_FILE.formatter=AUDIT_PATTERN
-
-formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.AUDIT_PATTERN.properties=pattern
-formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties
new file mode 100644
index 0000000000..d116f440ce
--- /dev/null
+++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/log4j2-config.properties
@@ -0,0 +1,95 @@
+# 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 2 configuration
+
+rootLogger = INFO, console, log_file
+
+# Additional loggers for debugging mirror, candidates to eventually debug:
+logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+logger.mirror_controller_target.level=INFO
+
+# Regular config
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
+appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.audit_log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/logging.properties
+++ /dev/null
@@ -1,86 +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.
-#
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.utils.critical,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource,org.apache.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...]
-
-# Special logger to debug mirror Security
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-
-# These levels are candidates to eventually debug
-logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.level=INFO
-
-logger.org.eclipse.jetty.level=WARN
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=false
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=TRACE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=suffix,append,autoFlush,fileName
-handler.FILE.suffix=.yyyy-MM-dd
-handler.FILE.append=true
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${artemis.instance}/log/artemis.log
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=[%t] %d %-5p [%c] %s%E%n
-
-#Audit logger
-handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
-handler.AUDIT_FILE.suffix=.yyyy-MM-dd
-handler.AUDIT_FILE.append=true
-handler.AUDIT_FILE.autoFlush=true
-handler.AUDIT_FILE.fileName=${artemis.instance}/log/audit.log
-handler.AUDIT_FILE.formatter=AUDIT_PATTERN
-
-formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.AUDIT_PATTERN.properties=pattern
-formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties
new file mode 100644
index 0000000000..d116f440ce
--- /dev/null
+++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/log4j2-config.properties
@@ -0,0 +1,95 @@
+# 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 2 configuration
+
+rootLogger = INFO, console, log_file
+
+# Additional loggers for debugging mirror, candidates to eventually debug:
+logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+logger.mirror_controller_target.level=INFO
+
+# Regular config
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
+appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.audit_log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/logging.properties
+++ /dev/null
@@ -1,86 +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.
-#
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.utils.critical,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource,org.apache.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...]
-
-# Special logger to debug mirror Security
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-
-# These levels are candidates to eventually debug
-logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.level=INFO
-
-logger.org.eclipse.jetty.level=WARN
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=false
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=TRACE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=suffix,append,autoFlush,fileName
-handler.FILE.suffix=.yyyy-MM-dd
-handler.FILE.append=true
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${artemis.instance}/log/artemis.log
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=[%t] %d %-5p [%c] %s%E%n
-
-#Audit logger
-handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
-handler.AUDIT_FILE.suffix=.yyyy-MM-dd
-handler.AUDIT_FILE.append=true
-handler.AUDIT_FILE.autoFlush=true
-handler.AUDIT_FILE.fileName=${artemis.instance}/log/audit.log
-handler.AUDIT_FILE.formatter=AUDIT_PATTERN
-
-formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.AUDIT_PATTERN.properties=pattern
-formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties
new file mode 100644
index 0000000000..d116f440ce
--- /dev/null
+++ b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/log4j2-config.properties
@@ -0,0 +1,95 @@
+# 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 2 configuration
+
+rootLogger = INFO, console, log_file
+
+# Additional loggers for debugging mirror, candidates to eventually debug:
+logger.mirror_controller_target.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+logger.mirror_controller_target.level=INFO
+
+# Regular config
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.artemis_server.name=org.apache.activemq.artemis.core.server
+logger.artemis_server.level=INFO
+
+logger.artemis_journal.name=org.apache.activemq.artemis.journal
+logger.artemis_journal.level=INFO
+
+logger.artemis_utils.name=org.apache.activemq.artemis.utils
+logger.artemis_utils.level=INFO
+
+# CriticalAnalyzer: If you have issues with the CriticalAnalyzer, setting this to TRACE would give
+# you extra troubleshooting info, but do not use TRACE regularly as it would incur extra CPU usage.
+logger.critical_analyzer.name=org.apache.activemq.artemis.utils.critical
+logger.critical_analyzer.level=INFO
+
+# Audit loggers: to enable change levels from OFF to INFO
+logger.audit_base = OFF, audit_log_file
+logger.audit_base.name = org.apache.activemq.audit.base
+logger.audit_base.additivity = false
+
+logger.audit_resource = OFF, audit_log_file
+logger.audit_resource.name = org.apache.activemq.audit.resource
+logger.audit_resource.additivity = false
+
+logger.audit_message = OFF, audit_log_file
+logger.audit_message.name = org.apache.activemq.audit.message
+logger.audit_message.additivity = false
+
+# Jetty logger levels
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
+
+# Quorum related logger levels
+logger.curator.name=org.apache.curator
+logger.curator.level=WARN
+logger.zookeeper.name=org.apache.zookeeper
+logger.zookeeper.level=ERROR
+
+
+# Console appender
+appender.console.type=Console
+appender.console.name=console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d %-5level [%logger] %msg%n
+
+# Log file appender
+appender.log_file.type = RollingFile
+appender.log_file.name = log_file
+appender.log_file.fileName = ${sys:artemis.instance}/log/artemis.log
+appender.log_file.filePattern = ${sys:artemis.instance}/log/artemis.log.%d{yyyy-MM-dd}
+appender.log_file.layout.type = PatternLayout
+appender.log_file.layout.pattern = %d %-5level [%logger] %msg%n
+appender.log_file.policies.type = Policies
+appender.log_file.policies.cron.type = CronTriggeringPolicy
+appender.log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.log_file.policies.cron.evaluateOnStartup = true
+
+# Audit log file appender
+appender.audit_log_file.type = RollingFile
+appender.audit_log_file.name = audit_log_file
+appender.audit_log_file.fileName = ${sys:artemis.instance}/log/audit.log
+appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{yyyy-MM-dd}
+appender.audit_log_file.layout.type = PatternLayout
+appender.audit_log_file.layout.pattern = %d [AUDIT](%t) %msg%n
+appender.audit_log_file.policies.type = Policies
+appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
+appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
+appender.audit_log_file.policies.cron.evaluateOnStartup = true
diff --git a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties b/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/e2e-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/logging.properties
+++ /dev/null
@@ -1,86 +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.
-#
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.utils.critical,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms.server,org.apache.activemq.artemis.integration.bootstrap,org.apache.activemq.audit.base,org.apache.activemq.audit.message,org.apache.activemq.audit.resource,org.apache.activemq.artemis.utils.pools,org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirro [...]
-
-# Special logger to debug mirror Security
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-
-# These levels are candidates to eventually debug
-logger.org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.level=INFO
-
-# if you have issues with CriticalAnalyzer, setting this as TRACE would give you extra troubleshooting information.
-# but do not use it regularly as it would incur in some extra CPU usage for this diagnostic.
-logger.org.apache.activemq.artemis.utils.critical.level=INFO
-
-logger.org.eclipse.jetty.level=WARN
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# to enable audit change the level to INFO
-logger.org.apache.activemq.audit.base.level=ERROR
-logger.org.apache.activemq.audit.base.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.base.useParentHandlers=false
-
-logger.org.apache.activemq.audit.resource.level=ERROR
-logger.org.apache.activemq.audit.resource.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.resource.useParentHandlers=false
-
-logger.org.apache.activemq.audit.message.level=ERROR
-logger.org.apache.activemq.audit.message.handlers=AUDIT_FILE
-logger.org.apache.activemq.audit.message.useParentHandlers=false
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=TRACE
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=suffix,append,autoFlush,fileName
-handler.FILE.suffix=.yyyy-MM-dd
-handler.FILE.append=true
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${artemis.instance}/log/artemis.log
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=[%t] %d %-5p [%c] %s%E%n
-
-#Audit logger
-handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.AUDIT_FILE.level=INFO
-handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName
-handler.AUDIT_FILE.suffix=.yyyy-MM-dd
-handler.AUDIT_FILE.append=true
-handler.AUDIT_FILE.autoFlush=true
-handler.AUDIT_FILE.fileName=${artemis.instance}/log/audit.log
-handler.AUDIT_FILE.formatter=AUDIT_PATTERN
-
-formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.AUDIT_PATTERN.properties=pattern
-formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n
[activemq-artemis] 04/06: add another TODO note
Posted by ro...@apache.org.
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 1db15a5b085aa412c2a180006bf46176c5890dc4
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 16:42:40 2022 +0100
add another TODO note
---
TODO-new-logging.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index 7ffa30c247..195700b831 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -6,3 +6,4 @@ TODOs not explicitly noted in the code itself already:
- 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.
+- Update references to JBL in documentation