[activemq-artemis] branch new-logging updated: basic change to allow a broker distribution to start and serve clients

[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


The following commit(s) were added to refs/heads/new-logging by this push:
     new b8bab69059 basic change to allow a broker distribution to <just> start and serve clients
b8bab69059 is described below

commit b8bab690591454b0a5b853ac790c80c140a42f8f
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jun 17 18:09:25 2022 +0100

    basic change to allow a broker distribution to <just> start and serve clients
    
    - Move the logger facade factory to its own class, its needed at runtime.
    - Leave the processor and annotations in existing module as they arent wanted at runtime.
    - Use artemis-commons to pass it around to the rest for now
---
 .../artemis/integration/bootstrap/ActiveMQBootstrapLogger.java       | 1 -
 artemis-commons/pom.xml                                              | 5 +++++
 artemis-features/src/main/resources/features.xml                     | 1 +
 {artemis-log-processor => artemis-log-facade}/pom.xml                | 4 ++--
 .../java/org/apache/activemq/artemis/logprocessor/CodeFactory.java   | 0
 artemis-log-processor/pom.xml                                        | 5 +++++
 pom.xml                                                              | 1 +
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index 9dae7de582..f0c1904f95 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -17,7 +17,6 @@
 package org.apache.activemq.artemis.integration.bootstrap;
 
 import org.apache.activemq.artemis.logprocessor.CodeFactory;
-import org.apache.activemq.artemis.logprocessor.annotation.Cause;
 import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
 import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
 
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 64c989d149..bcb2019dea 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -52,6 +52,11 @@
       <!-- ^^ these dependencies are shaded on this JAR -->
 
       <!-- logging -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-facade</artifactId>
+         <version>${project.version}</version>
+      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-log-processor</artifactId>
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 96e673b5e3..7de6fadb58 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -54,6 +54,7 @@
 		<bundle dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
 
 		<bundle dependency="true">wrap:mvn:org.jgroups/jgroups/${jgroups.version}</bundle>
+		<bundle>wrap:mvn:org.apache.activemq/artemis-log-facade/${pom.version}</bundle>
 	</feature>
 
 	<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">
diff --git a/artemis-log-processor/pom.xml b/artemis-log-facade/pom.xml
similarity index 96%
copy from artemis-log-processor/pom.xml
copy to artemis-log-facade/pom.xml
index 8523273cfd..ed53d7324b 100644
--- a/artemis-log-processor/pom.xml
+++ b/artemis-log-facade/pom.xml
@@ -24,9 +24,9 @@
       <version>2.24.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>artemis-log-processor</artifactId>
+   <artifactId>artemis-log-facade</artifactId>
    <packaging>jar</packaging>
-   <name>ActiveMQ Log Processor</name>
+   <name>ActiveMQ Log Facade</name>
 
    <properties>
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
diff --git a/artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java b/artemis-log-facade/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
similarity index 100%
rename from artemis-log-processor/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
rename to artemis-log-facade/src/main/java/org/apache/activemq/artemis/logprocessor/CodeFactory.java
diff --git a/artemis-log-processor/pom.xml b/artemis-log-processor/pom.xml
index 8523273cfd..6abe8ab169 100644
--- a/artemis-log-processor/pom.xml
+++ b/artemis-log-processor/pom.xml
@@ -33,6 +33,11 @@
    </properties>
 
    <dependencies>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-facade</artifactId>
+         <version>${project.version}</version>
+      </dependency>
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 142ce10e94..f77f8c454d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
    </parent>
 
    <modules>
+      <module>artemis-log-facade</module>
       <module>artemis-log-processor</module>
       <module>artemis-protocols</module>
       <module>artemis-dto</module>