You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/07/25 17:51:14 UTC
[activemq-artemis] branch new-logging updated (adc565b664 -> b9a0a05337)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
discard adc565b664 add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
discard 5ca30b1de6 fix dep scope
discard 36e803e624 add note about many integration-tests etc still using JBL
discard 9acf462fef fix other files similar to fcb7baaf80865745906219687e67c54081ecb140
discard e1548f7a2a debugging stuff
discard fcb7baaf80 Fixing duplicate properties
new a1f1cfa8da Fixing duplicate properties
new 626a4ed0fe fix other files similar to commit titled 'Fixing duplicate properties'
new a9e78f3154 add note about many integration-tests etc still using JBL
new 942252885d fix dep scope
new b9a0a05337 add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (adc565b664)
\
N -- N -- N refs/heads/new-logging (b9a0a05337)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 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:
.../activemq/artemis/cli/commands/Configurable.java | 8 +++++++-
.../org/apache/activemq/artemis/cli/commands/Run.java | 4 ----
.../artemis/cli/factory/jmx/ManagementFactory.java | 7 -------
.../server/management/ArtemisMBeanServerGuard.java | 1 -
.../core/server/management/ManagementContext.java | 18 ++++++------------
.../server/management/impl/ManagementServiceImpl.java | 2 --
6 files changed, 13 insertions(+), 27 deletions(-)
[activemq-artemis] 05/05: add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit b9a0a05337e15825bd8df0b6d31d4c8f941f5b71
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 25 18:22:52 2022 +0100
add artemis-unit-test-support dep to various modules that have tests, and will stacktrace if the appender isnt found which is referenced in their shared logging test config
---
artemis-junit/pom.xml | 7 +++++++
artemis-selector/pom.xml | 6 ++++++
artemis-server-osgi/pom.xml | 6 ++++++
artemis-service-extensions/pom.xml | 6 ++++++
tests/e2e-tests/pom.xml | 6 ++++++
tests/joram-tests/pom.xml | 6 ++++++
tests/karaf-client-integration-tests/pom.xml | 6 ++++++
tests/performance-tests/pom.xml | 6 ++++++
tests/soak-tests/pom.xml | 6 ++++++
tests/stress-tests/pom.xml | 6 ++++++
10 files changed, 61 insertions(+)
diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml
index 74fb003760..1471ec2ef5 100644
--- a/artemis-junit/pom.xml
+++ b/artemis-junit/pom.xml
@@ -78,6 +78,13 @@
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index a8ce8431fb..302a47768f 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -42,6 +42,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index 5539c3c808..d107fb5253 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -120,6 +120,12 @@
<artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml
index 3f0cdf6da5..889690e621 100644
--- a/artemis-service-extensions/pom.xml
+++ b/artemis-service-extensions/pom.xml
@@ -76,5 +76,11 @@
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/tests/e2e-tests/pom.xml b/tests/e2e-tests/pom.xml
index 4300c7a508..42da3f3865 100644
--- a/tests/e2e-tests/pom.xml
+++ b/tests/e2e-tests/pom.xml
@@ -55,6 +55,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index b7fed73e67..374e1d7cfa 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -108,6 +108,12 @@
<artifactId>jakarta.json-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml
index 610687d0ab..d694b8c434 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -142,6 +142,12 @@
<type>xml</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 81cbb34bf2..e09c4d3b3a 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -101,6 +101,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 7b2485c144..ccb7fb923c 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -75,6 +75,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index c4afd0978c..c79001b966 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -97,6 +97,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-unit-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[activemq-artemis] 04/05: fix dep scope
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 942252885d2beb20a60bbc059bf5a3029746c9d7
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 25 18:20:46 2022 +0100
fix dep scope
---
artemis-protocols/artemis-amqp-protocol/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 204689f2dd..4f36889b6d 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -116,6 +116,7 @@
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-unit-test-support</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
[activemq-artemis] 02/05: fix other files similar to commit titled 'Fixing duplicate properties'
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 626a4ed0fe6f60c5df0f3eef8930b2fa3b73e87e
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 25 12:40:15 2022 +0100
fix other files similar to commit titled 'Fixing duplicate properties'
---
.../servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties | 6 +++---
.../main/resources/servers/audit-logging/log4j2-config.properties | 6 +++---
.../main/resources/servers/audit-logging2/log4j2-config.properties | 6 +++---
.../src/main/resources/servers/nettynative/log4j2-config.properties | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties
index 33f51bcc7d..8d387590b5 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging-amqp-mutual-ssl/log4j2-config.properties
@@ -85,6 +85,6 @@ appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{y
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.log_file.policies.cron.type = CronTriggeringPolicy
-appender.log_file.policies.cron.schedule = 0 0 0 * * ?
-appender.log_file.policies.cron.evaluateOnStartup = true
+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/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
index 01798024a2..854f3510de 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/log4j2-config.properties
@@ -85,6 +85,6 @@ appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{y
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.log_file.policies.cron.type = CronTriggeringPolicy
-appender.log_file.policies.cron.schedule = 0 0 0 * * ?
-appender.log_file.policies.cron.evaluateOnStartup = true
+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/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
index 690d09ae39..af03e23805 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/log4j2-config.properties
@@ -85,6 +85,6 @@ appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{y
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.log_file.policies.cron.type = CronTriggeringPolicy
-appender.log_file.policies.cron.schedule = 0 0 0 * * ?
-appender.log_file.policies.cron.evaluateOnStartup = true
+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/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties b/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties
index ad3f6cd2dc..3800188e6f 100644
--- a/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties
+++ b/tests/smoke-tests/src/main/resources/servers/nettynative/log4j2-config.properties
@@ -88,6 +88,6 @@ appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{y
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.log_file.policies.cron.type = CronTriggeringPolicy
-appender.log_file.policies.cron.schedule = 0 0 0 * * ?
-appender.log_file.policies.cron.evaluateOnStartup = true
+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
[activemq-artemis] 01/05: Fixing duplicate properties
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit a1f1cfa8dad5a11882145c0e519538eb02722fd1
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Fri Jul 22 17:38:14 2022 -0400
Fixing duplicate properties
---
.../src/main/java/org/apache/activemq/artemis/cli/commands/Run.java | 2 +-
.../activemq/artemis/cli/commands/etc/log4j2-config.properties | 6 +++---
.../apache/activemq/artemis/core/server/ActiveMQServerLogger.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index dd00eb5520..a12c7aa707 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -97,7 +97,7 @@ public class Run extends LockAbstract {
}
try {
server.getServer().getManagementService().registerHawtioSecurity(managementContext.getArtemisMBeanServerGuard());
- } catch (Exception e) {
+ } catch (Throwable e) {
ActiveMQServerLogger.LOGGER.unableToDeployHawtioMBean(e);
}
}
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
index 8a32c0ad47..4f7b536da1 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/log4j2-config.properties
@@ -84,6 +84,6 @@ appender.audit_log_file.filePattern = ${sys:artemis.instance}/log/audit.log.%d{y
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.log_file.policies.cron.type = CronTriggeringPolicy
-appender.log_file.policies.cron.schedule = 0 0 0 * * ?
-appender.log_file.policies.cron.evaluateOnStartup = true
+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/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 061f8e2c0e..4fedb7b9d2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1203,7 +1203,7 @@ public interface ActiveMQServerLogger {
@LogMessage(id = 222296, value = "Unable to deploy Hawtio MBeam, console client side RBAC not available", level = LogMessage.Level.WARN)
- void unableToDeployHawtioMBean(Exception e);
+ void unableToDeployHawtioMBean(Throwable e);
@LogMessage(id = 222297, value = "Unable to start Management Context, RBAC not available", level = LogMessage.Level.WARN)
void unableStartManagementContext(Exception e);
[activemq-artemis] 03/05: add note about many integration-tests etc still using JBL
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit a9e78f315480b5b9e5d42a1aa931c12cc9d9b25f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 25 13:29:41 2022 +0100
add note about many integration-tests etc still using JBL
---
TODO-new-logging.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/TODO-new-logging.txt b/TODO-new-logging.txt
index c807fe2c44..c872caeb36 100644
--- a/TODO-new-logging.txt
+++ b/TODO-new-logging.txt
@@ -1,5 +1,6 @@
TODOs not explicitly noted in the code itself already:
+- Remove JBL use from many 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