use a logger object that is defined in the message logger interface i…

…tself

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);
 
     /**

hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerService.java

@@ -39,8 +39,7 @@ public class BrokerService implements Service<BrokerService> {
     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);
 
     /**

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() {

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

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() {
     }

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() {
     }

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

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;

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

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;

hawkular-bus-common/src/main/java/org/hawkular/bus/common/consumer/AbstractBasicMessageListener.java

@@ -41,7 +41,7 @@
  */
 
 public abstract class AbstractBasicMessageListener<T extends BasicMessage> 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;

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<T extends BasicMessage> extends BasicMessageListener<T> implements
         ListenableFuture<T> {
 
-    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

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<T extends BasicMessage, U extends BasicMessage> extends
         AbstractBasicMessageListener<T> {
 
-    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;

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

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!"));
     }
 }

hawkular-nest/hawkular-nest-wf-extension/src/main/java/org/hawkular/nest/extension/NestService.java

@@ -37,8 +37,7 @@ public class NestService implements Service<NestService> {
     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);
 
     /**

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() {

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