You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/03/12 17:13:29 UTC
svn commit: r1666234 [4/4] - in /qpid/trunk/qpid/java:
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleyd...
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Thu Mar 12 16:13:26 2015
@@ -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.Qpi
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";
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java Thu Mar 12 16:13:26 2015
@@ -40,7 +40,8 @@ import javax.management.RuntimeErrorExce
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.a
*/
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java Thu Mar 12 16:13:26 2015
@@ -23,26 +23,28 @@ import static javax.management.remote.JM
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java Thu Mar 12 16:13:26 2015
@@ -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 RegistryProtectingRMIServerSocketF
return null;
}
}
-}
\ No newline at end of file
+}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java Thu Mar 12 16:13:26 2015
@@ -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.Tabula
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java Thu Mar 12 16:13:26 2015
@@ -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.Simple
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.Serve
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()]);
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java Thu Mar 12 16:13:26 2015
@@ -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.ScheduledExe
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java Thu Mar 12 16:13:26 2015
@@ -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.Tabula
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java Thu Mar 12 16:13:26 2015
@@ -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.virtualhos
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;
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Thu Mar 12 16:13:26 2015
@@ -35,7 +35,8 @@ import javax.management.MalformedObjectN
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.virtualhos
@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()));
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Thu Mar 12 16:13:26 2015
@@ -33,7 +33,8 @@ import org.apache.commons.cli.OptionBuil
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
Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java Thu Mar 12 16:13:26 2015
@@ -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.JM
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";
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Thu Mar 12 16:13:26 2015
@@ -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.Wa
*/
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 Qpid
ssn.sync();
if (_logger.isDebugEnabled())
{
- _logger.debug(messages);
+ _logger.debug(String.valueOf(messages));
}
assertEquals(1, messages.size());
assertEquals("SINK 3", messages.get(0).getBodyString());
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java Thu Mar 12 16:13:26 2015
@@ -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;
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java Thu Mar 12 16:13:26 2015
@@ -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.
*/
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";
Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java (original)
+++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java Thu Mar 12 16:13:26 2015
@@ -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
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";
Modified: qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java (original)
+++ qpid/trunk/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java Thu Mar 12 16:13:26 2015
@@ -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;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java Thu Mar 12 16:13:26 2015
@@ -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;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java Thu Mar 12 16:13:26 2015
@@ -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.Actio
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;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java Thu Mar 12 16:13:26 2015
@@ -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
+}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Thu Mar 12 16:13:26 2015
@@ -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());
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Thu Mar 12 16:13:26 2015
@@ -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";
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java Thu Mar 12 16:13:26 2015
@@ -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");
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java Thu Mar 12 16:13:26 2015
@@ -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";
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java Thu Mar 12 16:13:26 2015
@@ -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";
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java Thu Mar 12 16:13:26 2015
@@ -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>());
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java Thu Mar 12 16:13:26 2015
@@ -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";
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java Thu Mar 12 16:13:26 2015
@@ -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 MultipleTransactedBatchProd
_logger.error("Failing test because: " + msg);
_failMsg = msg;
}
-}
\ No newline at end of file
+}
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java Thu Mar 12 16:13:26 2015
@@ -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 Q
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;
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java Thu Mar 12 16:13:26 2015
@@ -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.JMXTes
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;
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java Thu Mar 12 16:13:26 2015
@@ -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();
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java Thu Mar 12 16:13:26 2015
@@ -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.QpidBr
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";
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java Thu Mar 12 16:13:26 2015
@@ -48,7 +48,8 @@ import javax.management.openmbean.Tabula
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.QpidBr
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
* Tests the ability to receive queue alerts as JMX notifications.
*
* @see NotificationCheckTest
- * @see SimpleAMQQueueTest#testNotificationFiredAsync()
- * @see SimpleAMQQueueTest#testNotificationFiredOnEnqueue()
*/
public void testQueueNotification() throws Exception
{
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java Thu Mar 12 16:13:26 2015
@@ -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.URLSyntaxExce
*/
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();
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java Thu Mar 12 16:13:26 2015
@@ -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;
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java Thu Mar 12 16:13:26 2015
@@ -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.AMQConst
*/
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
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java Thu Mar 12 16:13:26 2015
@@ -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;
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java?rev=1666234&r1=1666233&r2=1666234&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java Thu Mar 12 16:13:26 2015
@@ -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.TestBr
*/
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org