This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 8a912ed209 ARTEMIS-5110: retire/exclude previously-used IDs
removed/reassigned in the following older commits:
8a912ed209 is described below
commit 8a912ed209d7c952994908ad5df3ea22ebfa844e
Author: Robbie Gemmell <[email protected]>
AuthorDate: Tue Oct 29 16:14:44 2024 +0000
ARTEMIS-5110: retire/exclude previously-used IDs removed/reassigned in the
following older commits:
177e6820b541e0a71b952eebf503a4d2235910c5
e34fd09ce325a551bf2eaf579854e2e107435502
e065d25b6fb4cdfa7f5b72afd52d6f4771b50634
af9bd7b84aad32e4fe30f2c8909e51cf7300b475
f4bdacbc4cb46b308f80391940890c74bf111ecd
74951d9221b29336c6575de9390a8557114e10eb
fe0ca4d84fc587b701e4b83ae8e5f2240c222842
b08b91a32faa89cdff4403b532e60d96084f2d4a
85857ab8eb1b1eca2498306239740e0e39d2acd4
e02ec69021f24220c0b91b8324382c9630415276
bf9f6d213bf6b3bf4fd7e15430ada8c9954e69ce
2d806807b8d9006cf642392ad5da9878394cebae
52a4157bbb898ee8fd8d7f13fffca71a9c368630
53bb3ea1833cddda6c2ded70d3149286c8207570
d5f152c7254c378707b12ad4a0b798fdb8cb7b10
b3529dcea428fa697aacbceacc6641e47cfb74ba
246bf083914c7acbb05a7fe0904c471331242c39
8a04ee07de8a7c863daf37a07a1176131151caa0
6cb68f2ce923ea3c2400c21967b2003175c8a0f4
9873fccf744c0cb0a25dd905fab67ea52ef7aa7d
See PR for individual commits which were squashed to form this change. This
closes #5320
---
.../artemis/integration/bootstrap/ActiveMQBootstrapLogger.java | 2 +-
.../java/org/apache/activemq/artemis/logs/AuditLogger.java | 2 +-
.../activemq/artemis/core/client/ActiveMQClientLogger.java | 2 +-
.../artemis/core/client/ActiveMQClientMessageBundle.java | 2 +-
.../activemq/artemis/jms/server/ActiveMQJMSServerBundle.java | 2 +-
.../activemq/artemis/jms/server/ActiveMQJMSServerLogger.java | 2 +-
.../amqp/logger/ActiveMQAMQPProtocolMessageBundle.java | 10 +++++++++-
.../java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java | 2 +-
.../java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java | 2 +-
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 2 +-
10 files changed, 18 insertions(+), 10 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 f4d200c0eb..a63eef02af 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
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.logs.BundleFactory;
/**
* Logger Codes 100000 - 109999
*/
-@LogBundle(projectCode = "AMQ", regexID = "10[0-9]{4}", retiredIDs = {101001,
101002, 101003})
+@LogBundle(projectCode = "AMQ", regexID = "10[0-9]{4}", retiredIDs = {101001,
101002, 101003, 101004, 101005, 102000, 104001, 104002})
public interface ActiveMQBootstrapLogger {
ActiveMQBootstrapLogger LOGGER =
BundleFactory.newBundle(ActiveMQBootstrapLogger.class,
ActiveMQBootstrapLogger.class.getPackage().getName());
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index 762756eea5..8170b17d0a 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -31,7 +31,7 @@ import java.util.Set;
/**
* Logger Codes 600000 - 609999
*/
-@LogBundle(projectCode = "AMQ", regexID = "60[0-9]{4}")
+@LogBundle(projectCode = "AMQ", regexID = "60[0-9]{4}", retiredIDs = {601268,
601503, 601504, 601505, 601506, 601507, 601508})
public interface AuditLogger {
AuditLogger BASE_LOGGER = BundleFactory.newBundle(AuditLogger.class,
"org.apache.activemq.audit.base");
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 744e9d6c63..ff3a2ed816 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Node;
/**
* Logger Codes 210000 - 218999
*/
-@LogBundle(projectCode = "AMQ", regexID = "21[0-8][0-9]{3}", retiredIDs =
{214029})
+@LogBundle(projectCode = "AMQ", regexID = "21[0-8][0-9]{3}", retiredIDs =
{211001, 211002, 211003, 212000, 212006, 212029, 212074, 212078, 214012,
214023, 214024, 214026, 214027, 214028, 214029})
public interface ActiveMQClientLogger {
ActiveMQClientLogger LOGGER =
BundleFactory.newBundle(ActiveMQClientLogger.class,
ActiveMQClientLogger.class.getPackage().getName());
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 76f3eaa7d8..8b154ac80e 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Node;
/**
* Logger Codes 219000 - 219999
*/
-@LogBundle(projectCode = "AMQ", regexID = "219[0-9]{3}", retiredIDs = {219005,
219034, 219037, 219063})
+@LogBundle(projectCode = "AMQ", regexID = "219[0-9]{3}", retiredIDs = {219002,
219005, 219034, 219037, 219063})
public interface ActiveMQClientMessageBundle {
ActiveMQClientMessageBundle BUNDLE =
BundleFactory.newBundle(ActiveMQClientMessageBundle.class);
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
index afca588f38..99cc082f7d 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.logs.BundleFactory;
/**
* Logger Codes 129000 - 129999
*/
-@LogBundle(projectCode = "AMQ", regexID = "129[0-9]{3}")
+@LogBundle(projectCode = "AMQ", regexID = "129[0-9]{3}", retiredIDs = {129001,
129002, 129008, 129009, 129010, 129011, 129012, 129013, 129014, 129015})
public interface ActiveMQJMSServerBundle {
ActiveMQJMSServerBundle BUNDLE =
BundleFactory.newBundle(ActiveMQJMSServerBundle.class);
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
index 4280972f38..c74b9dd781 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Node;
/**
* Logger Codes 120000 - 128999
*/
-@LogBundle(projectCode = "AMQ", regexID = "12[0-8][0-9]{3}", retiredIDs =
{122008, 122013, 122014, 122016})
+@LogBundle(projectCode = "AMQ", regexID = "12[0-8][0-9]{3}", retiredIDs =
{121000, 121001, 121002, 121003, 121005, 122000, 122001, 122002, 122003,
122004, 122006, 122008, 122009, 122010, 122013, 122014, 122015, 122016, 124001})
public interface ActiveMQJMSServerLogger {
ActiveMQJMSServerLogger LOGGER =
BundleFactory.newBundle(ActiveMQJMSServerLogger.class,
ActiveMQJMSServerLogger.class.getPackage().getName());
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java
index 2edc464576..bd0cba8bc1 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java
@@ -28,8 +28,12 @@ import
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPSecurity
/**
* Logger Codes 119000 - 119999
+ *
+ * (Though IDs 119030 - 119299 are to be avoided due to use by other classes
historically,
+ * ActiveMQClientMessageBundle and ActiveMQMessageBundle, prior to their codes
being
+ * changed in commit b3529dcea428fa697aacbceacc6641e47cfb74ba for ARTEMIS-1018)
*/
-@LogBundle(projectCode = "AMQ", regexID = "119[0-9]{3}", retiredIDs = {119000,
119003, 119012, 119013})
+@LogBundle(projectCode = "AMQ", regexID = "119[3-9][0-9]{2}|1190[0-2][0-9]",
retiredIDs = {119000, 119003, 119004, 119009, 119012, 119013})
public interface ActiveMQAMQPProtocolMessageBundle {
ActiveMQAMQPProtocolMessageBundle BUNDLE =
BundleFactory.newBundle(ActiveMQAMQPProtocolMessageBundle.class);
@@ -105,4 +109,8 @@ public interface ActiveMQAMQPProtocolMessageBundle {
@Message(id = 119029, value = "Receiver link refused for address {}")
ActiveMQAMQPIllegalStateException receiverLinkRefused(String address);
+
+ // IDs 119030-119299 are reserved due to historic use by
ActiveMQClientMessageBundle and ActiveMQMessageBundle
+
+ // The next ID used needs to be 119300.
}
diff --git
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
index 6582544266..9d7a754db1 100644
---
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
+++
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
@@ -28,7 +28,7 @@ import org.apache.activemq.artemis.logs.BundleFactory;
/**
* Logger Codes 159000 - 159999
*/
-@LogBundle(projectCode = "AMQ", regexID = "159[0-9]{3}")
+@LogBundle(projectCode = "AMQ", regexID = "159[0-9]{3}", retiredIDs = {159008})
public interface ActiveMQRABundle {
/**
diff --git
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
index 87a489b159..5f73b882aa 100644
---
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
+++
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
@@ -27,7 +27,7 @@ import javax.jms.IllegalStateException;
/**
* Logger Codes 150000 - 158999
*/
-@LogBundle(projectCode = "AMQ", regexID = "15[0-8][0-9]{3}")
+@LogBundle(projectCode = "AMQ", regexID = "15[0-8][0-9]{3}", retiredIDs =
{152000})
public interface ActiveMQRALogger {
/**
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 7e89dd6c5e..e43aac1a9c 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
@@ -51,7 +51,7 @@ import
org.apache.activemq.artemis.spi.core.remoting.Connection;
/**
* Logger Codes 220000 - 228999
*/
-@LogBundle(projectCode = "AMQ", regexID = "22[0-8][0-9]{3}", retiredIDs =
{221026, 221052, 222012, 222020, 222021, 222022, 222024, 222027, 222028,
222029, 222052, 222071, 222078, 222079, 222083, 222084, 222088, 222090, 222102,
222128, 222134, 222135, 222152, 222159, 222163, 222167, 222170, 222171, 222182,
222192, 222193, 222204, 222252, 222255, 222257, 222259, 222260, 222288, 224001,
224002, 224003, 224005, 224035, 224100, 224121})
+@LogBundle(projectCode = "AMQ", regexID = "22[0-8][0-9]{3}", retiredIDs =
{221026, 221052, 222003, 222012, 222015, 222020, 222021, 222022, 222024,
222027, 222028, 222029, 222048, 222052, 222058, 222064, 222071, 222078, 222079,
222083, 222084, 222088, 222090, 222102, 222105, 222128, 222134, 222135, 222152,
222159, 222163, 222167, 222170, 222171, 222182, 222190, 222192, 222193, 222204,
222252, 222255, 222257, 222259, 222260, 222276, 222277, 222288, 224001, 224002,
224003, 224005, 224013, 2 [...]
public interface ActiveMQServerLogger {
// Note: logger ID 224127 uses
"org.apache.activemq.artemis.core.server.Queue" for its logger category, rather
than ActiveMQServerLogger.class.getPackage().getName()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
