From f3ed2a1c80877a6ce2fef6e767f1f8e34eaf95bc Mon Sep 17 00:00:00 2001 From: John Mazzitelli Date: Mon, 2 Feb 2015 14:10:00 -0500 Subject: [PATCH] use a logger object that is defined in the message logger interface itself --- .../extension/BrokerConfigurationSetup.java | 3 +- .../bus/broker/extension/BrokerService.java | 3 +- .../broker/extension/BrokerSubsystemAdd.java | 3 +- .../extension/BrokerSubsystemExtension.java | 3 +- .../extension/BrokerSubsystemStart.java | 4 +- .../broker/extension/BrokerSubsystemStop.java | 4 +- .../bus/broker/extension/log/MsgLogger.java | 47 ++++++++++--------- .../hawkular/bus/broker/EmbeddedBroker.java | 3 +- .../hawkular/bus/broker/log/MsgLogger.java | 19 ++++---- .../bus/common/ConnectionContextFactory.java | 3 +- .../AbstractBasicMessageListener.java | 2 +- .../consumer/FutureBasicMessageListener.java | 4 +- .../consumer/RPCBasicMessageListener.java | 4 +- .../hawkular/bus/common/log/MsgLogger.java | 7 ++- .../org/hawkular/bus/common/LoggingTest.java | 3 +- .../hawkular/nest/extension/NestService.java | 3 +- .../nest/extension/NestSubsystemAdd.java | 3 +- .../extension/NestSubsystemExtension.java | 4 +- .../nest/extension/log/MsgLogger.java | 39 ++++++++------- 19 files changed, 77 insertions(+), 84 deletions(-) diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerConfigurationSetup.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerConfigurationSetup.java index 7c9669e..a311a83 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerConfigurationSetup.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerConfigurationSetup.java @@ -27,8 +27,7 @@ import org.jboss.util.StringPropertyReplacer; public class BrokerConfigurationSetup { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerConfigurationSetup.class - .getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(BrokerConfigurationSetup.class); /** diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerService.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerService.java index d691d0b..e8dd4a6 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerService.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerService.java @@ -39,8 +39,7 @@ public class BrokerService implements Service { public static final ServiceName SERVICE_NAME = ServiceName.of("org.hawkular.bus").append( BrokerSubsystemExtension.SUBSYSTEM_NAME); - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerService.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(BrokerService.class); /** diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemAdd.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemAdd.java index ab3a4e0..5138652 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemAdd.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemAdd.java @@ -61,8 +61,7 @@ class BrokerSubsystemAdd extends AbstractAddStepHandler { static final BrokerSubsystemAdd INSTANCE = new BrokerSubsystemAdd(); - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerSubsystemAdd.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(BrokerSubsystemAdd.class); private BrokerSubsystemAdd() { diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java index 19dd7b5..7c853df 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java @@ -49,8 +49,7 @@ public class BrokerSubsystemExtension implements Extension { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerSubsystemExtension.class - .getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(BrokerSubsystemExtension.class); public static final String NAMESPACE = "urn:org.hawkular.bus:broker:1.0"; diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStart.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStart.java index 1df64a9..fb77ae5 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStart.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStart.java @@ -21,7 +21,6 @@ import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.OperationStepHandler; import org.jboss.dmr.ModelNode; -import org.jboss.logging.Logger; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceNotFoundException; import org.jboss.msc.service.StartException; @@ -30,8 +29,7 @@ class BrokerSubsystemStart implements OperationStepHandler { static final BrokerSubsystemStart INSTANCE = new BrokerSubsystemStart(); - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerSubsystemStart.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private BrokerSubsystemStart() { } diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStop.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStop.java index a2b396d..e2c3afe 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStop.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemStop.java @@ -21,15 +21,13 @@ import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.OperationStepHandler; import org.jboss.dmr.ModelNode; -import org.jboss.logging.Logger; import org.jboss.msc.service.ServiceName; class BrokerSubsystemStop implements OperationStepHandler { static final BrokerSubsystemStop INSTANCE = new BrokerSubsystemStop(); - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, BrokerSubsystemStop.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private BrokerSubsystemStop() { } diff --git a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/log/MsgLogger.java b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/log/MsgLogger.java index 0adc018..ccf4178 100644 --- a/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/log/MsgLogger.java +++ b/hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/log/MsgLogger.java @@ -16,6 +16,7 @@ */ package org.hawkular.bus.broker.extension.log; +import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.LogMessage; @@ -26,86 +27,88 @@ /** * @author John Mazzitelli */ -@MessageLogger(projectCode = "HAWK") -@ValidIdRange(min = 101000, max = 101999) +@MessageLogger(projectCode = "HAWKBUS") +@ValidIdRange(min = 110000, max = 119999) public interface MsgLogger { + MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName()); + @LogMessage(level = Level.WARN) - @Message(id = 101000, value = "Cannot determine absolute path of config file [%s]. Does it exist? - %s") + @Message(id = 110000, value = "Cannot determine absolute path of config file [%s]. Does it exist? - %s") void warnCannotDetermineConfigFilePath(String configFile, String causeString); @LogMessage(level = Level.INFO) - @Message(id = 101001, value = "Broker Service Starting") + @Message(id = 110001, value = "Broker Service Starting") void infoBrokerServiceStarting(); @LogMessage(level = Level.INFO) - @Message(id = 101002, value = "Broker Service Started") + @Message(id = 110002, value = "Broker Service Started") void infoBrokerServiceStarted(); @LogMessage(level = Level.INFO) - @Message(id = 101003, value = "Broker Service Stopping") + @Message(id = 110003, value = "Broker Service Stopping") void infoBrokerServiceStopping(); @LogMessage(level = Level.INFO) - @Message(id = 101004, value = "Broker Service Stopped") + @Message(id = 110004, value = "Broker Service Stopped") void infoBrokerServiceStopped(); @LogMessage(level = Level.INFO) - @Message(id = 101005, value = "Broker is already started") + @Message(id = 110005, value = "Broker is already started") void infoBrokerAlreadyStarted(); @LogMessage(level = Level.INFO) - @Message(id = 101006, value = "Starting the broker now") + @Message(id = 110006, value = "Starting the broker now") void infoStartingBrokerNow(); @LogMessage(level = Level.INFO) - @Message(id = 101007, value = "Broker told to bind socket to [%s:%s]") + @Message(id = 110007, value = "Broker told to bind socket to [%s:%s]") void infoBrokerBindingToSocket(String connectorAddress, String connectorPort); @LogMessage(level = Level.INFO) - @Message(id = 101008, value = "Broker told to discover other brokers via [%s:%s]") + @Message(id = 110008, value = "Broker told to discover other brokers via [%s:%s]") void infoBrokerDiscoveryEndpoint(String discoveryAddress, String discoveryPort); @LogMessage(level = Level.INFO) - @Message(id = 101009, value = "Broker told to use configuration file [%s]") + @Message(id = 110009, value = "Broker told to use configuration file [%s]") void infoBrokerConfigurationFile(String configFile); @LogMessage(level = Level.ERROR) - @Message(id = 101010, value = "Broker aborted with exception.") + @Message(id = 110010, value = "Broker aborted with exception.") void errorBrokerAborted(@Cause Throwable t); @LogMessage(level = Level.INFO) - @Message(id = 101011, value = "Broker is already stopped.") + @Message(id = 110011, value = "Broker is already stopped.") void infoBrokerAlreadyStopped(); @LogMessage(level = Level.INFO) - @Message(id = 101012, value = "Stopping the broker now") + @Message(id = 110012, value = "Stopping the broker now") void infoStoppingBrokerNow(); @LogMessage(level = Level.ERROR) - @Message(id = 101013, value = "Failed to shutdown broker") + @Message(id = 110013, value = "Failed to shutdown broker") void errorFailedToShutdownBroker(@Cause Throwable t); @LogMessage(level = Level.ERROR) - @Message(id = 101014, value = "The REST WAR could not be deployed; REST interface to the broker is unavailable: %s") + @Message(id = 110014, value = "The REST WAR could not be deployed; REST interface to the broker is unavailable: %s") void errorRestWarCouldNotBeDeployed(String causeString); @LogMessage(level = Level.INFO) - @Message(id = 101015, value = "Broker is not enabled and will not be deployed") + @Message(id = 110015, value = "Broker is not enabled and will not be deployed") void infoBrokerNotEnabled(); @LogMessage(level = Level.INFO) - @Message(id = 101016, value = "Broker is enabled and will be deployed using config file [%s]") + @Message(id = 110016, value = "Broker is enabled and will be deployed using config file [%s]") void infoBrokerEnabledWithConfigFile(String configFile); @LogMessage(level = Level.INFO) - @Message(id = 101017, value = "Initializing broker subsystem") + @Message(id = 110017, value = "Initializing broker subsystem") void infoInitializingBrokerSubsystem(); @LogMessage(level = Level.INFO) - @Message(id = 101018, value = "Asked to restart the broker. Will stop it, then restart it now.") + @Message(id = 110018, value = "Asked to restart the broker. Will stop it, then restart it now.") void infoAskedToRestartBroker(); @LogMessage(level = Level.INFO) - @Message(id = 101019, value = "Asked to stop the broker.") + @Message(id = 110019, value = "Asked to stop the broker.") void infoAskedToStopBroker(); } diff --git a/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/EmbeddedBroker.java b/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/EmbeddedBroker.java index 98ec192..3897ea9 100644 --- a/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/EmbeddedBroker.java +++ b/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/EmbeddedBroker.java @@ -36,8 +36,7 @@ * You can subclass this to provide additional functionality around configuration and management of the broker. */ public class EmbeddedBroker { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, EmbeddedBroker.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(EmbeddedBroker.class); private InitializationParameters initialParameters; private BrokerService brokerService; diff --git a/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/log/MsgLogger.java b/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/log/MsgLogger.java index fba6416..b37f40c 100644 --- a/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/log/MsgLogger.java +++ b/hawkular-bus-broker/src/main/java/org/hawkular/bus/broker/log/MsgLogger.java @@ -16,6 +16,7 @@ */ package org.hawkular.bus.broker.log; +import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; import org.jboss.logging.annotations.LogMessage; import org.jboss.logging.annotations.Message; @@ -25,30 +26,32 @@ /** * @author John Mazzitelli */ -@MessageLogger(projectCode = "HAWK") -@ValidIdRange(min = 102000, max = 102999) +@MessageLogger(projectCode = "HAWKBUS") +@ValidIdRange(min = 120000, max = 129999) public interface MsgLogger { + MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName()); + @LogMessage(level = Level.INFO) - @Message(id = 102000, value = "Attempting to start the broker") + @Message(id = 120000, value = "Attempting to start the broker") void infoStartingBroker(); @LogMessage(level = Level.INFO) - @Message(id = 102001, value = "Started broker") + @Message(id = 120001, value = "Started broker") void infoStartedBroker(); @LogMessage(level = Level.INFO) - @Message(id = 102002, value = "Attempting to stop the broker") + @Message(id = 120002, value = "Attempting to stop the broker") void infoStoppingBroker(); @LogMessage(level = Level.INFO) - @Message(id = 102003, value = "Stopped broker") + @Message(id = 120003, value = "Stopped broker") void infoStoppedBroker(); @LogMessage(level = Level.INFO) - @Message(id = 102004, value = "Initialized broker") + @Message(id = 120004, value = "Initialized broker") void infoInitializedBroker(); @LogMessage(level = Level.INFO) - @Message(id = 102005, value = "%s") + @Message(id = 120005, value = "%s") void infoUsage(String usageString); } diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ConnectionContextFactory.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ConnectionContextFactory.java index 22354a3..4e63720 100644 --- a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ConnectionContextFactory.java +++ b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ConnectionContextFactory.java @@ -45,8 +45,7 @@ */ public class ConnectionContextFactory { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, ConnectionContextFactory.class - .getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(ConnectionContextFactory.class); protected final ConnectionFactory connectionFactory; private Connection connection; diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/AbstractBasicMessageListener.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/AbstractBasicMessageListener.java index 6463d39..752b293 100644 --- a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/AbstractBasicMessageListener.java +++ b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/AbstractBasicMessageListener.java @@ -41,7 +41,7 @@ */ public abstract class AbstractBasicMessageListener implements MessageListener { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, this.getClass().getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(this.getClass()); private ConsumerConnectionContext consumerConnectionContext; diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/FutureBasicMessageListener.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/FutureBasicMessageListener.java index 7cd3f58..811c1cd 100644 --- a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/FutureBasicMessageListener.java +++ b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/FutureBasicMessageListener.java @@ -29,7 +29,6 @@ import org.hawkular.bus.common.BasicMessage; import org.hawkular.bus.common.log.MsgLogger; -import org.jboss.logging.Logger; import com.google.common.util.concurrent.ExecutionList; import com.google.common.util.concurrent.ListenableFuture; @@ -52,8 +51,7 @@ public class FutureBasicMessageListener extends BasicMessageListener implements ListenableFuture { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, FutureBasicMessageListener.class - .getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private static enum State { WAITING, DONE, CANCELLED diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/RPCBasicMessageListener.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/RPCBasicMessageListener.java index 75195fd..ed1a1ae 100644 --- a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/RPCBasicMessageListener.java +++ b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/RPCBasicMessageListener.java @@ -24,7 +24,6 @@ import org.hawkular.bus.common.MessageProcessor; import org.hawkular.bus.common.log.MsgLogger; import org.hawkular.bus.common.producer.ProducerConnectionContext; -import org.jboss.logging.Logger; /** * A listener that processes an incoming request that will require a response sent back to the sender of the request. @@ -37,8 +36,7 @@ public abstract class RPCBasicMessageListener extends AbstractBasicMessageListener { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, RPCBasicMessageListener.class - .getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; // this will be used to send our reply private MessageProcessor messageSender; diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/log/MsgLogger.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/log/MsgLogger.java index 0541adb..24fbf25 100644 --- a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/log/MsgLogger.java +++ b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/log/MsgLogger.java @@ -16,6 +16,7 @@ */ package org.hawkular.bus.common.log; +import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.LogMessage; @@ -26,9 +27,11 @@ /** * @author John Mazzitelli */ -@MessageLogger(projectCode = "HAWK") -@ValidIdRange(min = 100000, max = 100999) +@MessageLogger(projectCode = "HAWKBUS") +@ValidIdRange(min = 100000, max = 109999) public interface MsgLogger { + MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName()); + @LogMessage(level = Level.ERROR) @Message(id = 100000, value = "A message was received that was not a valid text message") void errorNotValidTextMessage(@Cause Throwable cause); diff --git a/hawkular-bus-common/src/test/java/org/hawkular/bus/common/LoggingTest.java b/hawkular-bus-common/src/test/java/org/hawkular/bus/common/LoggingTest.java index fb368a7..c7b1bc9 100644 --- a/hawkular-bus-common/src/test/java/org/hawkular/bus/common/LoggingTest.java +++ b/hawkular-bus-common/src/test/java/org/hawkular/bus/common/LoggingTest.java @@ -17,7 +17,6 @@ package org.hawkular.bus.common; import org.hawkular.bus.common.log.MsgLogger; -import org.jboss.logging.Logger; import org.junit.Test; /** @@ -27,7 +26,7 @@ public class LoggingTest { @Test public void test() { - MsgLogger log = Logger.getMessageLogger(MsgLogger.class, this.getClass().getPackage().getName()); + MsgLogger log = MsgLogger.LOGGER; log.errorNotValidTextMessage(new Throwable("TESTING!")); } } diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestService.java b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestService.java index 0ab54e5..9cbb510 100644 --- a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestService.java +++ b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestService.java @@ -37,8 +37,7 @@ public class NestService implements Service { public static final ServiceName SERVICE_NAME = ServiceName.of("org.hawkular.nest").append( NestSubsystemExtension.SUBSYSTEM_NAME); - private final MsgLogger msglog = Logger - .getMessageLogger(MsgLogger.class, NestService.class.getPackage().getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(NestService.class); /** diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemAdd.java b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemAdd.java index 3dc647f..751c327 100644 --- a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemAdd.java +++ b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemAdd.java @@ -61,8 +61,7 @@ class NestSubsystemAdd extends AbstractAddStepHandler { static final NestSubsystemAdd INSTANCE = new NestSubsystemAdd(); - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, NestSubsystemAdd.class.getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(NestSubsystemAdd.class); private NestSubsystemAdd() { diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemExtension.java b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemExtension.java index 85ba06d..8346faf 100644 --- a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemExtension.java +++ b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestSubsystemExtension.java @@ -49,9 +49,7 @@ public class NestSubsystemExtension implements Extension { - private final MsgLogger msglog = Logger.getMessageLogger(MsgLogger.class, NestSubsystemExtension.class - .getPackage() - .getName()); + private final MsgLogger msglog = MsgLogger.LOGGER; private final Logger log = Logger.getLogger(NestSubsystemExtension.class); public static final String NAMESPACE = "urn:org.hawkular.nest:nest:1.0"; diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/log/MsgLogger.java b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/log/MsgLogger.java index ce28638..85c8a3b 100644 --- a/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/log/MsgLogger.java +++ b/hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/log/MsgLogger.java @@ -16,6 +16,7 @@ */ package org.hawkular.nest.extension.log; +import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.LogMessage; @@ -26,71 +27,73 @@ /** * @author John Mazzitelli */ -@MessageLogger(projectCode = "HAWK") -@ValidIdRange(min = 103000, max = 103999) +@MessageLogger(projectCode = "HAWKBUS") +@ValidIdRange(min = 130000, max = 139999) public interface MsgLogger { + MsgLogger LOGGER = Logger.getMessageLogger(MsgLogger.class, MsgLogger.class.getPackage().getName()); + @LogMessage(level = Level.INFO) - @Message(id = 103000, value = "Nest service starting") + @Message(id = 130000, value = "Nest service starting") void infoNestStarting(); @LogMessage(level = Level.INFO) - @Message(id = 103001, value = "Nest service started") + @Message(id = 130001, value = "Nest service started") void infoNestStarted(); @LogMessage(level = Level.INFO) - @Message(id = 103002, value = "Nest service stopping") + @Message(id = 130002, value = "Nest service stopping") void infoNestStopping(); @LogMessage(level = Level.INFO) - @Message(id = 103003, value = "Nest service stopped") + @Message(id = 130003, value = "Nest service stopped") void infoNestStopped(); @LogMessage(level = Level.INFO) - @Message(id = 103004, value = "Nest name=[%s]") + @Message(id = 130004, value = "Nest name=[%s]") void infoNestName(String name); @LogMessage(level = Level.INFO) - @Message(id = 103005, value = "Broker service is not started") + @Message(id = 130005, value = "Broker service is not started") void infoBrokerServiceNotStarted(); @LogMessage(level = Level.ERROR) - @Message(id = 103006, value = "Cannot close the messaging connection context factory") + @Message(id = 130006, value = "Cannot close the messaging connection context factory") void errorCannotCloseMsgConnCtxFactory(@Cause Throwable t); @LogMessage(level = Level.INFO) - @Message(id = 103007, value = "There is a broker at [%s]") + @Message(id = 130007, value = "There is a broker at [%s]") void infoBrokerExists(String brokerUrl); @LogMessage(level = Level.INFO) - @Message(id = 103008, value = "[%d] deployments found") + @Message(id = 130008, value = "[%d] deployments found") void infoDeploymentsFound(int deploymentsCount); @LogMessage(level = Level.INFO) - @Message(id = 103009, value = "%d. Deploying [%s]") + @Message(id = 130009, value = "%d. Deploying [%s]") void infoDeploying(int deploymentNumber, String deploymentName); @LogMessage(level = Level.ERROR) - @Message(id = 103010, value = "Failed to get deployments from [%s] - nothing will be deployed") + @Message(id = 130010, value = "Failed to get deployments from [%s] - nothing will be deployed") void errorFailedGettingDeployments(String deploymentsLocation); @LogMessage(level = Level.ERROR) - @Message(id = 103011, value = "[%s] is not a directory - nothing will be deployed") + @Message(id = 130011, value = "[%s] is not a directory - nothing will be deployed") void errorBadDeploymentsDirectory(String deploymentsLocation); @LogMessage(level = Level.ERROR) - @Message(id = 103012, value = "Missing directory [%s] - nothing will be deployed") + @Message(id = 130012, value = "Missing directory [%s] - nothing will be deployed") void errorMissingDeploymentsDirectory(String deploymentsLocation); @LogMessage(level = Level.INFO) - @Message(id = 103013, value = "Nest is not enabled and will not be deployed") + @Message(id = 130013, value = "Nest is not enabled and will not be deployed") void infoNestNotEnabled(); @LogMessage(level = Level.INFO) - @Message(id = 103014, value = "Nest is enabled and will be deployed") + @Message(id = 130014, value = "Nest is enabled and will be deployed") void infoNestEnabled(); @LogMessage(level = Level.INFO) - @Message(id = 103015, value = "Initializing Nest subsystem") + @Message(id = 130015, value = "Initializing Nest subsystem") void infoInitializingNestSubsystem(); }