From commits-return-15543-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu Feb 10 14:25:12 2011 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 90934 invoked from network); 10 Feb 2011 14:25:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Feb 2011 14:25:12 -0000 Received: (qmail 95775 invoked by uid 500); 10 Feb 2011 14:25:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 95677 invoked by uid 500); 10 Feb 2011 14:25:12 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 95616 invoked by uid 99); 10 Feb 2011 14:25:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Feb 2011 14:25:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Feb 2011 14:25:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 31BB52388A9F; Thu, 10 Feb 2011 14:24:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1069405 [5/11] - in /activemq/trunk: ./ activemq-all/ activemq-camel/ activemq-camel/src/main/java/org/apache/activemq/camel/component/ activemq-camel/src/test/java/org/apache/activemq/camel/ activemq-camel/src/test/java/org/apache/activem... Date: Thu, 10 Feb 2011 14:24:21 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110210142436.31BB52388A9F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java Thu Feb 10 14:24:01 2011 @@ -40,8 +40,8 @@ import org.apache.activemq.util.IOExcept import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.URISupport; import org.apache.activemq.wireformat.WireFormat; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications) @@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac */ public class UdpTransportFactory extends TransportFactory { - private static final Log log = LogFactory.getLog(TcpTransportFactory.class); + private static final Logger log = LoggerFactory.getLogger(TcpTransportFactory.class); public TransportServer doBind(final URI location) throws IOException { try { Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportServer.java Thu Feb 10 14:24:01 2011 @@ -36,8 +36,8 @@ import org.apache.activemq.transport.rel import org.apache.activemq.transport.reliable.ReplayStrategy; import org.apache.activemq.transport.reliable.Replayer; import org.apache.activemq.util.ServiceStopper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A UDP based implementation of {@link TransportServer} @@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac */ public class UdpTransportServer extends TransportServerSupport { - private static final Log LOG = LogFactory.getLog(UdpTransportServer.class); + private static final Logger LOG = LoggerFactory.getLogger(UdpTransportServer.class); private UdpTransport serverTransport; private ReplayStrategy replayStrategy; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java Thu Feb 10 14:24:01 2011 @@ -37,15 +37,15 @@ import org.apache.activemq.util.Introspe import org.apache.activemq.util.ServiceSupport; import org.apache.activemq.util.URISupport; import org.apache.activemq.util.URISupport.CompositeData; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class VMTransportFactory extends TransportFactory { public static final ConcurrentHashMap BROKERS = new ConcurrentHashMap(); public static final ConcurrentHashMap CONNECTORS = new ConcurrentHashMap(); public static final ConcurrentHashMap SERVERS = new ConcurrentHashMap(); - private static final Log LOG = LogFactory.getLog(VMTransportFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(VMTransportFactory.class); BrokerFactoryHandler brokerFactoryHandler; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java Thu Feb 10 14:24:01 2011 @@ -24,8 +24,8 @@ import java.util.concurrent.CopyOnWriteA import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.activemq.Service; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Used to keep track of how much of something is being used so that a @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac */ public abstract class Usage implements Service { - private static final Log LOG = LogFactory.getLog(Usage.class); + private static final Logger LOG = LoggerFactory.getLogger(Usage.class); protected final Object usageMutex = new Object(); protected int percentUsage; protected T parent; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java Thu Feb 10 14:24:01 2011 @@ -19,13 +19,13 @@ package org.apache.activemq.util; import java.io.IOException; import org.apache.activemq.broker.BrokerService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DefaultIOExceptionHandler implements IOExceptionHandler { - private static final Log LOG = LogFactory - .getLog(DefaultIOExceptionHandler.class); + private static final Logger LOG = LoggerFactory + .getLogger(DefaultIOExceptionHandler.class); private BrokerService broker; private boolean ignoreAllErrors = false; private boolean ignoreNoSpaceErrors = true; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java Thu Feb 10 14:24:01 2011 @@ -19,8 +19,8 @@ package org.apache.activemq.util; import java.net.ServerSocket; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Generator for Globally unique Strings. @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac public class IdGenerator { - private static final Log LOG = LogFactory.getLog(IdGenerator.class); + private static final Logger LOG = LoggerFactory.getLogger(IdGenerator.class); private static final String UNIQUE_STUB; private static int instanceCount; private static String hostName; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java Thu Feb 10 14:24:01 2011 @@ -24,8 +24,8 @@ import java.util.concurrent.ConcurrentHa import org.apache.activemq.transport.LogWriter; import org.apache.activemq.transport.TransportLoggerView; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class used to find a LogWriter implementation, and returning @@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac */ public class LogWriterFinder { - private static final Log log = LogFactory.getLog(TransportLoggerView.class); + private static final Logger log = LoggerFactory.getLogger(TransportLoggerView.class); private final String path; private final ConcurrentHashMap classMap = new ConcurrentHashMap(); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java Thu Feb 10 14:24:01 2011 @@ -20,8 +20,8 @@ import java.util.Iterator; import java.util.List; import org.apache.activemq.Service; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A helper class used to stop a bunch of services, catching and logging any @@ -92,7 +92,7 @@ public class ServiceStopper { } protected void logError(Object service, Throwable e) { - Log log = LogFactory.getLog(service.getClass()); + Logger log = LoggerFactory.getLogger(service.getClass()); log.error("Could not stop service: " + service + ". Reason: " + e, e); } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java Thu Feb 10 14:24:01 2011 @@ -21,8 +21,8 @@ import java.util.concurrent.CopyOnWriteA import java.util.concurrent.atomic.AtomicBoolean; import org.apache.activemq.Service; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A helper class for working with services together with a useful base class @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac * @version $Revision: 1.1 $ */ public abstract class ServiceSupport implements Service { - private static final Log LOG = LogFactory.getLog(ServiceSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(ServiceSupport.class); private AtomicBoolean started = new AtomicBoolean(false); private AtomicBoolean stopping = new AtomicBoolean(false); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java Thu Feb 10 14:24:01 2011 @@ -19,8 +19,8 @@ package org.apache.activemq.util; import java.util.HashMap; import java.util.Map.Entry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Debugging tool to track entry points through code, useful to see runtime call paths @@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac */ public class ThreadTracker { - static final Log LOG = LogFactory.getLog(ThreadTracker.class); + static final Logger LOG = LoggerFactory.getLogger(ThreadTracker.class); static HashMap trackers = new HashMap(); /** Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java Thu Feb 10 14:24:01 2011 @@ -19,8 +19,8 @@ package org.apache.activemq.util; import java.io.IOException; import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.store.PersistenceAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A helper class for running code with a PersistenceAdapter in a transaction. @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac * @version $Revision: 1.2 $ */ public class TransactionTemplate { - private static final Log LOG = LogFactory.getLog(TransactionTemplate.class); + private static final Logger LOG = LoggerFactory.getLogger(TransactionTemplate.class); private PersistenceAdapter persistenceAdapter; private ConnectionContext context; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java Thu Feb 10 14:24:01 2011 @@ -32,8 +32,8 @@ import org.apache.activemq.transport.Tra import org.apache.activemq.transport.discovery.DiscoveryAgent; import org.apache.activemq.util.FactoryFinder; import org.apache.activemq.util.FactoryFinder.ObjectFactory; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; @@ -48,7 +48,7 @@ import org.osgi.framework.SynchronousBun */ public class Activator implements BundleActivator, SynchronousBundleListener, ObjectFactory { - private static final Log LOG = LogFactory.getLog(Activator.class); + private static final Logger LOG = LoggerFactory.getLogger(Activator.class); private final ConcurrentHashMap serviceCache = new ConcurrentHashMap(); private final ConcurrentMap bundleWrappers = new ConcurrentHashMap(); @@ -183,7 +183,7 @@ public class Activator implements Bundle // ================================================================ private void debug(Object msg) { - LOG.debug(msg); + LOG.debug(msg.toString()); } private Properties loadProperties(URL resource) throws IOException { Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java Thu Feb 10 14:24:01 2011 @@ -20,8 +20,8 @@ import java.beans.PropertyEditorManager; import java.net.URI; import org.apache.activemq.broker.BrokerService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.xbean.spring.context.ResourceXmlApplicationContext; import org.apache.xbean.spring.context.impl.URIEditor; import org.springframework.beans.BeansException; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java Thu Feb 10 14:24:01 2011 @@ -26,8 +26,8 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.broker.BrokerService; import org.apache.activemq.util.IntrospectionSupport; import org.apache.activemq.util.URISupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.xbean.spring.context.ResourceXmlApplicationContext; import org.apache.xbean.spring.context.impl.URIEditor; import org.springframework.beans.BeansException; @@ -44,7 +44,7 @@ import org.springframework.util.Resource * @version $Revision$ */ public class XBeanBrokerFactory implements BrokerFactoryHandler { - private static final transient Log LOG = LogFactory.getLog(XBeanBrokerFactory.class); + private static final transient Logger LOG = LoggerFactory.getLogger(XBeanBrokerFactory.class); static { PropertyEditorManager.registerEditor(URI.class, URIEditor.class); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java Thu Feb 10 14:24:01 2011 @@ -23,8 +23,8 @@ import javax.annotation.PreDestroy; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.usage.SystemUsage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An ActiveMQ Message Broker. It consists of a number of transport @@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac * @version $Revision: 1.1 $ */ public class XBeanBrokerService extends BrokerService { - private static final transient Log LOG = LogFactory.getLog(XBeanBrokerService.class); + private static final transient Logger LOG = LoggerFactory.getLogger(XBeanBrokerService.class); private boolean start = true; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQConnectionFactoryTest.java Thu Feb 10 14:24:01 2011 @@ -30,11 +30,11 @@ import javax.jms.Session; import org.apache.activemq.broker.BrokerRegistry; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ActiveMQConnectionFactoryTest extends CombinationTestSupport { - private static final Log LOG = LogFactory.getLog(ActiveMQConnectionFactoryTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ActiveMQConnectionFactoryTest.class); private ActiveMQConnection connection; private BrokerService broker; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQInputStreamTest.java Thu Feb 10 14:24:01 2011 @@ -1,86 +1,86 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq; - -import java.io.InputStream; -import java.io.OutputStream; - -import javax.jms.Queue; -import javax.jms.Session; - -import junit.framework.TestCase; -import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.command.ActiveMQDestination; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class ActiveMQInputStreamTest extends TestCase { - - private static final Log LOG = LogFactory.getLog(ActiveMQInputStreamTest.class); - - private static final String BROKER_URL = "tcp://localhost:61616"; - private static final String DESTINATION = "destination"; - private static final int STREAM_LENGTH = 64 * 1024 + 0; // change 0 to 1 to make it not crash - - public void testInputStreamMatchesDefaultChuckSize() throws Exception { - BrokerService broker = new BrokerService(); - broker.setUseJmx(false); - broker.setPersistent(false); - broker.setDestinations(new ActiveMQDestination[] { - ActiveMQDestination.createDestination(DESTINATION, ActiveMQDestination.QUEUE_TYPE), - }); - broker.addConnector(BROKER_URL); - broker.start(); - - ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URL); - ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue destination = session.createQueue(DESTINATION); - - OutputStream out = null; - try { - out = connection.createOutputStream(destination); - LOG.debug("writing..."); - for (int i = 0; i < STREAM_LENGTH; ++i) { - out.write(0); - } - LOG.debug("wrote " + STREAM_LENGTH + " bytes"); - } finally { - if (out != null) { - out.close(); - } - } - - InputStream in = null; - try { - in = connection.createInputStream(destination); - LOG.debug("reading..."); - int count = 0; - while (-1 != in.read()) { - ++count; - } - LOG.debug("read " + count + " bytes"); - } finally { - if (in != null) { - in.close(); - } - } - - connection.close(); - broker.stop(); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq; + +import java.io.InputStream; +import java.io.OutputStream; + +import javax.jms.Queue; +import javax.jms.Session; + +import junit.framework.TestCase; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.command.ActiveMQDestination; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ActiveMQInputStreamTest extends TestCase { + + private static final Logger LOG = LoggerFactory.getLogger(ActiveMQInputStreamTest.class); + + private static final String BROKER_URL = "tcp://localhost:61616"; + private static final String DESTINATION = "destination"; + private static final int STREAM_LENGTH = 64 * 1024 + 0; // change 0 to 1 to make it not crash + + public void testInputStreamMatchesDefaultChuckSize() throws Exception { + BrokerService broker = new BrokerService(); + broker.setUseJmx(false); + broker.setPersistent(false); + broker.setDestinations(new ActiveMQDestination[] { + ActiveMQDestination.createDestination(DESTINATION, ActiveMQDestination.QUEUE_TYPE), + }); + broker.addConnector(BROKER_URL); + broker.start(); + + ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URL); + ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection(); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue destination = session.createQueue(DESTINATION); + + OutputStream out = null; + try { + out = connection.createOutputStream(destination); + LOG.debug("writing..."); + for (int i = 0; i < STREAM_LENGTH; ++i) { + out.write(0); + } + LOG.debug("wrote " + STREAM_LENGTH + " bytes"); + } finally { + if (out != null) { + out.close(); + } + } + + InputStream in = null; + try { + in = connection.createInputStream(destination); + LOG.debug("reading..."); + int count = 0; + while (-1 != in.read()) { + ++count; + } + LOG.debug("read " + count + " bytes"); + } finally { + if (in != null) { + in.close(); + } + } + + connection.close(); + broker.stop(); + } +} Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java Thu Feb 10 14:24:01 2011 @@ -53,11 +53,11 @@ import org.apache.activemq.management.JM import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.failover.FailoverTransport; import org.apache.activemq.transport.stomp.StompTransportFilter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ActiveMQXAConnectionFactoryTest extends CombinationTestSupport { - private static final Log LOG = LogFactory.getLog(ActiveMQXAConnectionFactoryTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ActiveMQXAConnectionFactoryTest.class); long txGenerator = System.currentTimeMillis(); public void testCopy() throws URISyntaxException, JMSException { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AutoFailTestSupport.java Thu Feb 10 14:24:01 2011 @@ -21,8 +21,8 @@ import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicBoolean; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Enforces a test case to run for only an allotted time to prevent them from @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac public abstract class AutoFailTestSupport extends TestCase { public static final int EXIT_SUCCESS = 0; public static final int EXIT_ERROR = 1; - private static final Log LOG = LogFactory.getLog(AutoFailTestSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(AutoFailTestSupport.class); private long maxTestTime = 5 * 60 * 1000; // 5 mins by default private Thread autoFailThread; @@ -79,7 +79,6 @@ public abstract class AutoFailTestSuppor // which usually means, it has finished its run. if (!isTestSuccess.get()) { LOG.error("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms."); - LOG.fatal("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms."); dumpAllThreads(getName()); System.exit(EXIT_ERROR); } Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CombinationTestSupport.java Thu Feb 10 14:24:01 2011 @@ -32,8 +32,8 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Poor mans way of getting JUnit to run a test case through a few different @@ -60,7 +60,7 @@ import org.apache.commons.logging.LogFac */ public abstract class CombinationTestSupport extends AutoFailTestSupport { - private static final Log LOG = LogFactory.getLog(CombinationTestSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(CombinationTestSupport.class); private HashMap comboOptions = new HashMap(); private boolean combosEvaluated; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java Thu Feb 10 14:24:01 2011 @@ -18,14 +18,14 @@ package org.apache.activemq; import javax.jms.JMSException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.1 $ */ public class CreateConsumerButDontStartConnectionWarningTest extends JmsQueueSendReceiveTest { - private static final transient Log LOG = LogFactory.getLog(CreateConsumerButDontStartConnectionWarningTest.class); + private static final transient Logger LOG = LoggerFactory.getLogger(CreateConsumerButDontStartConnectionWarningTest.class); @Override protected void startConnection() throws JMSException { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Thu Feb 10 14:24:01 2011 @@ -44,8 +44,8 @@ import junit.framework.Test; import org.apache.activemq.broker.jmx.DestinationViewMBean; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test cases used to test the JMS message consumer. @@ -54,7 +54,7 @@ import org.apache.commons.logging.LogFac */ public class JMSConsumerTest extends JmsTestSupport { - private static final Log LOG = LogFactory.getLog(JMSConsumerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JMSConsumerTest.class); public ActiveMQDestination destination; public int deliveryMode; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java Thu Feb 10 14:24:01 2011 @@ -20,15 +20,15 @@ import javax.jms.Message; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.4 $ */ public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest { - private static final Log LOG = LogFactory.getLog(JMSDurableTopicRedeliverTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JMSDurableTopicRedeliverTest.class); protected void setUp() throws Exception { durable = true; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java Thu Feb 10 14:24:01 2011 @@ -42,8 +42,8 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Benchmarks the broker by starting many consumer and producers against the @@ -54,7 +54,7 @@ import org.apache.commons.logging.LogFac * @version $Revision$ */ public class JmsBenchmark extends JmsTestSupport { - private static final transient Log LOG = LogFactory.getLog(JmsBenchmark.class); + private static final transient Logger LOG = LoggerFactory.getLogger(JmsBenchmark.class); private static final long SAMPLE_DELAY = Integer.parseInt(System.getProperty("SAMPLE_DELAY", "" + 1000 * 5)); private static final long SAMPLES = Integer.parseInt(System.getProperty("SAMPLES", "10")); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java Thu Feb 10 14:24:01 2011 @@ -26,14 +26,14 @@ import javax.jms.TextMessage; import javax.jms.Topic; import org.apache.activemq.test.JmsTopicSendReceiveTest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.5 $ */ public class JmsDurableTopicSendReceiveTest extends JmsTopicSendReceiveTest { - private static final Log LOG = LogFactory.getLog(JmsDurableTopicSendReceiveTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSendReceiveTest.class); protected Connection connection2; protected Session session2; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java Thu Feb 10 14:24:01 2011 @@ -20,14 +20,14 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.activemq.broker.BrokerService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision$ */ public class JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest extends JmsQueueSendReceiveTwoConnectionsTest { - private static final Log LOG = LogFactory.getLog(JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.class); private Queue errors = new ConcurrentLinkedQueue(); private int delayBeforeStartingBroker = 1000; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java Thu Feb 10 14:24:01 2011 @@ -17,8 +17,8 @@ package org.apache.activemq; import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.2 $ Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java Thu Feb 10 14:24:01 2011 @@ -28,14 +28,14 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.test.JmsResourceProvider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.2 $ */ public class JmsQueueTransactionTest extends JmsTransactionTestSupport { - private static final Log LOG = LogFactory.getLog(JmsQueueTransactionTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsQueueTransactionTest.class); /** * @see org.apache.activemq.JmsTransactionTestSupport#getJmsResourceProvider() Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java Thu Feb 10 14:24:01 2011 @@ -31,11 +31,11 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.broker.BrokerService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JmsRollbackRedeliveryTest extends AutoFailTestSupport { - protected static final Log LOG = LogFactory.getLog(JmsRollbackRedeliveryTest.class); + protected static final Logger LOG = LoggerFactory.getLogger(JmsRollbackRedeliveryTest.class); final int nbMessages = 10; final String destinationName = "Destination"; final String brokerUrl = "vm://localhost?create=false"; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java Thu Feb 10 14:24:01 2011 @@ -33,14 +33,14 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.7 $ */ public class JmsSendReceiveTestSupport extends TestSupport implements MessageListener { - private static final Log LOG = LogFactory.getLog(JmsSendReceiveTestSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveTestSupport.class); protected int messageCount = 100; protected String[] data; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java Thu Feb 10 14:24:01 2011 @@ -30,15 +30,15 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class JmsSendReceiveWithMessageExpirationTest extends TestSupport { - private static final Log LOG = LogFactory.getLog(JmsSendReceiveWithMessageExpirationTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveWithMessageExpirationTest.class); protected int messageCount = 100; protected String[] data; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java Thu Feb 10 14:24:01 2011 @@ -26,15 +26,15 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.4 $ */ public class JmsTopicRedeliverTest extends TestSupport { - private static final Log LOG = LogFactory.getLog(JmsTopicRedeliverTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRedeliverTest.class); protected Connection connection; protected Session session; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java Thu Feb 10 14:24:01 2011 @@ -32,14 +32,14 @@ import javax.jms.TemporaryTopic; import javax.jms.TextMessage; import org.apache.activemq.test.TestSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.3 $ */ public class JmsTopicRequestReplyTest extends TestSupport implements MessageListener { - private static final Log LOG = LogFactory.getLog(JmsTopicRequestReplyTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRequestReplyTest.class); protected boolean useAsyncConsume; private Connection serverConnection; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java Thu Feb 10 14:24:01 2011 @@ -28,14 +28,14 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.2 $ */ public class JmsTopicSelectorTest extends TestSupport { - private static final Log LOG = LogFactory.getLog(JmsTopicSelectorTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSelectorTest.class); protected Connection connection; protected Session session; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java Thu Feb 10 14:24:01 2011 @@ -23,14 +23,14 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import javax.jms.Topic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.3 $ */ public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport { - private static final Log LOG = LogFactory.getLog(JmsTopicSendReceiveTest.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class); protected Connection connection; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java Thu Feb 10 14:24:01 2011 @@ -37,15 +37,15 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.broker.BrokerService; import org.apache.activemq.test.JmsResourceProvider; import org.apache.activemq.test.TestSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.9 $ */ public abstract class JmsTransactionTestSupport extends TestSupport implements MessageListener { - private static final Log LOG = LogFactory.getLog(JmsTransactionTestSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(JmsTransactionTestSupport.class); private static final int MESSAGE_COUNT = 5; private static final String MESSAGE_TEXT = "message"; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeMessageTestSupport.java Thu Feb 10 14:24:01 2011 @@ -35,8 +35,8 @@ import org.apache.activemq.command.Activ import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.util.IdGenerator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 1.4 $ @@ -46,7 +46,7 @@ public class LargeMessageTestSupport ext protected static final int LARGE_MESSAGE_SIZE = 128 * 1024; protected static final int MESSAGE_COUNT = 100; - private static final Log LOG = LogFactory.getLog(LargeMessageTestSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(LargeMessageTestSupport.class); protected Connection producerConnection; protected Connection consumerConnection; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java Thu Feb 10 14:24:01 2011 @@ -44,15 +44,15 @@ import javax.jms.Session; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author rnewson */ public final class LargeStreamletTest extends TestCase { - private static final Log LOG = LogFactory.getLog(LargeStreamletTest.class); + private static final Logger LOG = LoggerFactory.getLogger(LargeStreamletTest.class); private static final String BROKER_URL = "vm://localhost?broker.persistent=false"; private static final int BUFFER_SIZE = 1 * 1024; private static final int MESSAGE_COUNT = 10 * 1024; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java Thu Feb 10 14:24:01 2011 @@ -38,8 +38,8 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.command.ActiveMQDestination; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Small burn test moves sends a moderate amount of messages through the broker, @@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac * @version $Revision$ */ public class LoadTestBurnIn extends JmsTestSupport { - private static final transient Log LOG = LogFactory.getLog(LoadTestBurnIn.class); + private static final transient Logger LOG = LoggerFactory.getLogger(LoadTestBurnIn.class); public ActiveMQDestination destination; public int deliveryMode; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageEvictionTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageEvictionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageEvictionTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageEvictionTest.java Thu Feb 10 14:24:01 2011 @@ -53,13 +53,13 @@ import org.apache.activemq.command.Activ import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.util.Wait; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.Test; public class MessageEvictionTest { - static final Log LOG = LogFactory.getLog(MessageEvictionTest.class); + static final Logger LOG = LoggerFactory.getLogger(MessageEvictionTest.class); private BrokerService broker; private ConnectionFactory connectionFactory; Connection connection; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java Thu Feb 10 14:24:01 2011 @@ -37,12 +37,12 @@ import junit.framework.TestCase; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MessageListenerRedeliveryTest extends TestCase { - private static final Log LOG = LogFactory.getLog(MessageListenerRedeliveryTest.class); + private static final Logger LOG = LoggerFactory.getLogger(MessageListenerRedeliveryTest.class); private Connection connection; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java Thu Feb 10 14:24:01 2011 @@ -35,12 +35,12 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQQueue; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // see: https://issues.apache.org/activemq/browse/AMQ-2651 public class OnePrefetchAsyncConsumerTest extends EmbeddedBrokerTestSupport { - private static final Log LOG = LogFactory.getLog(OnePrefetchAsyncConsumerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(OnePrefetchAsyncConsumerTest.class); private TestMutex testMutex; protected Connection connection; @@ -211,4 +211,4 @@ public class OnePrefetchAsyncConsumerTes boolean testCompleted = false; boolean testSuccessful = true; } -} \ No newline at end of file +} Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java Thu Feb 10 14:24:01 2011 @@ -38,12 +38,12 @@ import org.apache.activemq.command.Activ import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.transport.tcp.TcpTransport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // see: https://issues.apache.org/activemq/browse/AMQ-2668 public class PerDestinationStoreLimitTest extends JmsTestSupport { - static final Log LOG = LogFactory.getLog(PerDestinationStoreLimitTest.class); + static final Logger LOG = LoggerFactory.getLogger(PerDestinationStoreLimitTest.class); final String oneKb = new String(new byte[1024]); ActiveMQDestination queueDest = new ActiveMQQueue("PerDestinationStoreLimitTest.Queue"); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java Thu Feb 10 14:24:01 2011 @@ -37,11 +37,11 @@ import org.apache.activemq.broker.region import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.transport.tcp.TcpTransport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ProducerFlowControlTest extends JmsTestSupport { - static final Log LOG = LogFactory.getLog(ProducerFlowControlTest.class); + static final Logger LOG = LoggerFactory.getLogger(ProducerFlowControlTest.class); ActiveMQQueue queueA = new ActiveMQQueue("QUEUE.A"); ActiveMQQueue queueB = new ActiveMQQueue("QUEUE.B"); protected TransportConnector connector; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java Thu Feb 10 14:24:01 2011 @@ -22,15 +22,15 @@ import javax.jms.JMSException; import javax.jms.Session; import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * * @version $Revision$ */ public class ReconnectWithSameClientIDTest extends EmbeddedBrokerTestSupport { - private static final Log LOG = LogFactory.getLog(ReconnectWithSameClientIDTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ReconnectWithSameClientIDTest.class); protected Connection connection; protected boolean transacted; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/SpringTestSupport.java Thu Feb 10 14:24:01 2011 @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Set; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractApplicationContext; /** Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/TestSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/TestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/TestSupport.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/TestSupport.java Thu Feb 10 14:24:01 2011 @@ -41,8 +41,8 @@ import org.apache.activemq.store.amq.AMQ import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Useful base class for unit test cases Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java Thu Feb 10 14:24:01 2011 @@ -28,15 +28,15 @@ import javax.jms.TextMessage; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.spring.SpringConsumer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision$ */ public class ZeroPrefetchConsumerTest extends EmbeddedBrokerTestSupport { - private static final Log LOG = LogFactory.getLog(ZeroPrefetchConsumerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ZeroPrefetchConsumerTest.class); protected Connection connection; protected Queue queue; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java Thu Feb 10 14:24:01 2011 @@ -29,15 +29,15 @@ import javax.jms.Session; import org.apache.activemq.EmbeddedBrokerTestSupport; import org.apache.activemq.ReconnectWithSameClientIDTest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * * @version $Revision$ */ public class ConsumerListenerTest extends EmbeddedBrokerTestSupport implements ConsumerListener { - private static final Log LOG = LogFactory.getLog(ConsumerListenerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ConsumerListenerTest.class); protected Session consumerSession1; protected Session consumerSession2; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java Thu Feb 10 14:24:01 2011 @@ -30,8 +30,8 @@ import org.apache.activemq.broker.Broker import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; * @version $Revision$ */ public class DestinationListenerTest extends EmbeddedBrokerTestSupport implements DestinationListener { - private static final transient Log LOG = LogFactory.getLog(DestinationListenerTest.class); + private static final transient Logger LOG = LoggerFactory.getLogger(DestinationListenerTest.class); protected ActiveMQConnection connection; protected ActiveMQQueue sampleQueue = new ActiveMQQueue("foo.bar"); protected ActiveMQTopic sampleTopic = new ActiveMQTopic("cheese"); @@ -126,4 +126,4 @@ public class DestinationListenerTest ext } super.tearDown(); } -} \ No newline at end of file +} Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.java Thu Feb 10 14:24:01 2011 @@ -32,13 +32,13 @@ import org.apache.activemq.broker.region import org.apache.activemq.broker.region.policy.DispatchPolicy; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MasterSlaveTempQueueMemoryTest extends TempQueueMemoryTest { - private static final transient Log LOG = LogFactory.getLog(MasterSlaveTempQueueMemoryTest.class); + private static final transient Logger LOG = LoggerFactory.getLogger(MasterSlaveTempQueueMemoryTest.class); String masterBindAddress = "tcp://localhost:61616"; String slaveBindAddress = "tcp://localhost:62616"; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java Thu Feb 10 14:24:01 2011 @@ -26,15 +26,15 @@ import javax.jms.MessageProducer; import javax.jms.Session; import org.apache.activemq.EmbeddedBrokerTestSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * * @version $Revision: 359679 $ */ public class ProducerListenerTest extends EmbeddedBrokerTestSupport implements ProducerListener { - private static final Log LOG = LogFactory.getLog(ProducerListenerTest.class); + private static final Logger LOG = LoggerFactory.getLogger(ProducerListenerTest.class); protected Session consumerSession1; protected Session consumerSession2; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java Thu Feb 10 14:24:01 2011 @@ -33,14 +33,14 @@ import org.apache.activemq.EmbeddedBroke import org.apache.activemq.broker.region.RegionBroker; import org.apache.activemq.command.ActiveMQTempQueue; import org.apache.activemq.command.ActiveMQTempTopic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Revision: 397249 $ */ public class TempDestDeleteTest extends EmbeddedBrokerTestSupport implements ConsumerListener { - private static final Log LOG = LogFactory.getLog(TempDestDeleteTest.class); + private static final Logger LOG = LoggerFactory.getLogger(TempDestDeleteTest.class); protected int consumerCounter; protected ConsumerEventSource topicConsumerEventSource; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java Thu Feb 10 14:24:01 2011 @@ -1,105 +1,105 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.blob; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.InputStream; - -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; - -import junit.framework.Assert; - -import org.apache.activemq.ActiveMQSession; -import org.apache.activemq.BlobMessage; -import org.apache.activemq.EmbeddedBrokerTestSupport; -import org.apache.activemq.command.ActiveMQBlobMessage; -import org.apache.activemq.util.IOHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - - -public class FilesystemBlobTest extends EmbeddedBrokerTestSupport { - private static final Log LOG = LogFactory.getLog(FilesystemBlobTest.class); - - private Connection connection; - private String tmpDir = System.getProperty("user.dir") + "/target/FilesystemBlobTest"; - public void setUp() throws Exception { - super.setUp(); - // replace \ with / to let it work on windows too - String fileUrl = "file:///" +tmpDir.replaceAll("\\\\", "/"); - LOG.info("Using file: " + fileUrl); - bindAddress = "vm://localhost?jms.blobTransferPolicy.defaultUploadUrl=" + fileUrl; - - connectionFactory = createConnectionFactory(); - - connection = createConnection(); - connection.start(); - } - - - public void testBlobFile() throws Exception { - // first create Message - File file = File.createTempFile("amq-data-file-", ".dat"); - // lets write some data - String content = "hello world " + System.currentTimeMillis(); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - writer.append(content); - writer.close(); - - ActiveMQSession session = (ActiveMQSession) connection.createSession( - false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(destination); - MessageConsumer consumer = session.createConsumer(destination); - BlobMessage message = session.createBlobMessage(file); - - producer.send(message); - Thread.sleep(1000); - - // check message send - Message msg = consumer.receive(1000); - Assert.assertTrue(msg instanceof ActiveMQBlobMessage); - - InputStream input = ((ActiveMQBlobMessage) msg).getInputStream(); - StringBuilder b = new StringBuilder(); - int i = input.read(); - while (i != -1) { - b.append((char) i); - i = input.read(); - } - input.close(); - File uploaded = new File(tmpDir, msg.getJMSMessageID().toString().replace(":", "_")); - Assert.assertEquals(content, b.toString()); - assertTrue(uploaded.exists()); - ((ActiveMQBlobMessage)msg).deleteFile(); - assertFalse(uploaded.exists()); - } - - protected void tearDown() throws Exception { - if (connection != null) { - connection.stop(); - } - super.tearDown(); - - IOHelper.deleteFile(new File(tmpDir)); - } -} \ No newline at end of file +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.blob; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.InputStream; + +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; + +import junit.framework.Assert; + +import org.apache.activemq.ActiveMQSession; +import org.apache.activemq.BlobMessage; +import org.apache.activemq.EmbeddedBrokerTestSupport; +import org.apache.activemq.command.ActiveMQBlobMessage; +import org.apache.activemq.util.IOHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class FilesystemBlobTest extends EmbeddedBrokerTestSupport { + private static final Logger LOG = LoggerFactory.getLogger(FilesystemBlobTest.class); + + private Connection connection; + private String tmpDir = System.getProperty("user.dir") + "/target/FilesystemBlobTest"; + public void setUp() throws Exception { + super.setUp(); + // replace \ with / to let it work on windows too + String fileUrl = "file:///" +tmpDir.replaceAll("\\\\", "/"); + LOG.info("Using file: " + fileUrl); + bindAddress = "vm://localhost?jms.blobTransferPolicy.defaultUploadUrl=" + fileUrl; + + connectionFactory = createConnectionFactory(); + + connection = createConnection(); + connection.start(); + } + + + public void testBlobFile() throws Exception { + // first create Message + File file = File.createTempFile("amq-data-file-", ".dat"); + // lets write some data + String content = "hello world " + System.currentTimeMillis(); + BufferedWriter writer = new BufferedWriter(new FileWriter(file)); + writer.append(content); + writer.close(); + + ActiveMQSession session = (ActiveMQSession) connection.createSession( + false, Session.AUTO_ACKNOWLEDGE); + MessageProducer producer = session.createProducer(destination); + MessageConsumer consumer = session.createConsumer(destination); + BlobMessage message = session.createBlobMessage(file); + + producer.send(message); + Thread.sleep(1000); + + // check message send + Message msg = consumer.receive(1000); + Assert.assertTrue(msg instanceof ActiveMQBlobMessage); + + InputStream input = ((ActiveMQBlobMessage) msg).getInputStream(); + StringBuilder b = new StringBuilder(); + int i = input.read(); + while (i != -1) { + b.append((char) i); + i = input.read(); + } + input.close(); + File uploaded = new File(tmpDir, msg.getJMSMessageID().toString().replace(":", "_")); + Assert.assertEquals(content, b.toString()); + assertTrue(uploaded.exists()); + ((ActiveMQBlobMessage)msg).deleteFile(); + assertFalse(uploaded.exists()); + } + + protected void tearDown() throws Exception { + if (connection != null) { + connection.stop(); + } + super.tearDown(); + + IOHelper.deleteFile(new File(tmpDir)); + } +} Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java Thu Feb 10 14:24:01 2011 @@ -29,8 +29,8 @@ import org.apache.activemq.command.Messa import org.apache.activemq.command.MessageAck; import org.apache.activemq.command.ProducerInfo; import org.apache.activemq.command.SessionInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * BrokerBenchmark is used to get an idea of the raw performance of a broker. @@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac * @version $Revision: 1.9 $ */ public class BrokerBenchmark extends BrokerTestSupport { - private static final transient Log LOG = LogFactory.getLog(BrokerBenchmark.class); + private static final transient Logger LOG = LoggerFactory.getLogger(BrokerBenchmark.class); public int produceCount = Integer.parseInt(System.getProperty("PRODUCE_COUNT", "10000")); public ActiveMQDestination destination; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java Thu Feb 10 14:24:01 2011 @@ -34,14 +34,14 @@ import org.apache.activemq.ActiveMQConne import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("unchecked") public class NioQueueSubscriptionTest extends QueueSubscriptionTest implements ExceptionListener { - protected static final Log LOG = LogFactory.getLog(NioQueueSubscriptionTest.class); + protected static final Logger LOG = LoggerFactory.getLogger(NioQueueSubscriptionTest.class); private Map exceptions = Collections.synchronizedMap(new HashMap());