diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2015-03-12 16:13:26 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2015-03-12 16:13:26 +0000 |
| commit | 679888eb0d0dd80e21f5c63de83037a19d3b6c5b (patch) | |
| tree | 8891ebeac88e20c280baf859cb92f2b748c32312 | |
| parent | 6e98063ae07795f988ad26fdcf49d204d88b39c3 (diff) | |
| download | qpid-python-679888eb0d0dd80e21f5c63de83037a19d3b6c5b.tar.gz | |
QPID-2836 : [Java Broker] Use slf4j facade for logging in the Java Broker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666234 13f79535-47bb-0310-9956-ffa450edef68
186 files changed, 1012 insertions, 754 deletions
diff --git a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java index 1369a3e26a..66f133da12 100644 --- a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java +++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java @@ -37,7 +37,9 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObject; import org.apache.qpid.server.jmx.ManagedObjectRegistry; @@ -52,7 +54,7 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; */ public class BDBHAMessageStoreManagerMBean extends AMQManagedObject implements ManagedBDBHAMessageStore { - private static final Logger LOGGER = Logger.getLogger(BDBHAMessageStoreManagerMBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBHAMessageStoreManagerMBean.class); private static final TabularType GROUP_MEMBERS_TABLE; private static final CompositeType GROUP_MEMBER_ROW; diff --git a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java index 76e4415d7c..d23ca2a312 100644 --- a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java +++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java @@ -22,13 +22,14 @@ package org.apache.qpid.server.store.berkeleydb.jmx; import javax.management.JMException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.jmx.MBeanProvider; import org.apache.qpid.server.jmx.ManagedObject; import org.apache.qpid.server.jmx.ManagedObjectRegistry; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.State; -import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; /** @@ -37,7 +38,7 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; */ public class BDBHAMessageStoreManagerMBeanProvider implements MBeanProvider { - private static final Logger LOGGER = Logger.getLogger(BDBHAMessageStoreManagerMBeanProvider.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBHAMessageStoreManagerMBeanProvider.class); public BDBHAMessageStoreManagerMBeanProvider() { diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java index be9248c0d2..c668cc8595 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java @@ -41,7 +41,7 @@ import com.sleepycat.je.OperationStatus; import com.sleepycat.je.Sequence; import com.sleepycat.je.SequenceConfig; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.ConfiguredObject; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java index 4717aab472..045a4a05e6 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java @@ -20,16 +20,6 @@ */ package org.apache.qpid.server.store.berkeleydb; -import com.sleepycat.je.DatabaseException; -import com.sleepycat.je.Environment; -import com.sleepycat.je.EnvironmentConfig; -import com.sleepycat.je.util.DbBackup; -import org.apache.log4j.Logger; - -import org.apache.qpid.server.store.StoreException; -import org.apache.qpid.util.CommandLineParser; -import org.apache.qpid.util.FileUtils; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -39,6 +29,17 @@ import java.util.LinkedList; import java.util.List; import java.util.Properties; +import com.sleepycat.je.DatabaseException; +import com.sleepycat.je.Environment; +import com.sleepycat.je.EnvironmentConfig; +import com.sleepycat.je.util.DbBackup; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.store.StoreException; +import org.apache.qpid.util.CommandLineParser; +import org.apache.qpid.util.FileUtils; + /** * BDBBackup is a utility for taking hot backups of the current state of a BDB transaction log database. * <p> @@ -77,10 +78,10 @@ import java.util.Properties; public class BDBBackup { /** Used for debugging. */ - private static final Logger log = Logger.getLogger(BDBBackup.class); + private static final Logger log = LoggerFactory.getLogger(BDBBackup.class); /** Used for communicating with the user. */ - private static final Logger console = Logger.getLogger("Console"); + private static final Logger console = LoggerFactory.getLogger("Console"); /** Defines the suffix used to identify BDB log files. */ private static final String LOG_FILE_SUFFIX = ".jdb"; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java index f082c23c8a..87bd606f83 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java @@ -38,7 +38,8 @@ import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.LockMode; import com.sleepycat.je.OperationStatus; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.store.ConfiguredObjectRecord; @@ -62,7 +63,7 @@ import org.apache.qpid.util.FileUtils; */ public class BDBConfigurationStore implements MessageStoreProvider, DurableConfigurationStore { - private static final Logger LOGGER = Logger.getLogger(BDBConfigurationStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBConfigurationStore.class); public static final int VERSION = 8; private static final String CONFIGURED_OBJECTS_DB_NAME = "CONFIGURED_OBJECTS"; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java index 2f00d9852c..36c235d5a8 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java @@ -24,7 +24,8 @@ import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; import com.sleepycat.je.DatabaseException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.store.FileBasedSettings; @@ -37,7 +38,7 @@ import org.apache.qpid.util.FileUtils; */ public class BDBMessageStore extends AbstractBDBMessageStore { - private static final Logger LOGGER = Logger.getLogger(BDBMessageStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBMessageStore.class); private final EnvironmentFacadeFactory _environmentFacadeFactory; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java index 23aefb8118..1f730e6d03 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java @@ -25,13 +25,14 @@ import com.sleepycat.je.DatabaseConfig; import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.store.StoreException; public class BDBUtils { - private static final Logger LOGGER = Logger.getLogger(BDBUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBUtils.class); public static final DatabaseConfig DEFAULT_DATABASE_CONFIG = new DatabaseConfig().setTransactional(true).setAllowCreate(true); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java index 2a8cf92b3d..6699de5dec 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java @@ -28,7 +28,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.sleepycat.je.DatabaseException; import com.sleepycat.je.Environment; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.util.FutureResult; @@ -75,7 +76,7 @@ public class CoalescingCommiter implements Committer private static final class BDBCommitFutureResult implements FutureResult { - private static final Logger LOGGER = Logger.getLogger(BDBCommitFutureResult.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBCommitFutureResult.class); private final CommitThread _commitThread; private final Transaction _tx; @@ -209,7 +210,7 @@ public class CoalescingCommiter implements Committer */ private static class CommitThread extends Thread { - private static final Logger LOGGER = Logger.getLogger(CommitThread.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CommitThread.class); private final AtomicBoolean _stopped = new AtomicBoolean(false); private final Queue<BDBCommitFutureResult> _jobQueue = new ConcurrentLinkedQueue<BDBCommitFutureResult>(); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java index 133a0ee7d9..cbfeb2d9ff 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java @@ -29,7 +29,8 @@ import com.sleepycat.je.CheckpointConfig; import com.sleepycat.je.DatabaseException; import com.sleepycat.je.Environment; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.util.FutureResult; @@ -63,7 +64,7 @@ public class CommitThreadWrapper private static final class BDBCommitFutureResult implements FutureResult { - private static final Logger LOGGER = Logger.getLogger(BDBCommitFutureResult.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBCommitFutureResult.class); private final CommitThread _commitThread; private final Transaction _tx; @@ -198,7 +199,7 @@ public class CommitThreadWrapper */ private static class CommitThread extends Thread { - private static final Logger LOGGER = Logger.getLogger(CommitThread.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CommitThread.class); private final AtomicBoolean _stopped = new AtomicBoolean(false); private final Queue<BDBCommitFutureResult> _jobQueue = new ConcurrentLinkedQueue<BDBCommitFutureResult>(); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java index b13766a136..a499f10ce1 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java @@ -20,18 +20,19 @@ */ package org.apache.qpid.server.store.berkeleydb; -import org.apache.log4j.Logger; import com.sleepycat.je.ExceptionEvent; import com.sleepycat.je.ExceptionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LoggingAsyncExceptionListener implements ExceptionListener { - private static final Logger LOGGER = Logger.getLogger(LoggingAsyncExceptionListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LoggingAsyncExceptionListener.class); @Override public void exceptionThrown(ExceptionEvent event) { LOGGER.error("Asynchronous exception thrown by BDB thread '" + event.getThreadName() + "'", event.getException()); } -}
\ No newline at end of file +} diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java index eff652ce05..3c65da63d5 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java @@ -35,7 +35,8 @@ import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.Sequence; import com.sleepycat.je.SequenceConfig; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.util.FutureResult; @@ -43,7 +44,7 @@ import org.apache.qpid.server.store.berkeleydb.logging.Log4jLoggingHandler; public class StandardEnvironmentFacade implements EnvironmentFacade { - private static final Logger LOGGER = Logger.getLogger(StandardEnvironmentFacade.class); + private static final Logger LOGGER = LoggerFactory.getLogger(StandardEnvironmentFacade.class); private final String _storePath; private final ConcurrentMap<String, Database> _cachedDatabases = new ConcurrentHashMap<>(); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java index 0aec43e4ad..6b952d53dd 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java @@ -29,6 +29,9 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class Log4jLoggingHandler extends Handler { @@ -44,31 +47,118 @@ public class Log4jLoggingHandler extends Handler }); } - private static final Map<Level, org.apache.log4j.Level> LEVEL_MAP; + private static interface MappedLevel + { + public boolean isEnabled(final Logger logger); + + void log(Logger logger, String message); + } + + private static final MappedLevel ERROR = new MappedLevel() + { + @Override + public boolean isEnabled(final Logger logger) + { + return logger.isErrorEnabled(); + } + + @Override + public void log(final Logger logger, final String message) + { + logger.error(message); + } + }; + + private static final MappedLevel WARN = new MappedLevel() + { + @Override + public boolean isEnabled(final Logger logger) + { + return logger.isWarnEnabled(); + } + + @Override + public void log(final Logger logger, final String message) + { + logger.warn(message); + } + }; + + private static final MappedLevel INFO = new MappedLevel() + { + @Override + public boolean isEnabled(final Logger logger) + { + return logger.isInfoEnabled(); + } + + @Override + public void log(final Logger logger, final String message) + { + logger.info(message); + } + }; + + private static final MappedLevel DEBUG = new MappedLevel() + { + @Override + public boolean isEnabled(final Logger logger) + { + return logger.isDebugEnabled(); + } + + @Override + public void log(final Logger logger, final String message) + { + logger.debug(message); + } + }; + + private static final MappedLevel TRACE = new MappedLevel() + { + @Override + public boolean isEnabled(final Logger logger) + { + return logger.isTraceEnabled(); + } + + @Override + public void log(final Logger logger, final String message) + { + logger.trace(message); + } + }; + + private static final Map<Level, MappedLevel> LEVEL_MAP; static { - Map<Level, org.apache.log4j.Level> map = new HashMap<>(); - map.put(Level.SEVERE, org.apache.log4j.Level.ERROR); - map.put(Level.WARNING, org.apache.log4j.Level.WARN); + Map<Level, MappedLevel> map = new HashMap<>(); + map.put(Level.SEVERE, ERROR); + map.put(Level.WARNING, WARN); //Note that INFO comes out at DEBUG level as the BDB logging at INFO seems to be more of a DEBUG nature - map.put(Level.INFO, org.apache.log4j.Level.DEBUG); - map.put(Level.CONFIG, org.apache.log4j.Level.DEBUG); - map.put(Level.FINE, org.apache.log4j.Level.TRACE); - map.put(Level.FINER, org.apache.log4j.Level.TRACE); - map.put(Level.FINEST, org.apache.log4j.Level.TRACE); - map.put(Level.ALL, org.apache.log4j.Level.TRACE); + map.put(Level.INFO, DEBUG); + map.put(Level.CONFIG, DEBUG); + map.put(Level.FINE, TRACE); + map.put(Level.FINER, TRACE); + map.put(Level.FINEST, TRACE); + map.put(Level.ALL, TRACE); LEVEL_MAP = Collections.unmodifiableMap(map); } - private static final org.apache.log4j.Logger BDB_LOGGER = org.apache.log4j.Logger.getLogger("BDB"); + private static final Logger BDB_LOGGER = LoggerFactory.getLogger("BDB"); + private boolean isEnabledFor(Level level) + { + final MappedLevel mappedLevel = LEVEL_MAP.get(level); + return mappedLevel == null ? false : mappedLevel.isEnabled(BDB_LOGGER); + } @Override public void publish(final LogRecord record) { - org.apache.log4j.Level level = convertLevel(record.getLevel()); - if (BDB_LOGGER.isEnabledFor(level)) + MappedLevel level = convertLevel(record.getLevel()); + if (level.isEnabled(BDB_LOGGER)) { Formatter formatter = getFormatter(); @@ -78,7 +168,7 @@ public class Log4jLoggingHandler extends Handler String message = formatter.format(record); try { - BDB_LOGGER.log(level, message); + level.log(BDB_LOGGER, message); } catch (RuntimeException e) { @@ -95,30 +185,32 @@ public class Log4jLoggingHandler extends Handler @Override public boolean isLoggable(final LogRecord record) { - return BDB_LOGGER.isEnabledFor(convertLevel(record.getLevel())); + MappedLevel mappedLevel = convertLevel(record.getLevel()); + + return mappedLevel.isEnabled(BDB_LOGGER); } - private org.apache.log4j.Level convertLevel(final Level level) + private MappedLevel convertLevel(final Level level) { //Note that INFO comes out at DEBUG level as the BDB logging at INFO seems to be more of a DEBUG nature - org.apache.log4j.Level result = LEVEL_MAP.get(level); + MappedLevel result = LEVEL_MAP.get(level); if(result == null) { if (level.intValue() >= Level.SEVERE.intValue()) { - result = org.apache.log4j.Level.ERROR; + result = ERROR; } else if (level.intValue() >= Level.WARNING.intValue()) { - result = org.apache.log4j.Level.WARN; + result = WARN; } else if (level.intValue() >= Level.CONFIG.intValue()) { - result = org.apache.log4j.Level.DEBUG; + result = DEBUG; } else { - result = org.apache.log4j.Level.TRACE; + result = TRACE; } } diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java index 09e17cfc98..ef522a4594 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.store.berkeleydb.replication; -import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade; - import com.sleepycat.bind.tuple.IntegerBinding; import com.sleepycat.bind.tuple.LongBinding; import com.sleepycat.je.Database; @@ -30,11 +28,14 @@ import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.Durability; import com.sleepycat.je.Transaction; import com.sleepycat.je.TransactionConfig; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade; public class DatabasePinger { - private static final Logger LOGGER = Logger.getLogger(DatabasePinger.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DatabasePinger.class); public static final String PING_DATABASE_NAME = "PINGDB"; private static final DatabaseConfig DATABASE_CONFIG = diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java index 4c0bf41cbf..b88e99c805 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java @@ -68,8 +68,9 @@ import com.sleepycat.je.rep.utilint.ServiceDispatcher.ServiceConnectFailedExcept import com.sleepycat.je.rep.vlsn.VLSNRange; import com.sleepycat.je.utilint.PropUtil; import com.sleepycat.je.utilint.VLSN; -import org.apache.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.store.StoreException; @@ -91,7 +92,7 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan public static final String ENVIRONMENT_RESTART_RETRY_LIMIT_PROPERTY_NAME = "qpid.bdb.ha.environment_restart_retry_limit"; public static final String EXECUTOR_SHUTDOWN_TIMEOUT_PROPERTY_NAME = "qpid.bdb.ha.executor_shutdown_timeout"; - private static final Logger LOGGER = Logger.getLogger(ReplicatedEnvironmentFacade.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ReplicatedEnvironmentFacade.class); private static final int DEFAULT_MASTER_TRANSFER_TIMEOUT = 1000 * 60; private static final int DEFAULT_DB_PING_SOCKET_TIMEOUT = 1000; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java index 43aa5aa2b4..4a53a00363 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java @@ -22,15 +22,15 @@ package org.apache.qpid.server.store.berkeleydb.upgrade; import java.util.List; -import org.apache.log4j.Logger; - import com.sleepycat.je.Database; import com.sleepycat.je.Environment; import com.sleepycat.je.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractStoreUpgrade implements StoreUpgrade { - private static final Logger _logger = Logger.getLogger(AbstractStoreUpgrade.class); + private static final Logger _logger = LoggerFactory.getLogger(AbstractStoreUpgrade.class); protected void reportFinished(Environment environment, int version) { diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java index 925e40ea93..59573ee680 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java @@ -20,15 +20,16 @@ */ package org.apache.qpid.server.store.berkeleydb.upgrade; -import org.apache.log4j.Logger; import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class CursorOperation implements DatabaseRunnable { - private static final Logger _logger = Logger.getLogger(CursorOperation.class); + private static final Logger _logger = LoggerFactory.getLogger(CursorOperation.class); private CursorTemplate _template; private long _rowCount; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java index 135158afa4..464f4b4101 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java @@ -20,16 +20,16 @@ */ package org.apache.qpid.server.store.berkeleydb.upgrade; -import org.apache.log4j.Logger; - import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseConfig; import com.sleepycat.je.Environment; import com.sleepycat.je.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DatabaseTemplate { - private static final Logger _logger = Logger.getLogger(DatabaseTemplate.class); + private static final Logger _logger = LoggerFactory.getLogger(DatabaseTemplate.class); private Environment _environment; private String _sourceDatabaseName; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java index 1d689090ae..05f0039b24 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java @@ -40,7 +40,8 @@ import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.Environment; import com.sleepycat.je.Transaction; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.exchange.ExchangeDefaults; @@ -73,7 +74,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade private static final byte COLON = (byte) ':'; - private static final Logger _logger = Logger.getLogger(UpgradeFrom4To5.class); + private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom4To5.class); public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler, ConfiguredObject<?> parent) { diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java index 1e4bfec09c..40b0afb9a1 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java @@ -35,7 +35,21 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.UUID; -import org.apache.log4j.Logger; +import com.sleepycat.bind.tuple.LongBinding; +import com.sleepycat.bind.tuple.TupleBinding; +import com.sleepycat.bind.tuple.TupleInput; +import com.sleepycat.bind.tuple.TupleOutput; +import com.sleepycat.je.Cursor; +import com.sleepycat.je.CursorConfig; +import com.sleepycat.je.Database; +import com.sleepycat.je.DatabaseEntry; +import com.sleepycat.je.Environment; +import com.sleepycat.je.LockMode; +import com.sleepycat.je.OperationStatus; +import com.sleepycat.je.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; @@ -51,23 +65,10 @@ import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding; import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding; import org.apache.qpid.server.util.MapJsonSerializer; -import com.sleepycat.bind.tuple.LongBinding; -import com.sleepycat.bind.tuple.TupleBinding; -import com.sleepycat.bind.tuple.TupleInput; -import com.sleepycat.bind.tuple.TupleOutput; -import com.sleepycat.je.Cursor; -import com.sleepycat.je.CursorConfig; -import com.sleepycat.je.Database; -import com.sleepycat.je.DatabaseEntry; -import com.sleepycat.je.Environment; -import com.sleepycat.je.LockMode; -import com.sleepycat.je.OperationStatus; -import com.sleepycat.je.Transaction; - public class UpgradeFrom5To6 extends AbstractStoreUpgrade { - private static final Logger _logger = Logger.getLogger(UpgradeFrom5To6.class); + private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6.class); static final String OLD_CONTENT_DB_NAME = "messageContentDb_v5"; static final String NEW_CONTENT_DB_NAME = "MESSAGE_CONTENT"; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java index 1be7e97a47..ec22ad0fc8 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java @@ -20,28 +20,28 @@ */ package org.apache.qpid.server.store.berkeleydb.upgrade; -import com.sleepycat.je.Cursor; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.log4j.Logger; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.store.StoreException; -import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore; - import com.sleepycat.bind.tuple.IntegerBinding; import com.sleepycat.bind.tuple.LongBinding; +import com.sleepycat.je.Cursor; import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseConfig; import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.DatabaseException; import com.sleepycat.je.Environment; import com.sleepycat.je.OperationStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.store.StoreException; +import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore; public class Upgrader { - private static final Logger LOGGER = Logger.getLogger(Upgrader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Upgrader.class); static final String VERSION_DB_NAME = "DB_VERSION"; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java index 002e012cac..0a9f076021 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java @@ -27,7 +27,6 @@ import java.util.Set; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.sleepycat.je.rep.MasterStateException; -import org.apache.log4j.Logger; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.logging.EventLogger; @@ -47,7 +46,6 @@ import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironment public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDBHARemoteReplicationNodeImpl> implements BDBHARemoteReplicationNode<BDBHARemoteReplicationNodeImpl> { - private static final Logger LOGGER = Logger.getLogger(BDBHARemoteReplicationNodeImpl.class); private final ReplicatedEnvironmentFacade _replicatedEnvironmentFacade; private final String _address; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index 9f4402881b..20c59ddf6a 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -56,7 +56,8 @@ import com.sleepycat.je.rep.StateChangeEvent; import com.sleepycat.je.rep.StateChangeListener; import com.sleepycat.je.rep.util.ReplicationGroupAdmin; import com.sleepycat.je.rep.utilint.HostPortPair; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.Task; @@ -104,7 +105,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu */ private static final int MUTATE_JE_TIMEOUT_MS = 100; - private static final Logger LOGGER = Logger.getLogger(BDBHAVirtualHostNodeImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BDBHAVirtualHostNodeImpl.class); private final AtomicReference<ReplicatedEnvironmentFacade> _environmentFacade = new AtomicReference<>(); diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java index ae8ba468f0..4b5069fec8 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java @@ -44,7 +44,9 @@ import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; @@ -65,7 +67,7 @@ import org.apache.qpid.url.URLSyntaxException; */ public class BDBStoreUpgradeTestPreparer { - private static final Logger _logger = Logger.getLogger(BDBStoreUpgradeTestPreparer.class); + private static final Logger _logger = LoggerFactory.getLogger(BDBStoreUpgradeTestPreparer.class); public static final String TOPIC_NAME="myUpgradeTopic"; public static final String SUB_NAME="myDurSubName"; diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java index f2ed48d2d9..c47307bdc0 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java @@ -26,7 +26,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.File; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -35,17 +40,9 @@ import java.util.concurrent.atomic.AtomicReference; import com.sleepycat.bind.tuple.IntegerBinding; import com.sleepycat.bind.tuple.StringBinding; -import com.sleepycat.je.DatabaseEntry; -import org.apache.log4j.Logger; -import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade; -import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.test.utils.PortHelper; -import org.apache.qpid.test.utils.QpidTestCase; -import org.apache.qpid.test.utils.TestFileUtils; -import org.apache.qpid.util.FileUtils; - import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseConfig; +import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.Durability; import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; @@ -58,10 +55,19 @@ import com.sleepycat.je.rep.ReplicationNode; import com.sleepycat.je.rep.StateChangeEvent; import com.sleepycat.je.rep.StateChangeListener; import org.codehaus.jackson.map.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade; +import org.apache.qpid.server.util.ConnectionScopedRuntimeException; +import org.apache.qpid.test.utils.PortHelper; +import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.TestFileUtils; +import org.apache.qpid.util.FileUtils; public class ReplicatedEnvironmentFacadeTest extends QpidTestCase { - private static final Logger LOGGER = Logger.getLogger(ReplicatedEnvironmentFacadeTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ReplicatedEnvironmentFacadeTest.class); private static final int LISTENER_TIMEOUT = 5; private static final int WAIT_STATE_CHANGE_TIMEOUT = 30; diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java index 717534a6b8..6351ee5205 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java @@ -41,7 +41,15 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import org.apache.log4j.Logger; +import com.sleepycat.bind.tuple.LongBinding; +import com.sleepycat.je.Database; +import com.sleepycat.je.DatabaseEntry; +import com.sleepycat.je.Environment; +import com.sleepycat.je.LockMode; +import com.sleepycat.je.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.model.Binding; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.LifetimePolicy; @@ -66,16 +74,9 @@ import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeCo import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeUUIDBinding; import org.apache.qpid.server.util.MapJsonSerializer; -import com.sleepycat.bind.tuple.LongBinding; -import com.sleepycat.je.Database; -import com.sleepycat.je.DatabaseEntry; -import com.sleepycat.je.Environment; -import com.sleepycat.je.LockMode; -import com.sleepycat.je.Transaction; - public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase { - private static final Logger _logger = Logger.getLogger(UpgradeFrom5To6Test.class); + private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6Test.class); private static final String ARGUMENTS = "arguments"; @Override diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index 874b5eb324..6cb3c85a0a 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java @@ -30,7 +30,9 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.Session; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode; @@ -46,7 +48,7 @@ import org.apache.qpid.util.SystemUtils; */ public class BDBBackupTest extends QpidBrokerTestCase { - protected static final Logger LOGGER = Logger.getLogger(BDBBackupTest.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(BDBBackupTest.class); private static final String BACKUP_SCRIPT = "/bin/backup.sh"; private static final String BACKUP_COMPLETE_MESSAGE = "Hot Backup Completed"; diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java index 97d380b55f..99f5ca8e54 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java @@ -43,10 +43,11 @@ import java.util.concurrent.TimeUnit; import javax.jms.Connection; import com.sleepycat.je.rep.ReplicationConfig; -import org.apache.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionURL; @@ -68,7 +69,7 @@ import org.apache.qpid.url.URLSyntaxException; public class GroupCreator { - protected static final Logger LOGGER = Logger.getLogger(GroupCreator.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(GroupCreator.class); private static final String MANY_BROKER_URL_FORMAT = "amqp://guest:guest@/%s?brokerlist='%s'&failover='roundrobin?cyclecount='%d''"; private static final String BROKER_PORTION_FORMAT = "tcp://localhost:%d?connectdelay='%d',retries='%d'"; diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java index 8933297b4a..555a45ba38 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java @@ -37,7 +37,10 @@ import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; -import org.apache.log4j.Logger; +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.management.common.mbeans.ManagedBroker; import org.apache.qpid.server.model.State; @@ -48,7 +51,6 @@ import org.apache.qpid.systest.rest.RestTestHelper; import org.apache.qpid.test.utils.BrokerHolder; import org.apache.qpid.test.utils.JMXTestUtils; import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.junit.Assert; /** * System test verifying the ability to control a cluster via the Management API. @@ -57,7 +59,7 @@ import org.junit.Assert; */ public class JMXManagementTest extends QpidBrokerTestCase { - protected static final Logger LOGGER = Logger.getLogger(JMXManagementTest.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(JMXManagementTest.class); private static final Set<String> NON_MASTER_STATES = new HashSet<String>(Arrays.asList(REPLICA.toString(), DETACHED.toString(), UNKNOWN.toString()));; private static final String VIRTUAL_HOST = "test"; diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java index 7ec28bd1f2..8f0493a59e 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java @@ -41,7 +41,9 @@ import com.sleepycat.je.Durability; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.rep.ReplicatedEnvironment; import com.sleepycat.je.rep.ReplicationConfig; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.jms.ConnectionListener; import org.apache.qpid.jms.ConnectionURL; @@ -58,7 +60,7 @@ import org.apache.qpid.test.utils.TestUtils; */ public class MultiNodeTest extends QpidBrokerTestCase { - protected static final Logger LOGGER = Logger.getLogger(MultiNodeTest.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(MultiNodeTest.class); private static final String VIRTUAL_HOST = "test"; private static final int NUMBER_OF_NODES = 3; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java index bf45268a5e..06d58eb11c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java @@ -28,7 +28,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.Broker; @@ -50,7 +51,7 @@ import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; public class ManagementModeStoreHandler implements DurableConfigurationStore { - private static final Logger LOGGER = Logger.getLogger(ManagementModeStoreHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ManagementModeStoreHandler.class); private static final String MANAGEMENT_MODE_PORT_PREFIX = "MANAGEMENT-MODE-PORT-"; private static final String PORT_TYPE = Port.class.getSimpleName(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java index 0f59494850..5c10d6f7ac 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java @@ -37,14 +37,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.util.ServerScopedRuntimeException; public class TaskExecutorImpl implements TaskExecutor { private static final String TASK_EXECUTION_THREAD_NAME = "Broker-Configuration-Thread"; - private static final Logger LOGGER = Logger.getLogger(TaskExecutorImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TaskExecutorImpl.class); private volatile Thread _taskThread; private final AtomicBoolean _running = new AtomicBoolean(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java index a24195075e..460a1c207d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java @@ -29,14 +29,15 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.protocol.AMQConnectionModel; public class ConnectionRegistry implements IConnectionRegistry { - private Logger _logger = Logger.getLogger(ConnectionRegistry.class); + private Logger _logger = LoggerFactory.getLogger(ConnectionRegistry.class); private final Set<AMQConnectionModel> _registry = newSetFromMap(new ConcurrentHashMap<AMQConnectionModel, Boolean>()); private final Collection<RegistryChangeListener> _listeners = new ArrayList<>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java index be4ac9d427..321f8b28e6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java @@ -30,14 +30,16 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.MessageInstance; import org.apache.qpid.server.util.StateChangeListener; public abstract class AbstractConsumerTarget implements ConsumerTarget { - private static final Logger LOGGER = Logger.getLogger(AbstractConsumerTarget.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConsumerTarget.class); private final AtomicReference<State> _state; private final Set<StateChangeListener<ConsumerTarget, State>> _stateChangeListeners = new diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index 61bbe6f732..ac623bc337 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -41,7 +41,8 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -79,7 +80,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> extends AbstractConfiguredObject<T> implements ExchangeImpl<T> { - private static final Logger _logger = Logger.getLogger(AbstractExchange.class); + private static final Logger _logger = LoggerFactory.getLogger(AbstractExchange.class); private final AtomicBoolean _closed = new AtomicBoolean(); @ManagedAttributeField(beforeSet = "preSetAlternateExchange", afterSet = "postSetAlternateExchange" ) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java index fcc34ee4de..7cf1963331 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java @@ -18,7 +18,6 @@ */ package org.apache.qpid.server.exchange; -import org.apache.log4j.Logger; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageDestination; @@ -35,7 +34,6 @@ public class DefaultDestination implements MessageDestination { private VirtualHostImpl _virtualHost; - private static final Logger _logger = Logger.getLogger(DefaultDestination.class); public DefaultDestination(VirtualHostImpl virtualHost) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java index 66de22ece8..fa8b52db55 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java @@ -31,7 +31,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -51,7 +52,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class DirectExchange extends AbstractExchange<DirectExchange> { - private static final Logger _logger = Logger.getLogger(DirectExchange.class); + private static final Logger _logger = LoggerFactory.getLogger(DirectExchange.class); private static final class BindingSet { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java index a72cbd6396..a7265526fe 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java @@ -27,7 +27,8 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -46,7 +47,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; @ManagedObject( category = false, type = ExchangeDefaults.FANOUT_EXCHANGE_CLASS ) public class FanoutExchange extends AbstractExchange<FanoutExchange> { - private static final Logger _logger = Logger.getLogger(FanoutExchange.class); + private static final Logger _logger = LoggerFactory.getLogger(FanoutExchange.class); private static final Integer ONE = Integer.valueOf(1); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java index de796a846a..4329e2e003 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java @@ -26,7 +26,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.binding.BindingImpl; import org.apache.qpid.server.filter.AMQInvalidArgumentException; @@ -40,7 +41,7 @@ import org.apache.qpid.server.message.AMQMessageHeader; */ class HeadersBinding { - private static final Logger _logger = Logger.getLogger(HeadersBinding.class); + private static final Logger _logger = LoggerFactory.getLogger(HeadersBinding.class); private final Map<String,Object> _mappings; private final BindingImpl _binding; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java index a5c74cb286..5130423ac9 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java @@ -29,7 +29,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -73,7 +74,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class HeadersExchange extends AbstractExchange<HeadersExchange> { - private static final Logger _logger = Logger.getLogger(HeadersExchange.class); + private static final Logger _logger = LoggerFactory.getLogger(HeadersExchange.class); private final ConcurrentMap<String, CopyOnWriteArraySet<BindingImpl>> _bindingsByKey = new ConcurrentHashMap<String, CopyOnWriteArraySet<BindingImpl>>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java index 3e5d7dedb4..2cc2930fcb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java @@ -28,7 +28,8 @@ import java.util.HashSet; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -51,7 +52,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; @ManagedObject( category = false, type = ExchangeDefaults.TOPIC_EXCHANGE_CLASS ) public class TopicExchange extends AbstractExchange<TopicExchange> { - private static final Logger _logger = Logger.getLogger(TopicExchange.class); + private static final Logger _logger = LoggerFactory.getLogger(TopicExchange.class); private final TopicParser _parser = new TopicParser(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java index 28f7fe3554..85ba7002e3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.filter; import java.util.Map; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.filter.SelectorParsingException; @@ -33,7 +34,7 @@ import org.apache.qpid.filter.selector.TokenMgrError; public class FilterManagerFactory { - private final static Logger _logger = Logger.getLogger(FilterManagerFactory.class); + private final static Logger _logger = LoggerFactory.getLogger(FilterManagerFactory.class); private FilterManagerFactory() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java index a36049cd23..5a08eb3a0f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java @@ -24,7 +24,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.filter.BooleanExpression; @@ -39,7 +40,7 @@ import org.apache.qpid.server.plugin.PluggableService; @PluggableService public class JMSSelectorFilter implements MessageFilter { - private final static Logger _logger = org.apache.log4j.Logger.getLogger(JMSSelectorFilter.class); + private final static Logger _logger = LoggerFactory.getLogger(JMSSelectorFilter.class); private String _selector; private BooleanExpression _matcher; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java index 3149386b98..478c8545a1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java @@ -20,7 +20,8 @@ */ package org.apache.qpid.server.logging; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Log4jMessageLogger extends AbstractMessageLogger { @@ -39,7 +40,7 @@ public class Log4jMessageLogger extends AbstractMessageLogger { if(isEnabled()) { - Logger logger = Logger.getLogger(logHierarchy); + Logger logger = LoggerFactory.getLogger(logHierarchy); return logger.isInfoEnabled(); } else @@ -57,7 +58,7 @@ public class Log4jMessageLogger extends AbstractMessageLogger @Override void rawMessage(String message, Throwable throwable, String logHierarchy) { - Logger logger = Logger.getLogger(logHierarchy); + Logger logger = LoggerFactory.getLogger(logHierarchy); logger.info(message, throwable); } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java index efda825aeb..290f9d4028 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -49,9 +50,9 @@ public class AccessControlMessages static { - Logger.getLogger(ACCESSCONTROL_LOG_HIERARCHY); - Logger.getLogger(DENIED_LOG_HIERARCHY); - Logger.getLogger(ALLOWED_LOG_HIERARCHY); + LoggerFactory.getLogger(ACCESSCONTROL_LOG_HIERARCHY); + LoggerFactory.getLogger(DENIED_LOG_HIERARCHY); + LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AccessControl_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java index a4c73f3b88..dc328b6d19 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -49,9 +50,9 @@ public class BindingMessages static { - Logger.getLogger(BINDING_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(DELETED_LOG_HIERARCHY); + LoggerFactory.getLogger(BINDING_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(DELETED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Binding_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java index 58f7dfe807..8d28583d1c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -63,23 +64,23 @@ public class BrokerMessages static { - Logger.getLogger(BROKER_LOG_HIERARCHY); - Logger.getLogger(LOG_CONFIG_LOG_HIERARCHY); - Logger.getLogger(CONFIG_LOG_HIERARCHY); - Logger.getLogger(STATS_DATA_LOG_HIERARCHY); - Logger.getLogger(STOPPED_LOG_HIERARCHY); - Logger.getLogger(STATS_MSGS_LOG_HIERARCHY); - Logger.getLogger(LISTENING_LOG_HIERARCHY); - Logger.getLogger(FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY); - Logger.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY); - Logger.getLogger(MAX_MEMORY_LOG_HIERARCHY); - Logger.getLogger(PLATFORM_LOG_HIERARCHY); - Logger.getLogger(PROCESS_LOG_HIERARCHY); - Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); - Logger.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY); - Logger.getLogger(STARTUP_LOG_HIERARCHY); - Logger.getLogger(FATAL_ERROR_LOG_HIERARCHY); - Logger.getLogger(READY_LOG_HIERARCHY); + LoggerFactory.getLogger(BROKER_LOG_HIERARCHY); + LoggerFactory.getLogger(LOG_CONFIG_LOG_HIERARCHY); + LoggerFactory.getLogger(CONFIG_LOG_HIERARCHY); + LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY); + LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY); + LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY); + LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY); + LoggerFactory.getLogger(MAX_MEMORY_LOG_HIERARCHY); + LoggerFactory.getLogger(PLATFORM_LOG_HIERARCHY); + LoggerFactory.getLogger(PROCESS_LOG_HIERARCHY); + LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); + LoggerFactory.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY); + LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY); + LoggerFactory.getLogger(FATAL_ERROR_LOG_HIERARCHY); + LoggerFactory.getLogger(READY_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java index c112dd4292..3ab9b1b453 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -61,21 +62,21 @@ public class ChannelMessages static { - Logger.getLogger(CHANNEL_LOG_HIERARCHY); - Logger.getLogger(FLOW_ENFORCED_LOG_HIERARCHY); - Logger.getLogger(CREATE_LOG_HIERARCHY); - Logger.getLogger(FLOW_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); - Logger.getLogger(PREFETCH_SIZE_LOG_HIERARCHY); - Logger.getLogger(CLOSE_FORCED_LOG_HIERARCHY); - Logger.getLogger(LARGE_TRANSACTION_WARN_LOG_HIERARCHY); - Logger.getLogger(DEADLETTERMSG_LOG_HIERARCHY); - Logger.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY); - Logger.getLogger(IDLE_TXN_LOG_HIERARCHY); - Logger.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY); - Logger.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY); - Logger.getLogger(OPEN_TXN_LOG_HIERARCHY); - Logger.getLogger(FLOW_REMOVED_LOG_HIERARCHY); + LoggerFactory.getLogger(CHANNEL_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_ENFORCED_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(PREFETCH_SIZE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_FORCED_LOG_HIERARCHY); + LoggerFactory.getLogger(LARGE_TRANSACTION_WARN_LOG_HIERARCHY); + LoggerFactory.getLogger(DEADLETTERMSG_LOG_HIERARCHY); + LoggerFactory.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY); + LoggerFactory.getLogger(IDLE_TXN_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY); + LoggerFactory.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_TXN_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_REMOVED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Channel_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java index f720ff6385..6b43e98b4e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -52,12 +53,12 @@ public class ConfigStoreMessages static { - Logger.getLogger(CONFIGSTORE_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(CONFIGSTORE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ConfigStore_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java index 42c41849ab..d1d2d8ec80 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -51,11 +52,11 @@ public class ConnectionMessages static { - Logger.getLogger(CONNECTION_LOG_HIERARCHY); - Logger.getLogger(OPEN_LOG_HIERARCHY); - Logger.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY); - Logger.getLogger(IDLE_CLOSE_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CONNECTION_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); + LoggerFactory.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY); + LoggerFactory.getLogger(IDLE_CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Connection_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java index 5e5abaff96..6b45ce56d0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -50,10 +51,10 @@ public class ExchangeMessages static { - Logger.getLogger(EXCHANGE_LOG_HIERARCHY); - Logger.getLogger(DISCARDMSG_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(DELETED_LOG_HIERARCHY); + LoggerFactory.getLogger(EXCHANGE_LOG_HIERARCHY); + LoggerFactory.getLogger(DISCARDMSG_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(DELETED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Exchange_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java index ee29ef6796..b45bc65ba2 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -61,21 +62,21 @@ public class HighAvailabilityMessages static { - Logger.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY); - Logger.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY); - Logger.getLogger(TRANSFER_MASTER_LOG_HIERARCHY); - Logger.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY); - Logger.getLogger(REMOVED_LOG_HIERARCHY); - Logger.getLogger(LEFT_LOG_HIERARCHY); - Logger.getLogger(JOINED_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(QUORUM_LOST_LOG_HIERARCHY); - Logger.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY); - Logger.getLogger(ADDED_LOG_HIERARCHY); - Logger.getLogger(DELETED_LOG_HIERARCHY); - Logger.getLogger(ROLE_CHANGED_LOG_HIERARCHY); - Logger.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY); - Logger.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY); + LoggerFactory.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY); + LoggerFactory.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY); + LoggerFactory.getLogger(TRANSFER_MASTER_LOG_HIERARCHY); + LoggerFactory.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY); + LoggerFactory.getLogger(REMOVED_LOG_HIERARCHY); + LoggerFactory.getLogger(LEFT_LOG_HIERARCHY); + LoggerFactory.getLogger(JOINED_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(QUORUM_LOST_LOG_HIERARCHY); + LoggerFactory.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY); + LoggerFactory.getLogger(ADDED_LOG_HIERARCHY); + LoggerFactory.getLogger(DELETED_LOG_HIERARCHY); + LoggerFactory.getLogger(ROLE_CHANGED_LOG_HIERARCHY); + LoggerFactory.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY); + LoggerFactory.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.HighAvailability_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java index 6c27b51ce0..a55671e001 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -54,14 +55,14 @@ public class ManagementConsoleMessages static { - Logger.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY); - Logger.getLogger(OPEN_LOG_HIERARCHY); - Logger.getLogger(LISTENING_LOG_HIERARCHY); - Logger.getLogger(STOPPED_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); - Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); - Logger.getLogger(STARTUP_LOG_HIERARCHY); - Logger.getLogger(READY_LOG_HIERARCHY); + LoggerFactory.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); + LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY); + LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); + LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY); + LoggerFactory.getLogger(READY_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ManagementConsole_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java index 7114c8532b..ef07401e25 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -56,16 +57,16 @@ public class MessageStoreMessages static { - Logger.getLogger(MESSAGESTORE_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); - Logger.getLogger(CLOSED_LOG_HIERARCHY); - Logger.getLogger(OVERFULL_LOG_HIERARCHY); - Logger.getLogger(RECOVERED_LOG_HIERARCHY); - Logger.getLogger(UNDERFULL_LOG_HIERARCHY); - Logger.getLogger(PASSIVATE_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(MESSAGESTORE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); + LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(PASSIVATE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.MessageStore_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java index d848008f0f..f7ecddb354 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -52,12 +53,12 @@ public class PortMessages static { - Logger.getLogger(PORT_LOG_HIERARCHY); - Logger.getLogger(OPEN_LOG_HIERARCHY); - Logger.getLogger(CREATE_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); - Logger.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY); - Logger.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY); + LoggerFactory.getLogger(PORT_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY); + LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java index b8f95dfc28..dfa17652bd 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -51,11 +52,11 @@ public class QueueMessages static { - Logger.getLogger(QUEUE_LOG_HIERARCHY); - Logger.getLogger(OVERFULL_LOG_HIERARCHY); - Logger.getLogger(UNDERFULL_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(DELETED_LOG_HIERARCHY); + LoggerFactory.getLogger(QUEUE_LOG_HIERARCHY); + LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(DELETED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Queue_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java index 43c9754afa..b6e2ab6b62 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -50,10 +51,10 @@ public class SubscriptionMessages static { - Logger.getLogger(SUBSCRIPTION_LOG_HIERARCHY); - Logger.getLogger(STATE_LOG_HIERARCHY); - Logger.getLogger(CREATE_LOG_HIERARCHY); - Logger.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(SUBSCRIPTION_LOG_HIERARCHY); + LoggerFactory.getLogger(STATE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Subscription_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java index 9e2f64ff39..9f24d120bc 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -55,15 +56,15 @@ public class TransactionLogMessages static { - Logger.getLogger(TRANSACTIONLOG_LOG_HIERARCHY); - Logger.getLogger(CLOSED_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); - Logger.getLogger(XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY); - Logger.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY); - Logger.getLogger(RECOVERED_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY); - Logger.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(TRANSACTIONLOG_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); + LoggerFactory.getLogger(XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY); + LoggerFactory.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.TransactionLog_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java index 7755b5ebc2..ddaa808abf 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -54,14 +55,14 @@ public class VirtualHostMessages static { - Logger.getLogger(VIRTUALHOST_LOG_HIERARCHY); - Logger.getLogger(CLOSED_LOG_HIERARCHY); - Logger.getLogger(STATS_DATA_LOG_HIERARCHY); - Logger.getLogger(STATS_MSGS_LOG_HIERARCHY); - Logger.getLogger(FILESYSTEM_FULL_LOG_HIERARCHY); - Logger.getLogger(FILESYSTEM_NOTFULL_LOG_HIERARCHY); - Logger.getLogger(CREATED_LOG_HIERARCHY); - Logger.getLogger(ERRORED_LOG_HIERARCHY); + LoggerFactory.getLogger(VIRTUALHOST_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY); + LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY); + LoggerFactory.getLogger(FILESYSTEM_FULL_LOG_HIERARCHY); + LoggerFactory.getLogger(FILESYSTEM_NOTFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(ERRORED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.VirtualHost_logmessages", _currentLocale); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index 529aa230d4..f9d51028f5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -58,7 +58,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.Version; @@ -67,6 +66,8 @@ import org.codehaus.jackson.map.Module; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.Task; @@ -85,7 +86,7 @@ import org.apache.qpid.util.Strings; public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> implements ConfiguredObject<X> { - private static final Logger LOGGER = Logger.getLogger(AbstractConfiguredObject.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConfiguredObject.class); private static final Map<Class, Object> SECURE_VALUES; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java index 342b7ac0ba..c4f1e47d5e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java @@ -30,11 +30,12 @@ import java.util.Collection; import java.util.Collections; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T> extends ConfiguredObjectAttribute<C,T> { - private static final Logger LOGGER = Logger.getLogger(ConfiguredAutomatedAttribute.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConfiguredAutomatedAttribute.class); private final ManagedAttribute _annotation; private final Method _validValuesMethod; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java index a93e6a602f..1d6551e44e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java @@ -41,7 +41,8 @@ import java.util.TreeMap; import java.util.TreeSet; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.plugin.ConfiguredObjectRegistration; import org.apache.qpid.server.util.Action; @@ -50,7 +51,7 @@ import org.apache.qpid.util.Strings; public class ConfiguredObjectTypeRegistry { - private static final Logger LOGGER = Logger.getLogger(ConfiguredObjectTypeRegistry.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConfiguredObjectTypeRegistry.class); private static Map<String,Integer> STANDARD_FIRST_FIELDS_ORDER = new HashMap<>(); static diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index 036c4d7716..3b3ae59a1a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -38,7 +38,8 @@ import javax.security.auth.Subject; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.QpidProperties; import org.apache.qpid.server.BrokerOptions; @@ -62,7 +63,7 @@ import org.apache.qpid.util.SystemUtils; public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer { - private static final Logger LOGGER = Logger.getLogger(BrokerAdapter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BrokerAdapter.class); private static final Pattern MODEL_VERSION_PATTERN = Pattern.compile("^\\d+\\.\\d+$"); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java index 8bcbba9ac4..ef760ade6a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java @@ -29,7 +29,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -49,7 +50,7 @@ import org.apache.qpid.server.util.Action; public final class ConnectionAdapter extends AbstractConfiguredObject<ConnectionAdapter> implements Connection<ConnectionAdapter>, SessionModelListener { - private static final Logger LOGGER = Logger.getLogger(ConnectionAdapter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionAdapter.class); private final Action _underlyingConnectionDeleteTask; private final AtomicBoolean _underlyingClosed = new AtomicBoolean(false); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java index 1a119be32d..7c34adbaa0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java @@ -34,7 +34,8 @@ import java.util.UUID; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -58,7 +59,7 @@ public class FileBasedGroupProviderImpl extends AbstractConfiguredObject<FileBasedGroupProviderImpl> implements FileBasedGroupProvider<FileBasedGroupProviderImpl> { public static final String GROUP_FILE_PROVIDER_TYPE = "GroupFile"; - private static Logger LOGGER = Logger.getLogger(FileBasedGroupProviderImpl.class); + private static Logger LOGGER = LoggerFactory.getLogger(FileBasedGroupProviderImpl.class); private final Broker<?> _broker; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java index 500df8cb87..f4420dc19c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java @@ -40,12 +40,14 @@ import java.util.TreeMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; + import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.type.TypeReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -63,7 +65,7 @@ import org.apache.qpid.server.util.FileHelper; public class FileSystemPreferencesProviderImpl extends AbstractConfiguredObject<FileSystemPreferencesProviderImpl> implements FileSystemPreferencesProvider<FileSystemPreferencesProviderImpl> { - private static final Logger LOGGER = Logger.getLogger(FileSystemPreferencesProviderImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemPreferencesProviderImpl.class); private final AuthenticationProvider<? extends AuthenticationProvider> _authenticationProvider; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index 0e6f18a70a..44c8869308 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -30,7 +30,8 @@ import java.util.Set; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -48,7 +49,7 @@ import org.apache.qpid.server.model.TrustStore; abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractConfiguredObject<X> implements Port<X> { - private static final Logger LOGGER = Logger.getLogger(AbstractPort.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPort.class); private final Broker<?> _broker; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java index e6100efda7..c59e2285e3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java @@ -26,7 +26,8 @@ import java.util.List; import java.util.Map; import java.util.ServiceLoader; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.util.ServerScopedRuntimeException; @@ -35,7 +36,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; */ public class QpidServiceLoader { - private static final Logger _logger = Logger.getLogger(QpidServiceLoader.class); + private static final Logger _logger = LoggerFactory.getLogger(QpidServiceLoader.class); public <C extends Pluggable> Iterable<C> instancesOf(Class<C> clazz) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java index 2ccf595c26..bf7835db1c 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java @@ -30,7 +30,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.logging.messages.ConnectionMessages; import org.apache.qpid.server.model.Broker; @@ -44,7 +45,7 @@ import org.apache.qpid.transport.network.NetworkConnection; public class MultiVersionProtocolEngine implements ServerProtocolEngine { - private static final Logger _logger = Logger.getLogger(MultiVersionProtocolEngine.class); + private static final Logger _logger = LoggerFactory.getLogger(MultiVersionProtocolEngine.class); private final long _id; private final AmqpPort<?> _port; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java index 2a51657f60..33b4d59878 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java @@ -45,7 +45,8 @@ import javax.security.auth.Subject; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.pool.ReferenceCountingExecutorService; import org.apache.qpid.server.binding.BindingImpl; @@ -110,7 +111,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>> MessageGroupManager.ConsumerResetHelper { - private static final Logger _logger = Logger.getLogger(AbstractQueue.class); + private static final Logger _logger = LoggerFactory.getLogger(AbstractQueue.class); public static final String SHARED_MSG_GROUP_ARG_VALUE = "1"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java index ac04912a72..68e60e0c0c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java @@ -20,7 +20,9 @@ */ package org.apache.qpid.server.queue; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.QueueNotificationListener; @@ -123,7 +125,7 @@ public enum NotificationCheck } ; - private static final Logger LOGGER = Logger.getLogger(NotificationCheck.class); + private static final Logger LOGGER = LoggerFactory.getLogger(NotificationCheck.class); private final boolean _messageSpecific; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java index b409b638b3..d08319b5f9 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java @@ -32,8 +32,6 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.apache.log4j.Logger; - import org.apache.qpid.server.consumer.ConsumerTarget; import org.apache.qpid.server.filter.FilterManager; import org.apache.qpid.server.filter.JMSSelectorFilter; @@ -59,8 +57,6 @@ class QueueConsumerImpl implements QueueConsumer<QueueConsumerImpl>, LogSubject { - - private static final Logger _logger = Logger.getLogger(QueueConsumerImpl.class); private final AtomicBoolean _targetClosed = new AtomicBoolean(false); private final AtomicBoolean _closed = new AtomicBoolean(false); private final long _consumerNumber; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java index 917c951b6d..c798a1ff88 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java @@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.filter.Filterable; @@ -44,7 +45,7 @@ import org.apache.qpid.server.util.StateChangeListener; public abstract class QueueEntryImpl implements QueueEntry { - private static final Logger _log = Logger.getLogger(QueueEntryImpl.class); + private static final Logger _log = LoggerFactory.getLogger(QueueEntryImpl.class); private final QueueEntryList _queueEntryList; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java index e784126d24..0776439cbf 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java @@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicLong; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; @@ -41,7 +42,7 @@ import org.apache.qpid.transport.TransportException; */ public class QueueRunner implements Runnable { - private static final Logger _logger = Logger.getLogger(QueueRunner.class); + private static final Logger _logger = LoggerFactory.getLogger(QueueRunner.class); private final AbstractQueue _queue; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java index ea6a0394f0..acec47a76a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java @@ -58,7 +58,8 @@ import javax.xml.bind.DatatypeConverter; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -76,7 +77,7 @@ import org.apache.qpid.server.util.urlstreamhandler.data.Handler; @ManagedObject( category = false ) public class NonJavaKeyStoreImpl extends AbstractConfiguredObject<NonJavaKeyStoreImpl> implements NonJavaKeyStore<NonJavaKeyStoreImpl> { - private static final Logger LOGGER = Logger.getLogger(NonJavaKeyStoreImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaKeyStoreImpl.class); private final Broker<?> _broker; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java index c18189785d..a47fe28e3c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java @@ -46,7 +46,8 @@ import javax.security.auth.x500.X500Principal; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -68,7 +69,7 @@ import org.apache.qpid.server.util.urlstreamhandler.data.Handler; public class NonJavaTrustStoreImpl extends AbstractConfiguredObject<NonJavaTrustStoreImpl> implements NonJavaTrustStore<NonJavaTrustStoreImpl> { - private static final Logger LOGGER = Logger.getLogger(NonJavaTrustStoreImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaTrustStoreImpl.class); private final Broker<?> _broker; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java index 2c692ddf4d..623be11c21 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java @@ -20,13 +20,6 @@ */ package org.apache.qpid.server.security.auth.database; -import org.apache.log4j.Logger; -import org.apache.qpid.server.security.auth.UsernamePrincipal; -import org.apache.qpid.server.util.BaseAction; -import org.apache.qpid.server.util.FileHelper; - -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.login.AccountNotFoundException; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -41,6 +34,15 @@ import java.util.Map; import java.util.concurrent.locks.ReentrantLock; import java.util.regex.Pattern; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.login.AccountNotFoundException; + +import org.slf4j.Logger; + +import org.apache.qpid.server.security.auth.UsernamePrincipal; +import org.apache.qpid.server.util.BaseAction; +import org.apache.qpid.server.util.FileHelper; + public abstract class AbstractPasswordFilePrincipalDatabase<U extends PasswordPrincipal> implements PrincipalDatabase { protected static final String DEFAULT_ENCODING = "utf-8"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java index 2acf8af987..0873cca31d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java @@ -32,7 +32,8 @@ import javax.security.auth.login.AccountNotFoundException; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedInitialiser; import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedSaslServer; @@ -50,7 +51,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer; */ public class Base64MD5PasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<HashedUser> { - private final Logger _logger = Logger.getLogger(Base64MD5PasswordFilePrincipalDatabase.class); + private final Logger _logger = LoggerFactory.getLogger(Base64MD5PasswordFilePrincipalDatabase.class); private List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(CRAMMD5HashedSaslServer.MECHANISM, CRAMMD5HexSaslServer.MECHANISM, PlainSaslServer.MECHANISM)); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java index 2b2ecd1d92..4a50d893d4 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java @@ -20,19 +20,17 @@ */ package org.apache.qpid.server.security.auth.database; -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; -import org.apache.qpid.server.util.ServerScopedRuntimeException; - import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import org.apache.commons.codec.binary.Base64; + +import org.apache.qpid.server.util.ServerScopedRuntimeException; + public class HashedUser implements PasswordPrincipal { - private static final Logger _logger = Logger.getLogger(HashedUser.class); - private String _name; private char[] _password; private byte[] _encodedPassword = null; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java index 0a55f5d510..8326dce4e4 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java @@ -33,7 +33,8 @@ import javax.security.sasl.Sasl; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5Initialiser; import org.apache.qpid.server.security.auth.sasl.plain.PlainInitialiser; @@ -49,7 +50,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer; public class PlainPasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<PlainUser> { - private final Logger _logger = Logger.getLogger(PlainPasswordFilePrincipalDatabase.class); + private final Logger _logger = LoggerFactory.getLogger(PlainPasswordFilePrincipalDatabase.class); private final Map<String, CallbackHandler> _callbackHandlerMap = new HashMap<String, CallbackHandler>(); private final List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(PlainSaslServer.MECHANISM, CRAMMD5Initialiser.MECHANISM)); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java index 255457a846..8f53eec4f2 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java @@ -30,7 +30,8 @@ import java.util.Set; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -52,7 +53,7 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica extends AbstractConfiguredObject<T> implements AuthenticationProvider<T> { - private static final Logger LOGGER = Logger.getLogger(AbstractAuthenticationManager.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthenticationManager.class); private final Broker<?> _broker; private PreferencesProvider<?> _preferencesProvider; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java index 0fcab33f5d..19efee888f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java @@ -43,7 +43,8 @@ import javax.security.sasl.SaslServer; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -69,7 +70,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal implements ExternalFileBasedAuthenticationManager<T>, PreferencesSupportingAuthenticationProvider { - private static final Logger LOGGER = Logger.getLogger(PrincipalDatabaseAuthenticationManager.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PrincipalDatabaseAuthenticationManager.class); private final Map<Principal, PrincipalAdapter> _userMap = new ConcurrentHashMap<Principal, PrincipalAdapter>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java index f51bcee521..e20349d4e3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java @@ -37,7 +37,8 @@ import javax.security.sasl.Sasl; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedObject; @@ -50,7 +51,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer; @ManagedObject( category = false, type = "Simple", register = false ) public class SimpleAuthenticationManager extends AbstractAuthenticationManager<SimpleAuthenticationManager> implements PreferencesSupportingAuthenticationProvider { - private static final Logger _logger = Logger.getLogger(SimpleAuthenticationManager.class); + private static final Logger _logger = LoggerFactory.getLogger(SimpleAuthenticationManager.class); private static final String PLAIN_MECHANISM = "PLAIN"; private static final String CRAM_MD5_MECHANISM = "CRAM-MD5"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java index 2a6b5bda2c..1e9948eee5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java @@ -20,8 +20,8 @@ package org.apache.qpid.server.security.auth.manager; import static java.util.Collections.disjoint; -import static java.util.Collections.unmodifiableList; import static java.util.Collections.singletonList; +import static java.util.Collections.unmodifiableList; import java.io.IOException; import java.security.GeneralSecurityException; @@ -49,15 +49,14 @@ import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; -import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; -import org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider; import org.apache.qpid.server.model.TrustStore; import org.apache.qpid.server.security.auth.AuthenticationResult; import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus; @@ -72,7 +71,7 @@ import org.apache.qpid.ssl.SSLContextFactory; public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationManager<SimpleLDAPAuthenticationManagerImpl> implements SimpleLDAPAuthenticationManager<SimpleLDAPAuthenticationManagerImpl> { - private static final Logger _logger = Logger.getLogger(SimpleLDAPAuthenticationManagerImpl.class); + private static final Logger _logger = LoggerFactory.getLogger(SimpleLDAPAuthenticationManagerImpl.class); private static final List<String> CONNECTIVITY_ATTRS = unmodifiableList(Arrays.asList(PROVIDER_URL, PROVIDER_AUTH_URL, diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java index f36ef1516c..1ac66e9197 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java @@ -20,10 +20,8 @@ */ package org.apache.qpid.server.security.auth.sasl; -import org.apache.log4j.Logger; - -import org.apache.qpid.server.security.auth.UsernamePrincipal; -import org.apache.qpid.server.security.auth.database.PrincipalDatabase; +import java.io.IOException; +import java.security.Principal; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -32,12 +30,16 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.AccountNotFoundException; import javax.security.sasl.AuthorizeCallback; -import java.io.IOException; -import java.security.Principal; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.security.auth.UsernamePrincipal; +import org.apache.qpid.server.security.auth.database.PrincipalDatabase; public abstract class UsernamePasswordInitialiser implements AuthenticationProviderInitialiser { - protected static final Logger _logger = Logger.getLogger(UsernamePasswordInitialiser.class); + protected static final Logger _logger = LoggerFactory.getLogger(UsernamePasswordInitialiser.class); private ServerCallbackHandler _callbackHandler; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java index 5f5ee08c21..c3a35ef228 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java @@ -24,13 +24,15 @@ import javax.security.auth.x500.X500Principal; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.transport.network.security.ssl.SSLUtil; public class ExternalSaslServer implements SaslServer { - private static final Logger LOGGER = Logger.getLogger(ExternalSaslServer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ExternalSaslServer.class); public static final String MECHANISM = "EXTERNAL"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java index 1e9e646e35..c7c3e5a0ab 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java @@ -33,7 +33,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.util.BaseAction; import org.apache.qpid.server.util.FileHelper; import org.apache.qpid.server.util.ServerScopedRuntimeException; @@ -46,7 +48,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; */ public class FileGroupDatabase implements GroupDatabase { - private static final Logger LOGGER = Logger.getLogger(FileGroupDatabase.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileGroupDatabase.class); private Map<String, Set<String>> _groupToUserMap = new ConcurrentHashMap<String, Set<String>>(); private Map<String, Set<String>> _userToGroupMap = new ConcurrentHashMap<String, Set<String>>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java index 4fbfdfdd2d..64029497ee 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParseException; @@ -51,6 +50,7 @@ import org.codehaus.jackson.map.Module; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; +import org.slf4j.Logger; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.UUIDGenerator; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java index 5868ae61c5..93a7b466a3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java @@ -37,7 +37,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import org.apache.log4j.Logger; +import org.slf4j.Logger; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.ConfiguredObject; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java index 196ea05a43..bb89d58dcb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java @@ -24,12 +24,13 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EventManager { private Map<Event, List<EventListener>> _listeners = new EnumMap<Event, List<EventListener>> (Event.class); - private static final Logger _LOGGER = Logger.getLogger(EventManager.class); + private static final Logger _LOGGER = LoggerFactory.getLogger(EventManager.class); public synchronized void addEventListener(EventListener listener, Event... events) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java index 9edc5fd30a..10e97d43c3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java @@ -30,7 +30,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.updater.VoidTask; import org.apache.qpid.server.model.ConfiguredObject; @@ -39,7 +40,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; public class GenericRecoverer { - private static final Logger LOGGER = Logger.getLogger(GenericRecoverer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(GenericRecoverer.class); private final ConfiguredObject<?> _root; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java index 26b60f765f..850466bbae 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java @@ -26,14 +26,16 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; public class GenericStoreUpgrader { - private static final Logger LOGGER = Logger.getLogger(GenericStoreUpgrader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(GenericStoreUpgrader.class); private final Map<UUID, ConfiguredObjectRecord> _records = new HashMap<UUID, ConfiguredObjectRecord>(); private final Map<String, StoreUpgraderPhase> _upgraders; @@ -167,4 +169,4 @@ public class GenericStoreUpgrader } return BrokerModel.MODEL_VERSION; } -}
\ No newline at end of file +} diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java index a26e478a50..62675867f0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java @@ -25,8 +25,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; - -import org.apache.log4j.Logger; +import org.slf4j.Logger; public class JdbcUtils { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java index ad671d7e99..23e1456aea 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java @@ -41,10 +41,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.log4j.Logger; -import org.apache.qpid.server.configuration.BrokerProperties; -import org.apache.qpid.server.util.BaseAction; -import org.apache.qpid.server.util.FileHelper; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.Version; @@ -54,15 +50,20 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.module.SimpleModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Model; import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; +import org.apache.qpid.server.util.BaseAction; +import org.apache.qpid.server.util.FileHelper; import org.apache.qpid.util.FileUtils; public class JsonFileConfigStore implements DurableConfigurationStore { - private static final Logger _logger = Logger.getLogger(JsonFileConfigStore.class); + private static final Logger _logger = LoggerFactory.getLogger(JsonFileConfigStore.class); private static final Comparator<Class<? extends ConfiguredObject>> CATEGORY_CLASS_COMPARATOR = new Comparator<Class<? extends ConfiguredObject>>() diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java index 809c234cc6..97e544d566 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java @@ -23,7 +23,8 @@ package org.apache.qpid.server.txn; import java.util.Collection; import java.util.List; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.MessageInstance; @@ -45,7 +46,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction { static final String QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE = "qpid.strict_order_with_mixed_delivery_mode"; - protected static final Logger _logger = Logger.getLogger(AsyncAutoCommitTransaction.class); + protected static final Logger _logger = LoggerFactory.getLogger(AsyncAutoCommitTransaction.class); private final MessageStore _messageStore; private final FutureRecorder _futureRecorder; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java index 2ecd847719..81db5b0358 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java @@ -23,7 +23,8 @@ package org.apache.qpid.server.txn; import java.util.Collection; import java.util.List; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.MessageInstance; @@ -42,7 +43,7 @@ import org.apache.qpid.server.store.TransactionLogResource; */ public class AutoCommitTransaction implements ServerTransaction { - protected static final Logger _logger = Logger.getLogger(AutoCommitTransaction.class); + protected static final Logger _logger = LoggerFactory.getLogger(AutoCommitTransaction.class); private final MessageStore _messageStore; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java index 4195c72a28..15b66a90a5 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java @@ -27,11 +27,13 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; -import org.apache.log4j.Logger; -import org.apache.qpid.server.store.StoreException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.store.MessageStore; +import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.store.Transaction; import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.virtualhost.VirtualHostImpl; @@ -39,7 +41,7 @@ import org.apache.qpid.transport.Xid; public class DtxBranch { - private static final Logger _logger = Logger.getLogger(DtxBranch.class); + private static final Logger _logger = LoggerFactory.getLogger(DtxBranch.class); private final Xid _xid; private final List<ServerTransaction.Action> _postTransactionActions = new ArrayList<ServerTransaction.Action>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java index a7b527f169..4e074b2722 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java @@ -20,11 +20,13 @@ */ package org.apache.qpid.server.util; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ConnectionScopedRuntimeException extends RuntimeException { - private static final Logger LOGGER = Logger.getLogger(ConnectionScopedRuntimeException.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionScopedRuntimeException.class); public ConnectionScopedRuntimeException(final String message) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java index 93ba639af0..5b6d99e285 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java @@ -20,11 +20,12 @@ */ package org.apache.qpid.server.util; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ServerScopedRuntimeException extends RuntimeException { - private static final Logger LOGGER = Logger.getLogger(ServerScopedRuntimeException.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ServerScopedRuntimeException.class); public ServerScopedRuntimeException(final String message) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index 220beb20f8..76fbb4f48e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -46,7 +46,8 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.pool.SuppressingInheritedAccessControlContextThreadFactory; @@ -110,7 +111,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte public static final String CREATE_DLQ_ON_CREATION = "x-qpid-dlq-enabled"; // TODO - this value should change private static final int MAX_LENGTH = 255; - private static final Logger _logger = Logger.getLogger(AbstractVirtualHost.class); + private static final Logger _logger = LoggerFactory.getLogger(AbstractVirtualHost.class); private static final int HOUSEKEEPING_SHUTDOWN_TIMEOUT = 5; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java index 628b0ea08c..a24ddec7df 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java @@ -32,7 +32,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.messages.TransactionLogMessages; @@ -58,7 +59,7 @@ import org.apache.qpid.transport.util.Functions; public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer { - private static final Logger _logger = Logger.getLogger(AsynchronousMessageStoreRecoverer.class); + private static final Logger _logger = LoggerFactory.getLogger(AsynchronousMessageStoreRecoverer.class); private AsynchronousRecoverer _asynchronousRecoverer; @Override diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java index 22e33848bf..99896b87b6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java @@ -20,17 +20,19 @@ */ package org.apache.qpid.server.virtualhost; -import org.apache.log4j.Logger; +import java.security.PrivilegedAction; + +import javax.security.auth.Subject; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.security.SecurityManager; -import javax.security.auth.Subject; -import java.security.PrivilegedAction; - public abstract class HouseKeepingTask implements Runnable { - private Logger _logger = Logger.getLogger(this.getClass()); + private Logger _logger = LoggerFactory.getLogger(this.getClass()); private String _name; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java index 1cdafde945..8bdffeb3c6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java @@ -26,7 +26,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.messages.MessageStoreMessages; @@ -56,7 +57,7 @@ import org.apache.qpid.transport.util.Functions; public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer { - private static final Logger _logger = Logger.getLogger(SynchronousMessageStoreRecoverer.class); + private static final Logger _logger = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class); @Override public void recover(VirtualHostImpl virtualHost) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java index e9390703c7..0a1c2abd75 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java @@ -35,7 +35,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.HostNameAlias; @@ -49,7 +50,7 @@ public class HostNameAliasImpl implements HostNameAlias<HostNameAliasImpl> { - private static final Logger LOG = Logger.getLogger(HostNameAliasImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(HostNameAliasImpl.class); private final Set<InetAddress> _localAddresses = new CopyOnWriteArraySet<>(); private final Set<String> _localAddressNames = new CopyOnWriteArraySet<>(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java index fd73963b68..7bd1b14e42 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java @@ -31,7 +31,8 @@ import javax.security.auth.Subject; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; @@ -49,7 +50,7 @@ import org.apache.qpid.server.store.VirtualHostStoreUpgraderAndRecoverer; public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandardVirtualHostNode<X>> extends AbstractVirtualHostNode<X> implements VirtualHostNode<X> { - private static final Logger LOGGER = Logger.getLogger(AbstractStandardVirtualHostNode.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStandardVirtualHostNode.class); public AbstractStandardVirtualHostNode(Map<String, Object> attributes, Broker<?> parent) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java index 8e08554358..ebf09b46c3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java @@ -41,7 +41,8 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -75,7 +76,7 @@ import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl; public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<X>> extends AbstractConfiguredObject<X> implements VirtualHostNode<X> { - private static final Logger LOGGER = Logger.getLogger(AbstractVirtualHostNode.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractVirtualHostNode.class); static diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java index 7667267df3..749b58323b 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java @@ -38,10 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.log4j.Logger; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.binding.BindingImpl; @@ -66,7 +67,7 @@ import org.apache.qpid.test.utils.QpidTestCase; abstract class AbstractQueueTestBase extends QpidTestCase { - private static final Logger _logger = Logger.getLogger(AbstractQueueTestBase.class); + private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class); private AMQQueue<?> _queue; diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java index be4505bc80..f4b25665ba 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.ConfiguredObject; @@ -36,7 +37,7 @@ import org.apache.qpid.util.FileUtils; public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase implements EventListener, TransactionLogResource { - private static final Logger _logger = Logger.getLogger(MessageStoreQuotaEventsTestBase.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageStoreQuotaEventsTestBase.class); protected static final byte[] MESSAGE_DATA = new byte[32 * 1024]; diff --git a/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm index 6a97f7facd..64cf002750 100644 --- a/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm +++ b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm @@ -22,7 +22,8 @@ package ${package}; import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.LogMessage; @@ -50,9 +51,9 @@ public class ${type.name}Messages static { - Logger.getLogger(${type.name.toUpperCase()}_LOG_HIERARCHY); + LoggerFactory.getLogger(${type.name.toUpperCase()}_LOG_HIERARCHY); #foreach( $message in ${type.list} ) - Logger.getLogger(${message.methodName.toUpperCase()}_LOG_HIERARCHY); + LoggerFactory.getLogger(${message.methodName.toUpperCase()}_LOG_HIERARCHY); #end _messages = ResourceBundle.getBundle("${resource}", _currentLocale); diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java index 45af85be6c..ebe6df126f 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java @@ -20,7 +20,9 @@ package org.apache.qpid.server.security.access.config; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.security.access.ObjectProperties; import org.apache.qpid.server.security.access.ObjectProperties.Property; import org.apache.qpid.server.security.access.firewall.FirewallRule; @@ -32,7 +34,7 @@ import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory; */ public class AclRulePredicates { - private static final Logger _logger = Logger.getLogger(AclRulePredicates.class); + private static final Logger _logger = LoggerFactory.getLogger(AclRulePredicates.class); private static final String SEPARATOR = ","; diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java index 5ed28b679a..92b870f740 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java @@ -32,7 +32,8 @@ import java.util.Map; import java.util.Stack; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.logging.EventLoggerProvider; @@ -42,7 +43,7 @@ import org.apache.qpid.server.security.access.Permission; public class PlainConfiguration implements ConfigurationFile { - private static final Logger _logger = Logger.getLogger(PlainConfiguration.class); + private static final Logger _logger = LoggerFactory.getLogger(PlainConfiguration.class); public static final Character COMMENT = '#'; public static final Character CONTINUATION = '\\'; diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java index fd122ef8d2..7661951d8b 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java @@ -37,7 +37,9 @@ import javax.security.auth.Subject; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.EventLoggerProvider; import org.apache.qpid.server.logging.messages.AccessControlMessages; @@ -52,7 +54,7 @@ import org.apache.qpid.server.security.access.Permission; */ public class RuleSet implements EventLoggerProvider { - private static final Logger _logger = Logger.getLogger(RuleSet.class); + private static final Logger _logger = LoggerFactory.getLogger(RuleSet.class); private static final String AT = "@"; private static final String SLASH = "/"; diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java index fb13426fbb..9d62c44658 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java @@ -30,11 +30,12 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HostnameFirewallRule implements FirewallRule { - private static final Logger _logger = Logger.getLogger(HostnameFirewallRule.class); + private static final Logger _logger = LoggerFactory.getLogger(HostnameFirewallRule.class); private static final long DNS_TIMEOUT = 30000; private static final ExecutorService DNS_LOOKUP = Executors.newCachedThreadPool(); diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java index ad619a0e0b..4d635a600e 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java @@ -26,11 +26,12 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NetworkFirewallRule implements FirewallRule { - private static final Logger _logger = Logger.getLogger(NetworkFirewallRule.class); + private static final Logger _logger = LoggerFactory.getLogger(NetworkFirewallRule.class); private List<InetNetwork> _networks; diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 99db75ac91..7023a9a03b 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -28,7 +28,8 @@ import java.util.Set; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -45,7 +46,7 @@ public class ACLFileAccessControlProviderImpl extends AbstractConfiguredObject<ACLFileAccessControlProviderImpl> implements ACLFileAccessControlProvider<ACLFileAccessControlProviderImpl> { - private static final Logger LOGGER = Logger.getLogger(ACLFileAccessControlProviderImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ACLFileAccessControlProviderImpl.class); static { diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java index 2998252b51..8533166023 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java @@ -35,7 +35,8 @@ import java.util.Set; import javax.security.auth.Subject; import org.apache.commons.lang.ObjectUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.connection.ConnectionPrincipal; @@ -51,7 +52,7 @@ import org.apache.qpid.server.security.access.config.RuleSet; public class DefaultAccessControl implements AccessControl { - private static final Logger _logger = Logger.getLogger(DefaultAccessControl.class); + private static final Logger _logger = LoggerFactory.getLogger(DefaultAccessControl.class); private final String _fileName; private RuleSet _ruleSet; diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java index 66f8c97063..2118a00477 100755 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java @@ -20,7 +20,8 @@ */ package org.apache.qpid.server.protocol.v0_10; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.message.MessageInstance; @@ -28,7 +29,7 @@ import org.apache.qpid.server.message.MessageInstance; class ExplicitAcceptDispositionChangeListener implements ServerSession.MessageDispositionChangeListener { - private static final Logger _logger = Logger.getLogger(ExplicitAcceptDispositionChangeListener.class); + private static final Logger _logger = LoggerFactory.getLogger(ExplicitAcceptDispositionChangeListener.class); private final MessageInstance _entry; diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java index 5467a57fa1..c918016fb1 100755 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java @@ -20,14 +20,15 @@ */ package org.apache.qpid.server.protocol.v0_10; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.message.MessageInstance; class ImplicitAcceptDispositionChangeListener implements ServerSession.MessageDispositionChangeListener { - private static final Logger _logger = Logger.getLogger(ImplicitAcceptDispositionChangeListener.class); + private static final Logger _logger = LoggerFactory.getLogger(ImplicitAcceptDispositionChangeListener.class); private final MessageInstance _entry; diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java index e391bd6771..5d90cfab19 100755 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java @@ -29,7 +29,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.protocol.ServerProtocolEngine; import org.apache.qpid.server.consumer.ConsumerImpl; @@ -48,7 +49,7 @@ import org.apache.qpid.transport.network.NetworkConnection; public class ProtocolEngine_0_10 extends InputHandler implements ServerProtocolEngine { public static final int MAX_FRAME_SIZE = 64 * 1024 - 1; - private static final Logger _logger = Logger.getLogger(ProtocolEngine_0_10.class); + private static final Logger _logger = LoggerFactory.getLogger(ProtocolEngine_0_10.class); private NetworkConnection _network; diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index dd634c36ff..25ea2430ce 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -31,7 +31,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.exchange.ExchangeDefaults; @@ -83,7 +84,7 @@ import org.apache.qpid.transport.*; public class ServerSessionDelegate extends SessionDelegate { - private static final Logger LOGGER = Logger.getLogger(ServerSessionDelegate.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ServerSessionDelegate.class); public ServerSessionDelegate() { diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java index a7b08e3f83..6c400b8e24 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java @@ -20,14 +20,16 @@ */ package org.apache.qpid.server.protocol.v0_10; -import org.apache.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.protocol.ServerProtocolEngine; import org.apache.qpid.server.flow.AbstractFlowCreditManager; public class WindowCreditManager extends AbstractFlowCreditManager implements FlowCreditManager_0_10 { - private static final Logger LOGGER = Logger.getLogger(WindowCreditManager.class); + private static final Logger LOGGER = LoggerFactory.getLogger(WindowCreditManager.class); private final ServerProtocolEngine _serverProtocolEngine; private volatile long _bytesCreditLimit; diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 2a1fbe6881..99c9f11b33 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -43,7 +43,8 @@ import java.util.concurrent.atomic.AtomicLong; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQException; @@ -120,7 +121,7 @@ public class AMQChannel { public static final int DEFAULT_PREFETCH = 4096; - private static final Logger _logger = Logger.getLogger(AMQChannel.class); + private static final Logger _logger = LoggerFactory.getLogger(AMQChannel.class); private final DefaultQueueAssociationClearingTask _defaultQueueAssociationClearingTask = new DefaultQueueAssociationClearingTask(); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java index 716a84eeb0..faa3831d70 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.protocol.v0_8; -import org.apache.log4j.Logger; - import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.MessagePublishInfo; @@ -34,9 +32,6 @@ import org.apache.qpid.server.store.StoredMessage; */ public class AMQMessage extends AbstractServerMessageImpl<AMQMessage, MessageMetaData> { - /** Used for debugging purposes. */ - private static final Logger _log = Logger.getLogger(AMQMessage.class); - private final long _size; public AMQMessage(StoredMessage<MessageMetaData> handle) diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index d7b5b00b26..3cd5e7bba2 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -49,7 +49,8 @@ import javax.security.auth.Subject; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQException; @@ -111,7 +112,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, OPEN } - private static final Logger _logger = Logger.getLogger(AMQProtocolEngine.class); + private static final Logger _logger = LoggerFactory.getLogger(AMQProtocolEngine.class); // to save boxing the channelId and looking up in a map... cache in an array the low numbered // channels. This value must be of the form 2^x - 1. diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java index 6497a04946..81e0b1b736 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java @@ -26,7 +26,8 @@ import java.security.PrivilegedExceptionAction; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.codec.MarkableDataInput; import org.apache.qpid.codec.ServerDecoder; @@ -35,7 +36,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; public class BrokerDecoder extends ServerDecoder { - private static final Logger _logger = Logger.getLogger(BrokerDecoder.class); + private static final Logger _logger = LoggerFactory.getLogger(BrokerDecoder.class); private final AMQProtocolEngine _connection; /** * Creates a new AMQP decoder. diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java index a2113de8ea..3e5da53d80 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java @@ -25,8 +25,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.apache.log4j.Logger; - import org.apache.qpid.AMQException; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.framing.AMQShortString; @@ -305,9 +303,6 @@ public abstract class ConsumerTarget_0_8 extends AbstractConsumerTarget implemen } - - private static final Logger _logger = Logger.getLogger(ConsumerTarget_0_8.class); - private final AMQChannel _channel; private final AMQShortString _consumerTag; diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java index d61eb1b223..45ab62ee05 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java @@ -22,14 +22,15 @@ package org.apache.qpid.server.protocol.v0_8; import java.util.Map; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.message.MessageInstance; public class ExtractResendAndRequeue implements UnacknowledgedMessageMap.Visitor { - private static final Logger _log = Logger.getLogger(ExtractResendAndRequeue.class); + private static final Logger _log = LoggerFactory.getLogger(ExtractResendAndRequeue.class); private final Map<Long, MessageInstance> _msgToRequeue; private final Map<Long, MessageInstance> _msgToResend; diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java index 3a759cd772..67c51c78ed 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java @@ -35,7 +35,8 @@ import java.util.concurrent.atomic.AtomicLong; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; @@ -55,7 +56,7 @@ import org.apache.qpid.transport.network.NetworkConnection; public class InternalTestProtocolSession extends AMQProtocolEngine implements ProtocolOutputConverter { - private static final Logger _logger = Logger.getLogger(InternalTestProtocolSession.class); + private static final Logger _logger = LoggerFactory.getLogger(InternalTestProtocolSession.class); // ChannelID(LIST) -> LinkedList<Pair> private final Map<Integer, Map<String, LinkedList<DeliveryPair>>> _channelDelivers; private AtomicInteger _deliveryCount = new AtomicInteger(0); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java index 6800b14d65..d31909f642 100755 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java @@ -21,9 +21,18 @@ package org.apache.qpid.server.protocol.v1_0; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.apache.log4j.Logger; import org.apache.qpid.amqp_1_0.codec.ValueHandler; import org.apache.qpid.amqp_1_0.messaging.SectionDecoder; import org.apache.qpid.amqp_1_0.messaging.SectionEncoder; @@ -47,7 +56,7 @@ import org.apache.qpid.server.util.ConnectionScopedRuntimeException; public class MessageMetaData_1_0 implements StorableMessageMetaData { - private static final Logger _logger = Logger.getLogger(MessageMetaData_1_0.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageMetaData_1_0.class); // TODO move to somewhere more useful public static final Symbol JMS_TYPE = Symbol.valueOf("x-opt-jms-type"); public static final MessageMetaDataType.Factory<MessageMetaData_1_0> FACTORY = new MetaDataFactory(); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageSourceDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageSourceDestination.java index 6f37d2d831..16c2de9271 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageSourceDestination.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageSourceDestination.java @@ -20,15 +20,12 @@ */ package org.apache.qpid.server.protocol.v1_0; -import org.apache.log4j.Logger; import org.apache.qpid.amqp_1_0.type.Outcome; import org.apache.qpid.amqp_1_0.type.messaging.Accepted; import org.apache.qpid.server.message.MessageSource; -import org.apache.qpid.server.txn.ServerTransaction; public class MessageSourceDestination implements SendingDestination { - private static final Logger _logger = Logger.getLogger(MessageSourceDestination.class); private static final Accepted ACCEPTED = new Accepted(); private static final Outcome[] OUTCOMES = new Outcome[] { ACCEPTED }; diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java index a0f10eee65..28e15f04d3 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java @@ -36,7 +36,8 @@ import javax.security.auth.Subject; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.amqp_1_0.codec.FrameWriter; import org.apache.qpid.amqp_1_0.codec.ProtocolHandler; @@ -71,8 +72,7 @@ import org.apache.qpid.transport.network.NetworkConnection; public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOutputHandler { - private static final org.apache.log4j.Logger - _logger = org.apache.log4j.Logger.getLogger(ProtocolEngine_1_0_0_SASL.class); + private static final Logger _logger = LoggerFactory.getLogger(ProtocolEngine_1_0_0_SASL.class); private final AmqpPort<?> _port; private final Transport _transport; @@ -316,7 +316,7 @@ public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOut return false; } - private final Logger RAW_LOGGER = Logger.getLogger("RAW"); + private final Logger RAW_LOGGER = LoggerFactory.getLogger("RAW"); public synchronized void received(final ByteBuffer msg) @@ -513,7 +513,7 @@ public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOut send(amqFrame, null); } - private static final Logger FRAME_LOGGER = Logger.getLogger("FRM"); + private static final Logger FRAME_LOGGER = LoggerFactory.getLogger("FRM"); public void send(final AMQFrame amqFrame, ByteBuffer buf) diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java index 4d26890e72..d0843c349d 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.protocol.v1_0; -import org.apache.log4j.Logger; - import org.apache.qpid.amqp_1_0.type.Outcome; import org.apache.qpid.amqp_1_0.type.messaging.Accepted; import org.apache.qpid.server.message.MessageReference; @@ -30,7 +28,6 @@ import org.apache.qpid.server.txn.ServerTransaction; public class QueueDestination extends MessageSourceDestination implements SendingDestination, ReceivingDestination { - private static final Logger _logger = Logger.getLogger(QueueDestination.class); private static final Accepted ACCEPTED = new Accepted(); private static final Outcome[] OUTCOMES = new Outcome[] { ACCEPTED }; diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java index fe36ba91cb..0353b9375d 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java @@ -32,7 +32,8 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.amqp_1_0.transport.DeliveryStateHandler; import org.apache.qpid.amqp_1_0.transport.LinkEndpoint; @@ -81,7 +82,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryStateHandler { - private static final Logger _logger = Logger.getLogger(SendingLink_1_0.class); + private static final Logger _logger = LoggerFactory.getLogger(SendingLink_1_0.class); private VirtualHostImpl _vhost; private SendingDestination _destination; diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java index 2a49e812f5..b65fe06980 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java @@ -39,7 +39,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.amqp_1_0.transport.LinkEndpoint; import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint; @@ -92,7 +93,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class Session_1_0 implements SessionEventListener, AMQSessionModel<Session_1_0, Connection_1_0>, LogSubject { - private static final Logger _logger = Logger.getLogger(Session_1_0.class); + private static final Logger _logger = LoggerFactory.getLogger(Session_1_0.class); private static final Symbol LIFETIME_POLICY = Symbol.valueOf("lifetime-policy"); private final SessionEndpoint _endpoint; private AutoCommitTransaction _transaction; diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java index b5c82c7aa0..2d60291c2f 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java @@ -20,29 +20,40 @@ */ package org.apache.qpid.server.protocol.v1_0; -import org.apache.log4j.Logger; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.amqp_1_0.messaging.SectionDecoder; import org.apache.qpid.amqp_1_0.messaging.SectionDecoderImpl; import org.apache.qpid.amqp_1_0.transport.LinkEndpoint; import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint; import org.apache.qpid.amqp_1_0.transport.ReceivingLinkListener; -import org.apache.qpid.amqp_1_0.type.*; -import org.apache.qpid.amqp_1_0.type.messaging.*; +import org.apache.qpid.amqp_1_0.type.AmqpErrorException; +import org.apache.qpid.amqp_1_0.type.DeliveryState; +import org.apache.qpid.amqp_1_0.type.Section; +import org.apache.qpid.amqp_1_0.type.UnsignedInteger; +import org.apache.qpid.amqp_1_0.type.messaging.Accepted; +import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue; import org.apache.qpid.amqp_1_0.type.transaction.Declare; import org.apache.qpid.amqp_1_0.type.transaction.Declared; import org.apache.qpid.amqp_1_0.type.transaction.Discharge; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.amqp_1_0.type.transport.AmqpError; +import org.apache.qpid.amqp_1_0.type.transport.Detach; import org.apache.qpid.amqp_1_0.type.transport.Error; +import org.apache.qpid.amqp_1_0.type.transport.Transfer; import org.apache.qpid.server.txn.LocalTransaction; import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import java.nio.ByteBuffer; -import java.util.*; - public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0 { - private static final Logger _logger = Logger.getLogger(TxnCoordinatorLink_1_0.class); + private static final Logger _logger = LoggerFactory.getLogger(TxnCoordinatorLink_1_0.class); private VirtualHostImpl _vhost; private ReceivingLinkEndpoint _endpoint; diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java index 82802ec7ae..d96dc8d224 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java @@ -28,10 +28,17 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.store.*; +import org.apache.qpid.server.store.AbstractJDBCConfigurationStore; +import org.apache.qpid.server.store.ConfiguredObjectRecord; +import org.apache.qpid.server.store.DurableConfigurationStore; +import org.apache.qpid.server.store.FileBasedSettings; +import org.apache.qpid.server.store.MessageStore; +import org.apache.qpid.server.store.MessageStoreProvider; +import org.apache.qpid.server.store.StoreException; import org.apache.qpid.util.FileUtils; /** @@ -41,7 +48,7 @@ import org.apache.qpid.util.FileUtils; public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore implements MessageStoreProvider, DurableConfigurationStore { - private static final Logger LOGGER = Logger.getLogger(DerbyConfigurationStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DerbyConfigurationStore.class); private final AtomicBoolean _configurationStoreOpen = new AtomicBoolean(); private final ProvidedMessageStore _providedMessageStore = new ProvidedMessageStore(); diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java index 7d1191da2c..10fed76b60 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java @@ -26,7 +26,8 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.store.FileBasedSettings; @@ -38,7 +39,7 @@ import org.apache.qpid.util.FileUtils; */ public class DerbyMessageStore extends AbstractDerbyMessageStore { - private static final Logger LOGGER = Logger.getLogger(DerbyMessageStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DerbyMessageStore.class); private String _connectionURL; private ConfiguredObject<?> _parent; diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java index 41c48ffe15..8116274261 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java @@ -33,8 +33,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.store.StoreException; @@ -46,7 +46,7 @@ public class DerbyUtils private static final String TABLE_EXISTENCE_QUERY = "SELECT 1 FROM SYS.SYSTABLES WHERE TABLENAME = ?"; private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); - private static final Logger DERBY_LOG = Logger.getLogger("DERBY"); + private static final Logger DERBY_LOG = LoggerFactory.getLogger("DERBY"); public static final DerbyLogWriter DERBY_LOG_WRITER = new DerbyLogWriter(); public static final String DERBY_STREAM_ERROR_METHOD = "derby.stream.error.method"; @@ -203,22 +203,23 @@ public class DerbyUtils // we simply have to assume everything is a warning except known startup / shutdown messages // which we match using known prefixes. - Level logLevel = Level.WARN; - if(logMessage.startsWith(DERBY_STARTUP_MESSAGE) || logMessage.startsWith(DERBY_SHUTDOWN_MESSAGE)) { - logLevel = Level.INFO; + DERBY_LOG.info(logMessage); } else if(logMessage.startsWith(DERBY_SYSTEM_HOME) || logMessage.startsWith(DERBY_STREAM_ERROR_METHOD) || logMessage.startsWith("java.vendor") || logMessage.startsWith(DERBY_CLASS_LOADER_STARTED_MESSAGE)) { - logLevel = Level.DEBUG; + DERBY_LOG.debug(logMessage); + } + else + { + DERBY_LOG.warn(logMessage); } - DERBY_LOG.log(logLevel, logMessage); } _threadLocalBuffer.set(new StringBuilder()); } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java index 3c3b1da880..cd6ca85ee5 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java @@ -34,7 +34,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; @@ -53,7 +54,7 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor { private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); - private static final Logger LOGGER = Logger.getLogger(GenericJDBCConfigurationStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(GenericJDBCConfigurationStore.class); private final AtomicBoolean _configurationStoreOpen = new AtomicBoolean(); private final MessageStore _providedMessageStore = new ProvidedMessageStore(); diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java index a75ca4d685..32ddd89833 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java @@ -34,7 +34,8 @@ import java.util.Set; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory; @@ -47,7 +48,7 @@ import org.apache.qpid.server.store.StoreException; public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore { - private static final Logger _logger = Logger.getLogger(GenericJDBCMessageStore.class); + private static final Logger _logger = LoggerFactory.getLogger(GenericJDBCMessageStore.class); protected String _connectionURL; private ConnectionProvider _connectionProvider; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 1a85a24e0b..110be691bb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletRequest; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.SessionManager; @@ -53,6 +52,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.logging.messages.ManagementConsoleMessages; @@ -87,7 +88,7 @@ import org.apache.qpid.transport.network.security.ssl.SSLUtil; @ManagedObject( category = false, type = "MANAGEMENT-HTTP" ) public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implements HttpManagementConfiguration<HttpManagement>, PortManager { - private final Logger _logger = Logger.getLogger(HttpManagement.class); + private final Logger _logger = LoggerFactory.getLogger(HttpManagement.class); // 10 minutes by default public static final int DEFAULT_TIMEOUT_IN_SECONDS = 60 * 10; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java index c05814bb9c..ef32d352bb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java @@ -34,11 +34,12 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; import org.apache.qpid.server.management.plugin.HttpManagementUtil; @@ -47,7 +48,7 @@ import org.apache.qpid.server.util.ConnectionScopedRuntimeException; public abstract class AbstractServlet extends HttpServlet { - private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractServlet.class); private Broker<?> _broker; private HttpManagementConfiguration _managementConfiguration; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java index cb77735a7b..38f7ef06bc 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java @@ -30,9 +30,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.message.AMQMessageHeader; @@ -49,7 +50,7 @@ import org.apache.qpid.server.store.TransactionLogResource; public class MessageServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(MessageServlet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MessageServlet.class); public MessageServlet() { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index 93ff1adb63..bd144d3009 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -37,9 +37,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; -import org.apache.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.Broker; @@ -49,7 +50,7 @@ import org.apache.qpid.util.DataUrlUtils; public class RestServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(RestServlet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RestServlet.class); /** * An initialization parameter to specify hierarchy */ diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java index 3dcd4a3978..6524a24757 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java @@ -39,9 +39,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; import org.apache.qpid.server.management.plugin.HttpManagementUtil; @@ -54,7 +55,7 @@ import org.apache.qpid.server.util.ConnectionScopedRuntimeException; public class SaslServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(SaslServlet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SaslServlet.class); private static final SecureRandom SECURE_RANDOM = new SecureRandom(); private static final String ATTR_RANDOM = "SaslServlet.Random"; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java index 11876f115e..bbaecca017 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java @@ -34,7 +34,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; @@ -44,7 +45,7 @@ import org.apache.qpid.server.security.access.Operation; public class UserPreferencesServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(UserPreferencesServlet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(UserPreferencesServlet.class); private static final long serialVersionUID = 1L; @Override diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java index 4e55463d45..7e0d13fddb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporter.java @@ -27,7 +27,9 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.EventLoggerProvider; import org.apache.qpid.server.logging.messages.ManagementConsoleMessages; @@ -40,7 +42,7 @@ import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; */ public class LoginLogoutReporter implements HttpSessionBindingListener { - private static final Logger LOGGER = Logger.getLogger(LoginLogoutReporter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LoginLogoutReporter.class); private final Subject _subject; private final Principal _principal; private final EventLoggerProvider _eventLoggerProvider; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java index 4446f96802..95f60d62a6 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java @@ -20,8 +20,6 @@ */ package org.apache.qpid.server.jmx; -import org.apache.log4j.Logger; - import javax.management.JMException; import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; @@ -37,8 +35,6 @@ import javax.management.StandardMBean; */ public abstract class DefaultManagedObject extends StandardMBean implements ManagedObject { - private static final Logger LOGGER = Logger.getLogger(DefaultManagedObject.class); - private final Class<?> _managementInterface; private final String _typeName; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java index 040973ff6e..36b3a0a058 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java @@ -49,7 +49,8 @@ import javax.management.remote.rmi.RMIConnectorServer; import javax.net.ssl.SSLContext; import javax.rmi.ssl.SslRMIClientSocketFactory; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.EventLogger; @@ -67,7 +68,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; */ public class JMXManagedObjectRegistry implements ManagedObjectRegistry { - private static final Logger _log = Logger.getLogger(JMXManagedObjectRegistry.class); + private static final Logger _log = LoggerFactory.getLogger(JMXManagedObjectRegistry.class); private static final String OPERATIONAL_LOGGING_NAME = "JMX"; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index 06558b9f9a..94e5933ff8 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -34,7 +34,8 @@ import javax.management.JMException; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.jmx.mbeans.LoggingManagementMBean; @@ -65,7 +66,7 @@ import org.apache.qpid.server.plugin.QpidServiceLoader; public class JMXManagementPluginImpl extends AbstractPluginAdapter<JMXManagementPluginImpl> implements JMXManagementPlugin<JMXManagementPluginImpl>, PortManager { - private static final Logger LOGGER = Logger.getLogger(JMXManagementPluginImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JMXManagementPluginImpl.class); public static final String NAME = "name"; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java index 97cc7d7737..5fe4ac4d24 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java @@ -40,7 +40,8 @@ import javax.management.RuntimeErrorException; import javax.management.remote.MBeanServerForwarder; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.Broker; @@ -55,7 +56,7 @@ import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; */ public class MBeanInvocationHandlerImpl implements InvocationHandler { - private static final Logger _logger = Logger.getLogger(MBeanInvocationHandlerImpl.class); + private static final Logger _logger = LoggerFactory.getLogger(MBeanInvocationHandlerImpl.class); private final static String DELEGATE = "JMImplementation:type=MBeanServerDelegate"; private MBeanServer _mbs; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java index 215b9c77c4..f437b510ee 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java @@ -23,26 +23,28 @@ import static javax.management.remote.JMXConnectionNotification.CLOSED; import static javax.management.remote.JMXConnectionNotification.FAILED; import static javax.management.remote.JMXConnectionNotification.OPENED; +import java.rmi.server.RemoteServer; +import java.rmi.server.ServerNotActiveException; +import java.security.PrivilegedAction; + import javax.management.Notification; import javax.management.NotificationFilter; import javax.management.NotificationListener; import javax.management.remote.JMXConnectionNotification; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.EventLoggerProvider; import org.apache.qpid.server.logging.messages.ManagementConsoleMessages; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.security.auth.jmx.JMXConnectionPrincipal; -import java.rmi.server.RemoteServer; -import java.rmi.server.ServerNotActiveException; -import java.security.PrivilegedAction; - public class ManagementLogonLogoffReporter implements NotificationListener, NotificationFilter { - private static final Logger LOGGER = Logger.getLogger(ManagementLogonLogoffReporter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ManagementLogonLogoffReporter.class); private final EventLoggerProvider _eventLoggerProvider; private final UsernameAccessor _usernameAccessor; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java index 653ecdc7c9..11fc4ecdf0 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java @@ -19,8 +19,6 @@ */ package org.apache.qpid.server.jmx; -import org.apache.log4j.Logger; - import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -84,4 +82,4 @@ class RegistryProtectingRMIServerSocketFactory implements RMIServerSocketFactory return null; } } -}
\ No newline at end of file +} diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java index 848a846911..b18da9ba32 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java @@ -20,15 +20,10 @@ */ package org.apache.qpid.server.jmx.mbeans; -import org.apache.log4j.Logger; -import org.apache.qpid.management.common.mbeans.LoggingManagement; -import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription; -import org.apache.qpid.server.jmx.AMQManagedObject; -import org.apache.qpid.server.jmx.ManagedObject; -import org.apache.qpid.server.jmx.ManagedObjectRegistry; -import org.apache.qpid.server.logging.log4j.LoggingManagementFacade; -import org.apache.qpid.server.logging.log4j.LoggingFacadeException; -import org.apache.qpid.server.util.ConnectionScopedRuntimeException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import javax.management.JMException; import javax.management.openmbean.CompositeData; @@ -41,10 +36,17 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.management.common.mbeans.LoggingManagement; +import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription; +import org.apache.qpid.server.jmx.AMQManagedObject; +import org.apache.qpid.server.jmx.ManagedObject; +import org.apache.qpid.server.jmx.ManagedObjectRegistry; +import org.apache.qpid.server.logging.log4j.LoggingFacadeException; +import org.apache.qpid.server.logging.log4j.LoggingManagementFacade; +import org.apache.qpid.server.util.ConnectionScopedRuntimeException; /** MBean class for LoggingManagement. It implements all the management features exposed for managing logging. */ @@ -52,7 +54,7 @@ import java.util.Map; public class LoggingManagementMBean extends AMQManagedObject implements LoggingManagement { public static final String INHERITED_PSUEDO_LOG_LEVEL = "INHERITED"; - private static final Logger LOGGER = Logger.getLogger(LoggingManagementMBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LoggingManagementMBean.class); private static final TabularType LOGGER_LEVEL_TABULAR_TYE; private static final CompositeType LOGGER_LEVEL_COMPOSITE_TYPE; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java index 5f5d6e7efe..e77085034c 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicLong; + import javax.management.JMException; import javax.management.MBeanNotificationInfo; import javax.management.Notification; @@ -43,8 +44,11 @@ import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; + import org.apache.commons.lang.time.FastDateFormat; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObject; @@ -64,7 +68,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException; public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueNotificationListener { - private static final Logger LOGGER = Logger.getLogger(QueueMBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(QueueMBean.class); private static final String[] VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC_ARRAY = VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]); diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java index 62733168ef..979d966c04 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java @@ -19,12 +19,6 @@ */ package org.apache.qpid.server.jmx.mbeans; -import org.apache.log4j.Logger; -import org.apache.qpid.server.jmx.DefaultManagedObject; -import org.apache.qpid.server.jmx.ManagedObject; -import org.apache.qpid.server.jmx.ManagedObjectRegistry; - -import javax.management.JMException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -33,13 +27,22 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import javax.management.JMException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.jmx.DefaultManagedObject; +import org.apache.qpid.server.jmx.ManagedObject; +import org.apache.qpid.server.jmx.ManagedObjectRegistry; + /** * Implementation of the JMX broker shutdown plugin. */ public class Shutdown extends DefaultManagedObject implements ShutdownMBean { - private static final Logger _logger = Logger.getLogger(Shutdown.class); + private static final Logger _logger = LoggerFactory.getLogger(Shutdown.class); private static final String FORMAT = "yyyy/MM/dd HH:mm:ss"; private static final int THREAD_COUNT = 1; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java index cce38d26b1..16907fced4 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java @@ -20,15 +20,8 @@ */ package org.apache.qpid.server.jmx.mbeans; -import org.apache.log4j.Logger; - -import org.apache.qpid.management.common.mbeans.UserManagement; -import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription; -import org.apache.qpid.server.jmx.AMQManagedObject; -import org.apache.qpid.server.jmx.ManagedObject; -import org.apache.qpid.server.jmx.ManagedObjectRegistry; -import org.apache.qpid.server.model.AuthenticationProvider; -import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider; +import java.io.IOException; +import java.util.Map; import javax.management.JMException; import javax.management.ObjectName; @@ -43,13 +36,21 @@ import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import javax.security.auth.login.AccountNotFoundException; -import java.io.IOException; -import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.management.common.mbeans.UserManagement; +import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription; +import org.apache.qpid.server.jmx.AMQManagedObject; +import org.apache.qpid.server.jmx.ManagedObject; +import org.apache.qpid.server.jmx.ManagedObjectRegistry; +import org.apache.qpid.server.model.AuthenticationProvider; +import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider; @MBeanDescription("User Management Interface") public class UserManagementMBean extends AMQManagedObject implements UserManagement { - private static final Logger _logger = Logger.getLogger(UserManagementMBean.class); + private static final Logger _logger = LoggerFactory.getLogger(UserManagementMBean.class); private PasswordCredentialManagingAuthenticationProvider _authProvider; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java index 3a5c5957dc..7ac28cd230 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java @@ -29,7 +29,8 @@ import java.util.Map; import javax.management.JMException; import javax.management.ObjectName; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObject; @@ -45,7 +46,7 @@ import org.apache.qpid.server.virtualhost.ManagedVirtualHost; public class VirtualHostMBean extends AMQManagedObject implements ManagedVirtualHost, ConfigurationChangeListener { - private static final Logger LOGGER = Logger.getLogger(VirtualHostMBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(VirtualHostMBean.class); private final VirtualHost<?,?,?> _virtualHost; diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java index bdf44e54da..f9a51d4158 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java @@ -35,7 +35,8 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.management.OperationsException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.management.common.mbeans.ManagedBroker; import org.apache.qpid.management.common.mbeans.ManagedQueue; @@ -57,7 +58,7 @@ import org.apache.qpid.server.virtualhost.ReservedExchangeNameException; @MBeanDescription("This MBean exposes the broker level management features") public class VirtualHostManagerMBean extends AbstractStatisticsGatheringMBean<VirtualHost> implements ManagedBroker { - private static final Logger LOGGER = Logger.getLogger(VirtualHostManagerMBean.class); + private static final Logger LOGGER = LoggerFactory.getLogger(VirtualHostManagerMBean.class); private static final boolean _moveNonExclusiveQueueOwnerToDescription = Boolean.parseBoolean(System.getProperty("qpid.move_non_exclusive_queue_owner_to_description", Boolean.TRUE.toString())); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java index be2252abbd..8e08492d68 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java @@ -33,7 +33,8 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.common.QpidProperties; import org.apache.qpid.framing.ProtocolVersion; @@ -417,7 +418,7 @@ public class Main System.err.println("########################################################################"); e.printStackTrace(System.err); - Logger logger = Logger.getLogger("org.apache.qpid.server.Main"); + Logger logger = LoggerFactory.getLogger("org.apache.qpid.server.Main"); logger.error("Uncaught exception, " + (continueOnError ? "continuing." : "shutting down."), e); } finally diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java index 9bd7062c7b..4607755767 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java +++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java @@ -20,9 +20,16 @@ */ package org.apache.qpid.test.unit.message; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.TextMessage; + import junit.framework.TestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; @@ -34,16 +41,10 @@ import org.apache.qpid.client.message.JMSTextMessage; import org.apache.qpid.client.message.MessageConverter; import org.apache.qpid.exchange.ExchangeDefaults; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.TextMessage; - public class MessageConverterTest extends TestCase { - private static final Logger _logger = Logger.getLogger(MessageConverterTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MessageConverterTest.class); public static final String JMS_CORR_ID = "QPIDID_01"; public static final int JMS_DELIV_MODE = 1; public static final String JMS_TYPE = "test.jms.type"; diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java index afc2b968f4..3a6006c338 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java +++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java @@ -31,7 +31,8 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.network.ConnectionBinding; @@ -43,7 +44,7 @@ import org.apache.qpid.transport.util.Waiter; */ public class ConnectionTest extends QpidTestCase implements SessionListener { - private static final Logger _logger = Logger.getLogger(ConnectionTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ConnectionTest.class); private int port; private volatile boolean queue = false; private List<MessageTransfer> messages = new ArrayList<MessageTransfer>(); @@ -358,7 +359,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener ssn.sync(); if (_logger.isDebugEnabled()) { - _logger.debug(messages); + _logger.debug(String.valueOf(messages)); } assertEquals(1, messages.size()); assertEquals("SINK 3", messages.get(0).getBodyString()); diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java index 67d360fa9e..f1492273c8 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java +++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java @@ -26,7 +26,8 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.SocketAddress; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.transport.Binding; @@ -38,7 +39,7 @@ import org.apache.qpid.transport.Binding; public class IoAcceptor<E> extends Thread { - private static final Logger _logger = Logger.getLogger(IoAcceptor.class); + private static final Logger _logger = LoggerFactory.getLogger(IoAcceptor.class); private volatile boolean _closed = false; diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java index fdea03ae5e..e4cf80a60f 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java @@ -19,36 +19,7 @@ */ package org.apache.qpid.disttest.db; -import static org.apache.qpid.disttest.message.ParticipantAttribute.ACKNOWLEDGE_MODE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.AVERAGE_LATENCY; -import static org.apache.qpid.disttest.message.ParticipantAttribute.BATCH_SIZE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.CONFIGURED_CLIENT_NAME; -import static org.apache.qpid.disttest.message.ParticipantAttribute.DELIVERY_MODE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.ERROR_MESSAGE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_BROWSING_SUBSCRIPTION; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_DURABLE_SUBSCRIPTION; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_NO_LOCAL; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SELECTOR; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_SYNCHRONOUS_CONSUMER; -import static org.apache.qpid.disttest.message.ParticipantAttribute.IS_TOPIC; -import static org.apache.qpid.disttest.message.ParticipantAttribute.ITERATION_NUMBER; -import static org.apache.qpid.disttest.message.ParticipantAttribute.LATENCY_STANDARD_DEVIATION; -import static org.apache.qpid.disttest.message.ParticipantAttribute.MAXIMUM_DURATION; -import static org.apache.qpid.disttest.message.ParticipantAttribute.MAX_LATENCY; -import static org.apache.qpid.disttest.message.ParticipantAttribute.MIN_LATENCY; -import static org.apache.qpid.disttest.message.ParticipantAttribute.NUMBER_OF_MESSAGES_PROCESSED; -import static org.apache.qpid.disttest.message.ParticipantAttribute.PARTICIPANT_NAME; -import static org.apache.qpid.disttest.message.ParticipantAttribute.PAYLOAD_SIZE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.PRIORITY; -import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_INTERVAL; -import static org.apache.qpid.disttest.message.ParticipantAttribute.PRODUCER_START_DELAY; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TEST_NAME; -import static org.apache.qpid.disttest.message.ParticipantAttribute.THROUGHPUT; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TAKEN; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TIME_TO_LIVE; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_CONSUMERS; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_NUMBER_OF_PRODUCERS; -import static org.apache.qpid.disttest.message.ParticipantAttribute.TOTAL_PAYLOAD_PROCESSED; +import static org.apache.qpid.disttest.message.ParticipantAttribute.*; import java.sql.Connection; import java.sql.DriverManager; @@ -67,7 +38,9 @@ import javax.naming.NamingException; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.disttest.controller.ResultsForAllTests; import org.apache.qpid.disttest.message.ParticipantResult; import org.apache.qpid.disttest.results.aggregation.ITestResult; @@ -82,7 +55,7 @@ import org.apache.qpid.disttest.results.aggregation.ITestResult; */ public class ResultsDbWriter { - private static final Logger _logger = Logger.getLogger(ResultsDbWriter.class); + private static final Logger _logger = LoggerFactory.getLogger(ResultsDbWriter.class); private static final String RESULTS_TABLE_NAME = "RESULTS"; diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java index 024af6dd57..08d39fd0ce 100644 --- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java +++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java @@ -28,7 +28,13 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.apache.log4j.Logger; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.plot.XYPlot; +import org.jfree.chart.title.ShortTextTitle; +import org.jfree.data.general.Dataset; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.disttest.charting.ChartType; import org.apache.qpid.disttest.charting.definition.ChartingDefinition; import org.apache.qpid.disttest.charting.definition.SeriesDefinition; @@ -38,10 +44,6 @@ import org.apache.qpid.disttest.charting.seriesbuilder.SeriesRow; import org.apache.qpid.disttest.charting.writer.ChartWriter; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.test.utils.TestFileUtils; -import org.jfree.chart.JFreeChart; -import org.jfree.chart.plot.XYPlot; -import org.jfree.chart.title.ShortTextTitle; -import org.jfree.data.general.Dataset; /** * Tests the production of the different chart types. To manually @@ -50,7 +52,7 @@ import org.jfree.data.general.Dataset; */ public class ChartProductionTest extends QpidTestCase { - private static final Logger _logger = Logger.getLogger(ChartProductionTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ChartProductionTest.class); private static final String TEST_CHARTTITLE = "TEST_CHARTTITLE"; private static final String TEST_CHARTSUBTITLE = "TEST_CHARTSUBTITLE"; private static final String TEST_XAXIS = "TEST_XAXIS"; diff --git a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java index 72958ca607..66a23717dd 100644 --- a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java +++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java @@ -25,11 +25,12 @@ import java.util.HashSet; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PortHelper { - private static final Logger _logger = Logger.getLogger(PortHelper.class); + private static final Logger _logger = LoggerFactory.getLogger(PortHelper.class); public static final int START_PORT_NUMBER = 10000; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java index 2e3626eae6..e125ddb772 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java @@ -51,14 +51,16 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; import javax.servlet.http.HttpServletResponse; -import org.junit.Assert; import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Binding; @@ -75,7 +77,7 @@ public class RestTestHelper }; public static final String API_BASE = "/api/latest/"; - private static final Logger LOGGER = Logger.getLogger(RestTestHelper.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RestTestHelper.class); private static final String CERT_ALIAS_APP1 = "app1"; private int _httpPort; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java index 9e8f0d1ca2..4965f54403 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java @@ -25,7 +25,8 @@ import java.util.Set; import javax.security.auth.Subject; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.server.Broker; import org.apache.qpid.server.BrokerOptions; @@ -34,7 +35,7 @@ import org.apache.qpid.server.util.Action; public class InternalBrokerHolder implements BrokerHolder { - private static final Logger LOGGER = Logger.getLogger(InternalBrokerHolder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(InternalBrokerHolder.class); private Broker _broker; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java index 12be233c35..98e3c96c0a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java @@ -24,15 +24,15 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.PrintStream; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class Piper extends Thread { - private static final Logger LOGGER = Logger.getLogger(Piper.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Piper.class); private final BufferedReader _in; private final Logger _out; @@ -46,7 +46,7 @@ public final class Piper extends Thread { super(threadName); _in = new BufferedReader(new InputStreamReader(in)); - _out = Logger.getLogger(loggerName); + _out = LoggerFactory.getLogger(loggerName); _ready = ready; _stopped = stopped; _seenReady = false; @@ -117,4 +117,4 @@ public final class Piper extends Thread { return _ready; } -}
\ No newline at end of file +} diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java index 2581093f97..cd436b98cf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java @@ -33,7 +33,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.logging.messages.BrokerMessages; @@ -42,7 +44,7 @@ import org.apache.qpid.util.SystemUtils; public class SpawnedBrokerHolder implements BrokerHolder { - private static final Logger LOGGER = Logger.getLogger(SpawnedBrokerHolder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SpawnedBrokerHolder.class); protected static final String BROKER_READY = System.getProperty("broker.ready", BrokerMessages.READY().toString()); private static final String BROKER_STOPPED = System.getProperty("broker.stopped", BrokerMessages.STOPPED().toString()); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java index 549edcd650..a091d01661 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java @@ -38,8 +38,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.apache.log4j.Logger; - import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.logging.EventLogger; @@ -60,7 +58,6 @@ import org.apache.qpid.util.Strings; public class TestBrokerConfiguration { - private static final Logger LOGGER = Logger.getLogger(TestBrokerConfiguration.class); public static final String ENTRY_NAME_HTTP_PORT = "http"; public static final String ENTRY_NAME_AMQP_PORT = "amqp"; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java index 6612fedd35..4b7c7b83b3 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java @@ -29,13 +29,15 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.server.model.Broker; import org.apache.qpid.test.utils.QpidBrokerTestCase; public class HeartbeatTest extends QpidBrokerTestCase { - private static final Logger LOGGER = Logger.getLogger(HeartbeatTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HeartbeatTest.class); private static final String CONNECTION_URL_WITH_HEARTBEAT = "amqp://guest:guest@clientid/?brokerlist='localhost:%d?heartbeat='%d''"; private TestListener _listener = new TestListener("listener"); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java index c59b0ecf34..8647333f2e 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java @@ -33,7 +33,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.jms.ConnectionListener; @@ -42,7 +44,7 @@ import org.apache.qpid.util.FileUtils; public class MultipleBrokersFailoverTest extends QpidBrokerTestCase implements ConnectionListener { - private static final Logger _logger = Logger.getLogger(MultipleBrokersFailoverTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MultipleBrokersFailoverTest.class); private static final String FAILOVER_VIRTUAL_HOST = "failover"; private static final String NON_FAILOVER_VIRTUAL_HOST = "nonfailover"; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java index daee2842fa..0b2b001a5f 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java @@ -25,13 +25,14 @@ import javax.jms.ConnectionFactory; import javax.jms.Message; import javax.jms.Session; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.test.utils.QpidBrokerTestCase; public class QpidRAConnectionTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(QpidRAConnectionTest.class); + private static final Logger _logger = LoggerFactory.getLogger(QpidRAConnectionTest.class); private static final String BROKER_PORT = "15672"; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java index 9f145cd62c..8f21bd40ef 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java @@ -21,36 +21,37 @@ package org.apache.qpid.server.exchange; -import org.apache.log4j.Logger; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.jms.Connection; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.client.AMQHeadersExchange; import org.apache.qpid.client.AMQNoRouteException; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.AMQBindingURL; import org.apache.qpid.url.BindingURL; -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase implements ExceptionListener { - private static final Logger _logger = Logger.getLogger(ReturnUnroutableMandatoryMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ReturnUnroutableMandatoryMessageTest.class); private final List<Message> _bouncedMessageList = Collections.synchronizedList(new ArrayList<Message>()); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java index dc30c02951..0cc079bba4 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java @@ -21,15 +21,13 @@ package org.apache.qpid.server.queue; -import org.apache.log4j.Logger; -import org.apache.qpid.AMQException; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidBrokerTestCase; -import org.apache.qpid.url.AMQBindingURL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.jms.Connection; import javax.jms.JMSException; @@ -39,17 +37,21 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.test.utils.QpidBrokerTestCase; +import org.apache.qpid.url.AMQBindingURL; public class LastValueQueueTest extends QpidBrokerTestCase { - private static final Logger LOGGER = Logger.getLogger(LastValueQueueTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LastValueQueueTest.class); private static final String MESSAGE_SEQUENCE_NUMBER_PROPERTY = "msg"; private static final String KEY_PROPERTY = "key"; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java index cbf4e032db..f074a6e723 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java @@ -20,9 +20,9 @@ */ package org.apache.qpid.server.queue; -import org.apache.log4j.Logger; - -import org.apache.qpid.test.utils.QpidBrokerTestCase; +import java.util.Random; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.jms.Connection; import javax.jms.JMSException; @@ -31,13 +31,14 @@ import javax.jms.MessageConsumer; import javax.jms.MessageListener; import javax.jms.Session; -import java.util.Random; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(MultipleTransactedBatchProducerTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MultipleTransactedBatchProducerTest.class); private static final int MESSAGE_COUNT = 1000; private static final int BATCH_SIZE = 50; @@ -247,4 +248,4 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase _logger.error("Failing test because: " + msg); _failMsg = msg; } -}
\ No newline at end of file +} diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java index 7b2dd3239d..670fe95b8c 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java @@ -20,14 +20,10 @@ */ package org.apache.qpid.server.queue; -import org.apache.log4j.Logger; -import org.apache.qpid.AMQException; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.configuration.ClientProperties; -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidBrokerTestCase; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.jms.Connection; import javax.jms.JMSException; @@ -38,10 +34,17 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; import javax.naming.NamingException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.configuration.ClientProperties; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class PriorityQueueTest extends QpidBrokerTestCase { @@ -247,7 +250,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase private static class ReflectingMessageListener implements MessageListener { - private static final Logger _logger = Logger.getLogger(PriorityQueueTest.ReflectingMessageListener.class); + private static final Logger _logger = LoggerFactory.getLogger(PriorityQueueTest.ReflectingMessageListener.class); private Session _prodSess; private Session _consSess; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java index 427508954d..d6b943b768 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java @@ -37,7 +37,9 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; @@ -48,7 +50,7 @@ import org.apache.qpid.test.utils.JMXTestUtils; public class ProducerFlowControlTest extends AbstractTestLogging { - private static final Logger _logger = Logger.getLogger(ProducerFlowControlTest.class); + private static final Logger _logger = LoggerFactory.getLogger(ProducerFlowControlTest.class); private static final int TIMEOUT = 10000; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java index 340ae4a1ae..92a0edc31b 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java @@ -19,15 +19,12 @@ */ package org.apache.qpid.server.queue; -import org.apache.log4j.Logger; - -import org.apache.qpid.AMQException; -import org.apache.qpid.client.AMQDestination; -import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.configuration.ClientProperties; -import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidBrokerTestCase; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicInteger; import javax.jms.Connection; import javax.jms.JMSException; @@ -38,16 +35,21 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; import javax.naming.NamingException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicInteger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.configuration.ClientProperties; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.test.utils.QpidBrokerTestCase; public class SortedQueueTest extends QpidBrokerTestCase { - private static final Logger LOGGER = Logger.getLogger(SortedQueueTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SortedQueueTest.class); public static final String TEST_SORT_KEY = "testSortKey"; private static final String[] VALUES = SortedQueueEntryListTest.keys.clone(); private static final String[] VALUES_SORTED = SortedQueueEntryListTest.keys.clone(); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java index e606df3f7d..64292a8fa9 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java @@ -34,8 +34,9 @@ import javax.jms.Session; import javax.jms.TopicSubscriber; import javax.naming.NamingException; -import org.apache.log4j.Logger; import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; @@ -46,7 +47,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase; public class TimeToLiveTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(TimeToLiveTest.class); + private static final Logger _logger = LoggerFactory.getLogger(TimeToLiveTest.class); protected final String QUEUE = "TimeToLiveQueue"; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java index d0f133aa73..1e09eea07b 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java @@ -48,7 +48,8 @@ import javax.management.openmbean.TabularData; import javax.naming.NamingException; import org.apache.commons.lang.time.FastDateFormat; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.client.AMQSession; import org.apache.qpid.configuration.ClientProperties; @@ -69,7 +70,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase; public class QueueManagementTest extends QpidBrokerTestCase { - private static final Logger LOGGER = Logger.getLogger(QueueManagementTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(QueueManagementTest.class); private static final String VIRTUAL_HOST = "test"; private static final String TEST_QUEUE_DESCRIPTION = "my description"; @@ -328,8 +329,6 @@ public class QueueManagementTest extends QpidBrokerTestCase * Tests the ability to receive queue alerts as JMX notifications. * * @see NotificationCheckTest - * @see SimpleAMQQueueTest#testNotificationFiredAsync() - * @see SimpleAMQQueueTest#testNotificationFiredOnEnqueue() */ public void testQueueNotification() throws Exception { diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java index deb8e4f12b..d2416f641a 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java @@ -30,7 +30,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.naming.NamingException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; @@ -48,7 +50,7 @@ import org.apache.qpid.url.URLSyntaxException; */ public class CloseOnNoRouteForMandatoryMessageTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(CloseOnNoRouteForMandatoryMessageTest.class); + private static final Logger _logger = LoggerFactory.getLogger(CloseOnNoRouteForMandatoryMessageTest.class); private Connection _connection; private UnroutableMessageTestExceptionListener _testExceptionListener = new UnroutableMessageTestExceptionListener(); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java index f8bc051be7..dc84617e17 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java @@ -20,12 +20,6 @@ */ package org.apache.qpid.test.client; -import org.apache.log4j.Logger; - -import org.apache.qpid.client.AMQSession_0_8; -import org.apache.qpid.client.message.AbstractJMSMessage; -import org.apache.qpid.test.utils.QpidBrokerTestCase; - import javax.jms.BytesMessage; import javax.jms.Connection; import javax.jms.Message; @@ -34,9 +28,16 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.client.AMQSession_0_8; +import org.apache.qpid.client.message.AbstractJMSMessage; +import org.apache.qpid.test.utils.QpidBrokerTestCase; + public class FlowControlTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(FlowControlTest.class); + private static final Logger _logger = LoggerFactory.getLogger(FlowControlTest.class); private Connection _clientConnection; private Session _clientSession; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java index 99afe0015d..50198a0c66 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java @@ -32,7 +32,9 @@ import javax.jms.ExceptionListener; import javax.jms.JMSException; import javax.jms.Message; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQNoConsumersException; import org.apache.qpid.client.AMQNoRouteException; @@ -49,7 +51,7 @@ import org.apache.qpid.protocol.AMQConstant; */ public class UnroutableMessageTestExceptionListener implements ExceptionListener { - private static final Logger _logger = Logger.getLogger(UnroutableMessageTestExceptionListener.class); + private static final Logger _logger = LoggerFactory.getLogger(UnroutableMessageTestExceptionListener.class); /** * Number of seconds to check for an event that should should NOT happen diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java index 2875e2c6b1..43bd540d8e 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java @@ -21,12 +21,9 @@ package org.apache.qpid.test.client.failover; -import org.apache.log4j.Logger; - -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQSession; -import org.apache.qpid.jms.ConnectionListener; -import org.apache.qpid.test.utils.FailoverBaseCase; +import java.util.Random; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.jms.Connection; import javax.jms.JMSException; @@ -36,13 +33,18 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import java.util.Random; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.jms.ConnectionListener; +import org.apache.qpid.test.utils.FailoverBaseCase; public class FailoverTest extends FailoverBaseCase implements ConnectionListener { - private static final Logger _logger = Logger.getLogger(FailoverTest.class); + private static final Logger _logger = LoggerFactory.getLogger(FailoverTest.class); private static final int DEFAULT_NUM_MESSAGES = 10; private static final int DEFAULT_SEED = 20080921; diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java index 5e1e38106a..cf7e378e44 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java @@ -37,7 +37,8 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQDestination; @@ -64,7 +65,7 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration; */ public class MaxDeliveryCountTest extends QpidBrokerTestCase { - private static final Logger _logger = Logger.getLogger(MaxDeliveryCountTest.class); + private static final Logger _logger = LoggerFactory.getLogger(MaxDeliveryCountTest.class); private boolean _failed; private String _failMsg; private static final int MSG_COUNT = 15; |