Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-5110: retire/exclude previously-used IDs removed/reassigned in the following older commits: 

177e6820b5
e34fd09ce3
e065d25b6f
af9bd7b84a
f4bdacbc4c
74951d9221
fe0ca4d84f
b08b91a32f
85857ab8eb
e02ec69021
bf9f6d213b
2d806807b8
52a4157bbb
53bb3ea183
d5f152c725
b3529dcea4
246bf08391
8a04ee07de
6cb68f2ce9
9873fccf74

See PR for individual commits which were squashed to form this change. This closes #5320
This commit is contained in:
Robbie Gemmell 2024-10-29 16:14:44 +00:00
parent 9f1681a36a
commit 8a912ed209
10 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
View File

@ -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());

2
artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
View File

@ -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");

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
View File

@ -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());

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
View File

@ -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);

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerBundle.java
View File

@ -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);

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
View File

@ -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());

10
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/logger/ActiveMQAMQPProtocolMessageBundle.java
View File

@ -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.
}

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABundle.java
View File

@ -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 {
/**

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
View File

@ -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 {
/**

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -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, 224031, 224035, 224070, 224100, 224121})
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()