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/07/29 12:37:57 UTC

[activemq-artemis] branch new-logging updated (9fd5e3c989 -> 1288a7d794)

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 9fd5e3c989 change remaining integration tests except those with TODOs
     new f648440c46 add some TODOs for area cleanup still needed
     new 61d9c8bcfa move old base logging.properties out of artemis-cli, but leave it in root for comparison to see needed config updates as others replaced
     new 17d7084508 also move the old main tests logging.config file
     new 1288a7d794 remove various mentions of jblm and wildfly-common from scripts etc, update service config logging details..now to see what it breaks

The 4 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:
 ...ging.properties => DELETE-ME-logging.properties |  0
 ...roperties => DELETE-ME-tests-logging.properties |  0
 TODO-new-logging.txt                               |  7 +-
 .../org/apache/activemq/artemis/boot/Artemis.java  |  1 +
 .../activemq/artemis/cli/commands/Create.java      | 39 ----------
 .../activemq/artemis/cli/commands/bin/artemis      | 16 ----
 .../artemis/cli/commands/bin/artemis-service.xml   | 10 +--
 .../artemis/cli/commands/etc/artemis.profile.cmd   |  2 +-
 .../activemq/artemis/utils/SpawnedVMSupport.java   |  2 +
 .../impl/WrongRoleFileConfigurationParserTest.java |  2 +-
 pom.xml                                            |  2 -
 .../src/main/resources/containerService/artemis    | 25 ++----
 .../mirrorSecurityA/logging.properties             | 86 ---------------------
 .../mirrorSecurityB/logging.properties             | 86 ---------------------
 .../brokerConnect/pagedA/logging.properties        | 86 ---------------------
 .../brokerConnect/pagedB/logging.properties        | 86 ---------------------
 .../servers/infinite-redelivery/logging.properties | 89 ----------------------
 17 files changed, 16 insertions(+), 523 deletions(-)
 rename artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties => DELETE-ME-logging.properties (100%)
 rename tests/config/logging.properties => DELETE-ME-tests-logging.properties (100%)
 delete mode 100644 tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/logging.properties
 delete mode 100644 tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/logging.properties
 delete mode 100644 tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/logging.properties
 delete mode 100644 tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/logging.properties
 delete mode 100644 tests/smoke-tests/src/main/resources/servers/infinite-redelivery/logging.properties


[activemq-artemis] 02/04: move old base logging.properties out of artemis-cli, but leave it in root for comparison to see needed config updates as others replaced

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 61d9c8bcfa3291fcd61f2888801155c8a0ab261f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 29 12:53:01 2022 +0100

    move old base logging.properties out of artemis-cli, but leave it in root for comparison to see needed config updates as others replaced
---
 .../commands/etc/logging.properties => DELETE-ME-logging.properties   | 0
 TODO-new-logging.txt                                                  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties b/DELETE-ME-logging.properties
similarity index 100%
rename from artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
rename to DELETE-ME-logging.properties
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index a700274062..3965062f77 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -1,11 +1,11 @@
 TODOs not explicitly noted in the code itself already:
 
 - Update e2e-tests instance logging config and scripts/profiles
-- Remove JBL use from many integration-tests etc tests still using it
+- Remove JBL use from last remaining integration-tests etc tests still using it
 - Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it.
 - Remove references to wildfly-common in scripts and profiles and cli commands
 - Replace logging.config files in smoke tests needing their own custom config
-- Remove stale logging.config file from artemis-cli
 - 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 file once all needed comparisons are done.


[activemq-artemis] 01/04: add some TODOs for area cleanup still 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 f648440c46fb5df7dde93c5c3c69ab27b7b2f230
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 29 12:51:00 2022 +0100

    add some TODOs for area cleanup still needed
---
 .../src/main/java/org/apache/activemq/artemis/boot/Artemis.java         | 1 +
 .../main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index db1b40dd00..6b436506d9 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -116,6 +116,7 @@ public class Artemis {
          System.setProperty("java.io.tmpdir", new File(fileInstance, "tmp").getCanonicalPath());
       }
 
+      //TODO: Remove or update? We arent using this prop anymore.
       // Lets try to covert the logging.configuration setting to a valid URI
       String loggingConfig = System.getProperty("logging.configuration");
       if (loggingConfig != null) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index 87548fc150..b51ab02318 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -212,6 +212,7 @@ public class SpawnedVMSupport {
          }
       }
 
+      // TODO: look into the usage of these (BEGINNING >)
       // The logs will be huge if you don't set this
       if (useLogging) {
          commandList.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
@@ -236,6 +237,7 @@ public class SpawnedVMSupport {
       if (loggingPlugin != null) {
          commandList.add("-Dorg.jboss.logging.Logger.pluginClass=" + loggingPlugin + " ");
       }
+      // TODO: look into these (< END)
 
       commandList.add(className);
       for (String arg : args) {


[activemq-artemis] 04/04: remove various mentions of jblm and wildfly-common from scripts etc, update service config logging details..now to see what it breaks

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 1288a7d7946c149a3cd150d0fd1e7e07650f0050
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 29 13:37:24 2022 +0100

    remove various mentions of jblm and wildfly-common from scripts etc, update service config logging details..now to see what it breaks
---
 TODO-new-logging.txt                               |  3 +-
 .../activemq/artemis/cli/commands/Create.java      | 39 ----------
 .../activemq/artemis/cli/commands/bin/artemis      | 16 ----
 .../artemis/cli/commands/bin/artemis-service.xml   | 10 +--
 .../artemis/cli/commands/etc/artemis.profile.cmd   |  2 +-
 .../impl/WrongRoleFileConfigurationParserTest.java |  2 +-
 pom.xml                                            |  2 -
 .../src/main/resources/containerService/artemis    | 25 ++----
 .../mirrorSecurityA/logging.properties             | 86 ---------------------
 .../mirrorSecurityB/logging.properties             | 86 ---------------------
 .../brokerConnect/pagedA/logging.properties        | 86 ---------------------
 .../brokerConnect/pagedB/logging.properties        | 86 ---------------------
 .../servers/infinite-redelivery/logging.properties | 89 ----------------------
 13 files changed, 11 insertions(+), 521 deletions(-)

diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index a94a86d263..a32cdf4fc8 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -3,8 +3,7 @@ TODOs not explicitly noted in the code itself already:
 - Update e2e-tests instance logging config and scripts/profiles
 - Remove JBL use from last remaining integration-tests etc tests still using it
 - Fix stacktraces of generated exceptions not to include the generated 'logmessage' method creating it.
-- Remove references to wildfly-common in scripts and profiles and cli commands
-- Replace logging.config files in smoke tests needing their own custom config
+- 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
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index a1ff0d2ece..47990b78c6 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -767,9 +766,6 @@ public class Create extends InputAbstract {
       File dataFolder = createDirectory(data, directory);
       filters.put("${artemis.instance.data}", path(dataFolder));
 
-      filters.put("${logmanager}", getLogManager());
-      filters.put("${wildfly-common}", getWildflyCommon());
-
       if (javaOptions == null || javaOptions.length() == 0) {
          javaOptions = "";
       }
@@ -1004,41 +1000,6 @@ public class Create extends InputAbstract {
       return count;
    }
 
-   private String getLogManager() throws IOException {
-      String logManager = "";
-      File dir = new File(path(getHome().toString()) + "/lib");
-
-      File[] matches = dir.listFiles(new FilenameFilter() {
-         @Override
-         public boolean accept(File dir, String name) {
-            return name.startsWith("jboss-logmanager") && name.endsWith(".jar");
-         }
-      });
-
-      if (matches != null && matches.length > 0) {
-         logManager = matches[0].getName();
-      }
-
-      return logManager;
-   }
-
-   private String getWildflyCommon() throws IOException {
-      String logManager = "";
-      File dir = new File(path(getHome().toString()) + "/lib");
-
-      File[] matches = dir.listFiles(new FilenameFilter() {
-         @Override
-         public boolean accept(File dir, String name) {
-            return name.startsWith("wildfly-common") && name.endsWith(".jar");
-         }
-      });
-
-      if (matches != null && matches.length > 0) {
-         logManager = matches[0].getName();
-      }
-
-      return logManager;
-   }
    /**
     * It will create the address and queue configurations
     */
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 5d8a2a3477..42f093561e 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -98,21 +98,6 @@ if $cygwin ; then
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-
-# finding the Log Manager
-LOG_MANAGER=`ls $ARTEMIS_HOME/lib/jboss-logmanager*jar 2>/dev/null`
-
-if [ -z "$LOG_MANAGER" ] ; then
-  # this is the one found when the server was created
-  LOG_MANAGER="$ARTEMIS_HOME/lib/${logmanager}"
-fi
-
-WILDFLY_COMMON=`ls $ARTEMIS_HOME/lib/wildfly-common*jar 2>/dev/null`
-if [ -z "$WILDFLY_COMMON" ] ; then
-  # this is the one found when the server was created
-  WILDFLY_COMMON="$ARTEMIS_HOME/lib/${wildfly-common}"
-fi
-
 if [ -f "$ARTEMIS_OOME_DUMP" ] ; then
   # backup the last OOME heap dump
   mv $ARTEMIS_OOME_DUMP $ARTEMIS_OOME_DUMP.bkp
@@ -121,7 +106,6 @@ fi
 exec "$JAVACMD" \
     $JAVA_ARGS \
     -Dhawtio.role="$HAWTIO_ROLE" \
-    -Xbootclasspath/a:"$LOG_MANAGER:$WILDFLY_COMMON" \
     -Djava.security.auth.login.config="$ARTEMIS_INSTANCE_ETC/login.config" \
     $ARTEMIS_CLUSTER_PROPS \
     -classpath "$CLASSPATH" \
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 77fdc16a49..fe31529f1b 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -33,7 +33,6 @@
    <logmode>roll</logmode>
 
    <executable>%JAVA_HOME%\bin\java.exe</executable>
-   <startargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager};%ARTEMIS_HOME%\lib\${wildfly-common}</startargument>
    <startargument>-XX:+UseParallelGC</startargument>
    <startargument>-Xms512M</startargument>
    <startargument>-Xmx1024M</startargument>
@@ -51,8 +50,7 @@
    <startargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</startargument>
    <startargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</startargument>
    <startargument>-Dartemis.instance.etc=%ARTEMIS_INSTANCE_ETC%</startargument>
-   <startargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</startargument>
-   <startargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</startargument>
+   <startargument>-Dlog4j2.configurationFile=%ARTEMIS_INSTANCE_ETC_URI%/log4j2-config.properties</startargument>
    <startargument>-Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config</startargument>
    <startargument>-Dhawtio.disableProxy=true</startargument>
    <startargument>-Dhawtio.realm=activemq</startargument>
@@ -70,7 +68,6 @@
    <startargument>run</startargument>
 
    <stopexecutable>%JAVA_HOME%\bin\java.exe</stopexecutable>
-   <stopargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager};%ARTEMIS_HOME%\lib\${wildfly-common}</stopargument>
    <stopargument>-XX:+UseParallelGC</stopargument>
    <stopargument>-Xms512M</stopargument>
    <stopargument>-Xmx1024M</stopargument>
@@ -81,11 +78,10 @@
    <stopargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</stopargument>
    <stopargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</stopargument>
    <stopargument>-Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%"</stopargument>
-   <stopargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</stopargument>
-   <stopargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</stopargument>
+   <stopargument>-Dlog4j2.configurationFile=%ARTEMIS_INSTANCE_ETC_URI%/log4j2-config.properties</stopargument>
 
    <stopargument>org.apache.activemq.artemis.boot.Artemis</stopargument>
 
    <stopargument>stop</stopargument>
 
-</service>
\ No newline at end of file
+</service>
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index b38d970efa..039fd97c77 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -33,7 +33,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
-IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager};%ARTEMIS_HOME%\lib\${wildfly-common} -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.poli [...]
+IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M -Xmx1024M --Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config -Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_IN [...]
 
 rem Logs Safepoints JVM pauses: Uncomment to enable them
 rem In addition to the traditional GC logs you could enable some JVM flags to know any meaningful and "hidden" pause that could
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
index b19aee0fb1..73c04f7b53 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 /**
  * When running this test from an IDE add this to the test command line so that the AssertionLoggerHandler works properly:
- * -Djava.util.logging.manager=org.jboss.logmanager.LogManager  -Dlogging.configuration=file:<path_to_source>/tests/config/logging.properties
+ * -Dlog4j2.configurationFile=file:<path_to_source>/tests/config/log4j2-tests-config.properties
  */
 public class WrongRoleFileConfigurationParserTest extends ActiveMQTestBase {
 
diff --git a/pom.xml b/pom.xml
index 995f2df626..332374ce7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,8 +134,6 @@
       <qpid.jms.version>1.6.0</qpid.jms.version>
       <johnzon.version>1.2.16</johnzon.version>
       <hawtbuff.version>1.11</hawtbuff.version>
-      <jb.logmanager.version>2.1.18.Final</jb.logmanager.version>
-      <version.org.wildfly.common.wildfly-common>1.5.2.Final</version.org.wildfly.common.wildfly-common>
       <airlift.version>0.8</airlift.version>
       <jakarta.activation-api.version>1.2.2</jakarta.activation-api.version>
       <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
diff --git a/tests/e2e-tests/src/main/resources/containerService/artemis b/tests/e2e-tests/src/main/resources/containerService/artemis
index dfa686654d..ea6992bf24 100755
--- a/tests/e2e-tests/src/main/resources/containerService/artemis
+++ b/tests/e2e-tests/src/main/resources/containerService/artemis
@@ -44,13 +44,14 @@ if [ -z "$ARTEMIS_INSTANCE" ] ; then
   ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
 fi
 
+HAWTIO_ROLE="NO_HAWTIO_ROLE"
+
 # Load Profile Data
 ARTEMIS_INSTANCE_ETC='/var/lib/artemis-instance/etc'
 . "$ARTEMIS_INSTANCE_ETC/artemis.profile"
 
 # Set Defaults Properties
-ARTEMIS_LOGGING_CONF="$ARTEMIS_INSTANCE_ETC_URI/logging.properties"
-ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
+ARTEMIS_LOGGING_CONF="$ARTEMIS_INSTANCE_ETC_URI/log4j2-config.properties"
 
 
 CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
@@ -97,21 +98,6 @@ if $cygwin ; then
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-
-# finding the Log Manager
-LOG_MANAGER=`ls $ARTEMIS_HOME/lib/jboss-logmanager*jar 2>/dev/null`
-
-if [ -z "$LOG_MANAGER" ] ; then
-  # this is the one found when the server was created
-  LOG_MANAGER="$ARTEMIS_HOME/lib/jboss-logmanager-2.1.10.Final.jar"
-fi
-
-WILDFLY_COMMON=`ls $ARTEMIS_HOME/lib/wildfly-common*jar 2>/dev/null`
-if [ -z "$WILDFLY_COMMON" ] ; then
-  # this is the one found when the server was created
-  WILDFLY_COMMON="$ARTEMIS_HOME/lib/wildfly-common-1.5.2.Final.jar"
-fi
-
 if [ -f "$ARTEMIS_OOME_DUMP" ] ; then
   # backup the last OOME heap dump
   mv $ARTEMIS_OOME_DUMP $ARTEMIS_OOME_DUMP.bkp
@@ -120,7 +106,6 @@ fi
 exec "$JAVACMD" \
     $JAVA_ARGS \
     -Dhawtio.role="$HAWTIO_ROLE" \
-    -Xbootclasspath/a:"$LOG_MANAGER:$WILDFLY_COMMON" \
     -Djava.security.auth.login.config="$ARTEMIS_INSTANCE_ETC/login.config" \
     $ARTEMIS_CLUSTER_PROPS \
     -classpath "$CLASSPATH" \
@@ -130,7 +115,7 @@ exec "$JAVACMD" \
     -Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
     -Ddata.dir="$ARTEMIS_DATA_DIR" \
     -Dartemis.instance.etc="$ARTEMIS_INSTANCE_ETC" \
-    -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \
-    -Dlogging.configuration="$ARTEMIS_LOGGING_CONF" \
+    -Dlog4j2.configurationFile="$ARTEMIS_LOGGING_CONF" \
+    -Dartemis.default.sensitive.string.codec.key="$ARTEMIS_DEFAULT_SENSITIVE_STRING_CODEC_KEY" \
     $DEBUG_ARGS \
     org.apache.activemq.artemis.boot.Artemis "$@"
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/logging.properties b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/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/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/logging.properties b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/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/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/logging.properties b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/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/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/logging.properties b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/logging.properties
deleted file mode 100644
index 810329f515..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/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/smoke-tests/src/main/resources/servers/infinite-redelivery/logging.properties b/tests/smoke-tests/src/main/resources/servers/infinite-redelivery/logging.properties
deleted file mode 100644
index 4448152ac8..0000000000
--- a/tests/smoke-tests/src/main/resources/servers/infinite-redelivery/logging.properties
+++ /dev/null
@@ -1,89 +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.core.journal.impl.JournalImpl
-
-# Root logger level
-logger.level=INFO
-# ActiveMQ Artemis logger levels
-logger.org.apache.activemq.artemis.core.server.level=INFO
-logger.org.apache.activemq.artemis.journal.level=INFO
-logger.org.apache.activemq.artemis.utils.level=INFO
-
-# DEBUG on this level will give you a lot of information on when compacting is happening
-logger.org.apache.activemq.artemis.core.journal.impl.JournalImpl.level=DEBUG
-
-# 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.apache.activemq.artemis.jms.level=INFO
-logger.org.apache.activemq.artemis.integration.bootstrap.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=DEBUG
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler
-handler.FILE.level=DEBUG
-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=%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] 03/04: also move the old main tests logging.config file

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 17d7084508e8665082833b215b7c9e2876a7e750
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jul 29 13:09:48 2022 +0100

    also move the old main tests logging.config file
---
 tests/config/logging.properties => DELETE-ME-tests-logging.properties | 0
 TODO-new-logging.txt                                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/config/logging.properties b/DELETE-ME-tests-logging.properties
similarity index 100%
rename from tests/config/logging.properties
rename to DELETE-ME-tests-logging.properties
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index 3965062f77..a94a86d263 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -8,4 +8,4 @@ TODOs not explicitly noted in the code itself already:
 - 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 file once all needed comparisons are done.
+- Delete the old DELETE-ME-logging.properties and DELETE-ME-tests-logging.properties files once all needed comparisons are done.