[hornetq-commits] JBoss hornetq SVN: r12300 - in branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server: impl and 1 other directory.

Author: ataylor Date: 2012-03-14 06:49:46 -0400 (Wed, 14 Mar 2012) New Revision: 12300 Added: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQLogger.java branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java Removed: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java Modified: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java Log: moved logger Copied: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQLogger.java (from rev 12292, branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java) =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQLogger.java (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQLogger.java 2012-03-14 10:49:46 UTC (rev 12300) @@ -0,0 +1,202 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat, Inc., and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.hornetq.core.server; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * 3/8/12 + */ +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.server.impl.HornetQServerImpl; +import org.jboss.logging.BasicLogger; +import org.jboss.logging.Cause; +import org.jboss.logging.LogMessage; +import org.jboss.logging.Logger; +import org.jboss.logging.Message; +import org.jboss.logging.MessageLogger; + +import java.util.concurrent.ExecutorService; + +@MessageLogger(projectCode = "HQ") +public interface HornetQLogger extends BasicLogger +{ + /** + * The default logger. + */ + HornetQLogger LOGGER = Logger.getMessageLogger(HornetQLogger.class, HornetQLogger.class.getPackage().getName()); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1001, value = "{0} server is starting with configuration {1}", format = Message.Format.MESSAGE_FORMAT) + void serverStarting(String type, Configuration configuration); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1002, value = "{0} is already started, ignoring the call to start..", format = Message.Format.MESSAGE_FORMAT) + void serverAlreadyStarted(String type); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1003, value = "HornetQ Server version {0} [{1}] {2}", format = Message.Format.MESSAGE_FORMAT) + void serverStarted(String fullVersion, SimpleString nodeId, String identity); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1004, value = "HornetQ Server version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) + void serverStopped(String version, SimpleString nodeId); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1005, value = "trying to deploy queue {0}", format = Message.Format.MESSAGE_FORMAT) + void deployQueue(SimpleString queueName); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1006, value = "{0}", format = Message.Format.MESSAGE_FORMAT) + void dumpServerInfo(String serverInfo); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1007, value = "Deleting pending large message as it wasn't completed: {0}", format = Message.Format.MESSAGE_FORMAT) + void deletingPendingMessage(Pair<Long, Long> msgToDelete); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1008, value = "Waiting to obtain live lock", format = Message.Format.MESSAGE_FORMAT) + void awaitingLiveLock(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1009, value = "Server is now live", format = Message.Format.MESSAGE_FORMAT) + void serverIsLive(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1010, value = "live server wants to restart, restarting server in backup" , format = Message.Format.MESSAGE_FORMAT) + void awaitFailBack(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1011, value = "HornetQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", + format = Message.Format.MESSAGE_FORMAT) + void backupServerStarted(String version, SimpleString nodeID); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1012, value = "Backup Server is now live", format = Message.Format.MESSAGE_FORMAT) + void backupServerIsLive(); + + @LogMessage(level = Logger.Level.INFO) + @Message(id = 1013, value = "Server {0} is now live", format = Message.Format.MESSAGE_FORMAT) + void serverIsLive(String identity); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2001, value = "HornetQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope" , + format = Message.Format.MESSAGE_FORMAT) + void serverFinalisedWIthoutBeingSTopped(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2002, value = "Error closing sessions while stopping server" , format = Message.Format.MESSAGE_FORMAT) + void errorClosingSessionsWhileStoppingServer(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2003, value = "Timed out waiting for pool to terminate {0}. Interrupting all its threads!", format = Message.Format.MESSAGE_FORMAT) + void timedOutStoppingThreadpool(ExecutorService service); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2004, value = "Must specify a name for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoName(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2005, value = "Must specify an address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoAddress(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2006, value = "Must specify a forwarding address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) + void divertWithNoForwardingAddress(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2007, value = "Binding already exists with name {0}, divert will not be deployed", format = Message.Format.MESSAGE_FORMAT) + void divertBindingNotExists(SimpleString bindingName); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2008, value = "Security risk! HornetQ is running with the default cluster admin user and default password. " + + "Please see the HornetQ user guide, cluster chapter, for instructions on how to change this." , format = Message.Format.MESSAGE_FORMAT) + void clusterSecurityRisk(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2009, value = "unable to restart server, please kill and restart manually", format = Message.Format.MESSAGE_FORMAT) + void serverRestartWarning(); + + @LogMessage(level = Logger.Level.WARN) + void serverRestartWarning(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2010, value = "Unable to announce backup for replication. Trying to stop the server.", format = Message.Format.MESSAGE_FORMAT) + void replicationStartProblem(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2011, value = "Critical IO Error, shutting down the server. code={0}, message={1}", format = Message.Format.MESSAGE_FORMAT) + void ioErrorShutdownServer(int code, String message); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2012, value = "Error stopping server", format = Message.Format.MESSAGE_FORMAT) + void errorStoppingServer(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2013, value = "Timed out waiting for backup activation to exit", format = Message.Format.MESSAGE_FORMAT) + void backupActivationProblem(); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2014, value = "Error when trying to start replication", format = Message.Format.MESSAGE_FORMAT) + void errorStartingReplication(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2015, value = "Error when trying to stop replication", format = Message.Format.MESSAGE_FORMAT) + void errorStoppingReplication(@Cause Exception e); + + @LogMessage(level = Logger.Level.WARN) + @Message(id = 2016, value = "{0}", format = Message.Format.MESSAGE_FORMAT) + void warn(String message); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3001, value = "Server already started!", format = Message.Format.MESSAGE_FORMAT) + void serverAlreadyStarted(); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3002, value = "Starting server {0}", format = Message.Format.MESSAGE_FORMAT) + void startingServer(HornetQServer server); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3003, value = "Cancelled the execution of {0}", format = Message.Format.MESSAGE_FORMAT) + void cancelExecution(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3004, value = "First part initialization on {0}", format = Message.Format.MESSAGE_FORMAT) + void initializeFirstPart(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3005, value = "announcing backup to the former live {0}", format = Message.Format.MESSAGE_FORMAT) + void announceBackupToFormerLive(Runnable runnable); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3006, value = "{0} ::Stopping live node in favor of failback", format = Message.Format.MESSAGE_FORMAT) + void stoppingLiveNodeInFavourOfFailback(HornetQServerImpl server); + + @LogMessage(level = Logger.Level.DEBUG) + @Message(id = 3007, value = "{0} ::Starting backup node now after failback", format = Message.Format.MESSAGE_FORMAT) + void startingBackupAfterFailure(HornetQServerImpl server); + + @LogMessage(level = Logger.Level.ERROR) + @Message(id = 4001, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT) + void initializationError(@Cause Throwable e); +} Copied: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java (from rev 12292, branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java) =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java (rev 0) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java 2012-03-14 10:49:46 UTC (rev 12300) @@ -0,0 +1,53 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2010, Red Hat, Inc., and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.hornetq.core.server; + +import org.hornetq.api.core.HornetQException; +import org.jboss.logging.Message; +import org.jboss.logging.MessageBundle; +import org.jboss.logging.Messages; +import org.jboss.logging.Property; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * 3/12/12 + */ +@MessageBundle(projectCode = "HQ") +public interface HornetQMessageBundle +{ + HornetQMessageBundle MESSAGES = Messages.getBundle(HornetQMessageBundle.class); + + @Message(id = 9001, value = "Generating thread dump because - {0}", format = Message.Format.MESSAGE_FORMAT) + String generatingThreadDump(String reason); + + @Message(id = 9002, value = "End Thread dump", format = Message.Format.MESSAGE_FORMAT) + String endThreadDump(); + + @Message(id = 9003, value = "Thread {0} name {1} id {2} group {3}", format = Message.Format.MESSAGE_FORMAT) + String threadInfo(Thread key, String name, Long id, ThreadGroup group); + + @Message(id = 9004, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT) + HornetQException notABackupServer(@Property Integer code); + + @Message(id = 9005, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT) + String backupServerAlreadyConnectingToLive(); +} Deleted: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java 2012-03-14 03:06:58 UTC (rev 12299) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQLogger.java 2012-03-14 10:49:46 UTC (rev 12300) @@ -1,202 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat, Inc., and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.hornetq.core.server.impl; - -/** - * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> - * 3/8/12 - */ -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.HornetQServer; -import org.jboss.logging.BasicLogger; -import org.jboss.logging.Cause; -import org.jboss.logging.LogMessage; -import org.jboss.logging.Logger; -import org.jboss.logging.Message; -import org.jboss.logging.MessageLogger; - -import java.util.concurrent.ExecutorService; - -@MessageLogger(projectCode = "HQ") -public interface HornetQLogger extends BasicLogger -{ - /** - * The default logger. - */ - HornetQLogger LOGGER = Logger.getMessageLogger(HornetQLogger.class, HornetQLogger.class.getPackage().getName()); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1001, value = "{0} server is starting with configuration {1}", format = Message.Format.MESSAGE_FORMAT) - void serverStarting(String type, Configuration configuration); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1002, value = "{0} is already started, ignoring the call to start..", format = Message.Format.MESSAGE_FORMAT) - void serverAlreadyStarted(String type); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1003, value = "HornetQ Server version {0} [{1}] {2}", format = Message.Format.MESSAGE_FORMAT) - void serverStarted(String fullVersion, SimpleString nodeId, String identity); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1004, value = "HornetQ Server version {0} [{1}] stopped", format = Message.Format.MESSAGE_FORMAT) - void serverStopped(String version, SimpleString nodeId); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1005, value = "trying to deploy queue {0}", format = Message.Format.MESSAGE_FORMAT) - void deployQueue(SimpleString queueName); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1006, value = "{0}", format = Message.Format.MESSAGE_FORMAT) - void dumpServerInfo(String serverInfo); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1007, value = "Deleting pending large message as it wasn't completed: {0}", format = Message.Format.MESSAGE_FORMAT) - void deletingPendingMessage(Pair<Long, Long> msgToDelete); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1008, value = "Waiting to obtain live lock", format = Message.Format.MESSAGE_FORMAT) - void awaitingLiveLock(); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1009, value = "Server is now live", format = Message.Format.MESSAGE_FORMAT) - void serverIsLive(); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1010, value = "live server wants to restart, restarting server in backup" , format = Message.Format.MESSAGE_FORMAT) - void awaitFailBack(); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1011, value = "HornetQ Backup Server version {0} [{1}] started, waiting live to fail before it gets active", - format = Message.Format.MESSAGE_FORMAT) - void backupServerStarted(String version, SimpleString nodeID); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1012, value = "Backup Server is now live", format = Message.Format.MESSAGE_FORMAT) - void backupServerIsLive(); - - @LogMessage(level = Logger.Level.INFO) - @Message(id = 1013, value = "Server {0} is now live", format = Message.Format.MESSAGE_FORMAT) - void serverIsLive(String identity); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2001, value = "HornetQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope" , - format = Message.Format.MESSAGE_FORMAT) - void serverFinalisedWIthoutBeingSTopped(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2002, value = "Error closing sessions while stopping server" , format = Message.Format.MESSAGE_FORMAT) - void errorClosingSessionsWhileStoppingServer(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2003, value = "Timed out waiting for pool to terminate {0}. Interrupting all its threads!", format = Message.Format.MESSAGE_FORMAT) - void timedOutStoppingThreadpool(ExecutorService service); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2004, value = "Must specify a name for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) - void divertWithNoName(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2005, value = "Must specify an address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) - void divertWithNoAddress(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2006, value = "Must specify a forwarding address for each divert. This one will not be deployed." , format = Message.Format.MESSAGE_FORMAT) - void divertWithNoForwardingAddress(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2007, value = "Binding already exists with name {0}, divert will not be deployed", format = Message.Format.MESSAGE_FORMAT) - void divertBindingNotExists(SimpleString bindingName); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2008, value = "Security risk! HornetQ is running with the default cluster admin user and default password. " - + "Please see the HornetQ user guide, cluster chapter, for instructions on how to change this." , format = Message.Format.MESSAGE_FORMAT) - void clusterSecurityRisk(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2009, value = "unable to restart server, please kill and restart manually", format = Message.Format.MESSAGE_FORMAT) - void serverRestartWarning(); - - @LogMessage(level = Logger.Level.WARN) - void serverRestartWarning(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2010, value = "Unable to announce backup for replication. Trying to stop the server.", format = Message.Format.MESSAGE_FORMAT) - void replicationStartProblem(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2011, value = "Critical IO Error, shutting down the server. code={0}, message={1}", format = Message.Format.MESSAGE_FORMAT) - void ioErrorShutdownServer(int code, String message); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2012, value = "Error stopping server", format = Message.Format.MESSAGE_FORMAT) - void errorStoppingServer(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2013, value = "Timed out waiting for backup activation to exit", format = Message.Format.MESSAGE_FORMAT) - void backupActivationProblem(); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2014, value = "Error when trying to start replication", format = Message.Format.MESSAGE_FORMAT) - void errorStartingReplication(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2015, value = "Error when trying to stop replication", format = Message.Format.MESSAGE_FORMAT) - void errorStoppingReplication(@Cause Exception e); - - @LogMessage(level = Logger.Level.WARN) - @Message(id = 2016, value = "{0}", format = Message.Format.MESSAGE_FORMAT) - void warn(String message); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3001, value = "Server already started!", format = Message.Format.MESSAGE_FORMAT) - void serverAlreadyStarted(); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3002, value = "Starting server {0}", format = Message.Format.MESSAGE_FORMAT) - void startingServer(HornetQServer server); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3003, value = "Cancelled the execution of {0}", format = Message.Format.MESSAGE_FORMAT) - void cancelExecution(Runnable runnable); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3004, value = "First part initialization on {0}", format = Message.Format.MESSAGE_FORMAT) - void initializeFirstPart(Runnable runnable); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3005, value = "announcing backup to the former live {0}", format = Message.Format.MESSAGE_FORMAT) - void announceBackupToFormerLive(Runnable runnable); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3006, value = "{0} ::Stopping live node in favor of failback", format = Message.Format.MESSAGE_FORMAT) - void stoppingLiveNodeInFavourOfFailback(HornetQServerImpl server); - - @LogMessage(level = Logger.Level.DEBUG) - @Message(id = 3007, value = "{0} ::Starting backup node now after failback", format = Message.Format.MESSAGE_FORMAT) - void startingBackupAfterFailure(HornetQServerImpl server); - - @LogMessage(level = Logger.Level.ERROR) - @Message(id = 4001, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT) - void initializationError(@Cause Throwable e); -} Deleted: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java 2012-03-14 03:06:58 UTC (rev 12299) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQMessageBundle.java 2012-03-14 10:49:46 UTC (rev 12300) @@ -1,55 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2010, Red Hat, Inc., and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.hornetq.core.server.impl; - -import org.hornetq.api.core.HornetQException; -import org.jboss.logging.Field; -import org.jboss.logging.Message; -import org.jboss.logging.MessageBundle; -import org.jboss.logging.Messages; -import org.jboss.logging.Param; -import org.jboss.logging.Property; - -/** - * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> - * 3/12/12 - */ -@MessageBundle(projectCode = "HQ") -public interface HornetQMessageBundle -{ - HornetQMessageBundle MESSAGES = Messages.getBundle(HornetQMessageBundle.class); - - @Message(id = 9001, value = "Generating thread dump because - {0}", format = Message.Format.MESSAGE_FORMAT) - String generatingThreadDump(String reason); - - @Message(id = 9002, value = "End Thread dump", format = Message.Format.MESSAGE_FORMAT) - String endThreadDump(); - - @Message(id = 9003, value = "Thread {0} name {1} id {2} group {3}", format = Message.Format.MESSAGE_FORMAT) - String threadInfo(Thread key, String name, Long id, ThreadGroup group); - - @Message(id = 9004, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT) - HornetQException notABackupServer(@Property Integer code); - - @Message(id = 9005, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT) - String backupServerAlreadyConnectingToLive(); -} Modified: branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-03-14 03:06:58 UTC (rev 12299) +++ branches/i18n_logging/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2012-03-14 10:49:46 UTC (rev 12300) @@ -102,6 +102,8 @@ import org.hornetq.core.server.ActivateCallback; import org.hornetq.core.server.Bindable; import org.hornetq.core.server.Divert; +import org.hornetq.core.server.HornetQLogger; +import org.hornetq.core.server.HornetQMessageBundle; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.LargeServerMessage;