activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1069405 [11/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/active...
Date Thu, 10 Feb 2011 14:24:21 GMT
Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
(original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.activemq.web.DestinationFacade;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
 import org.springframework.web.servlet.HandlerExecutionChain;
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.H
  * @version $Revision$
  */
 public class BindingBeanNameUrlHandlerMapping extends BeanNameUrlHandlerMapping {
-    private static final transient Log LOG = LogFactory.getLog(BindingBeanNameUrlHandlerMapping.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(BindingBeanNameUrlHandlerMapping.class);
 
     protected Object getHandlerInternal(HttpServletRequest request) throws Exception {
         Object object = super.getHandlerInternal(request);

Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Thu Feb 10 14:24:01 2011
@@ -96,6 +96,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <!-- web container -->
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java (original)
+++ activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java Thu
Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import org.apache.activemq.transport.sto
 import java.lang.Thread;
 import java.net.SocketTimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.*;
@@ -39,7 +39,7 @@ import javax.jms.Message;
 import javax.jms.TextMessage;
 
 public class AjaxTest extends JettyTestSupport {
-    private static final Log LOG = LogFactory.getLog(AjaxTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AjaxTest.class);
     
     private class AjaxTestContentExchange extends ContentExchange  {
         private HashMap<String,String> headers;

Modified: activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java
(original)
+++ activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java
Thu Feb 10 14:24:01 2011
@@ -29,15 +29,15 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 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.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 public class JettyTestSupport extends TestCase {
-    private static final Log LOG = LogFactory.getLog(JettyTestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JettyTestSupport.class);
     
     BrokerService broker;
     Server server;

Modified: activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java (original)
+++ activemq/trunk/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java Thu
Feb 10 14:24:01 2011
@@ -22,15 +22,15 @@ import javax.management.ObjectName;
 import org.apache.activemq.broker.jmx.DestinationViewMBean;
 import org.apache.activemq.broker.jmx.SubscriptionViewMBean;
 import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.client.ContentExchange;
 import org.eclipse.jetty.client.HttpClient;
 
 import java.util.Set;
 
 public class RestTest extends JettyTestSupport {
-    private static final Log LOG = LogFactory.getLog(RestTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RestTest.class);
 	
 	public void testConsume() throws Exception {
 	    producer.send(session.createTextMessage("test"));

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java Thu
Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.jms.MessageConsumer;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.activemq.MessageAvailableListener;
 
@@ -33,7 +33,7 @@ import java.util.LinkedList;
  * Listen for available messages and wakeup any continuations.
  */
 public class AjaxListener implements MessageAvailableListener {
-    private static final Log LOG = LogFactory.getLog(AjaxListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AjaxListener.class);
     
     private long maximumReadTimeout;
     private AjaxWebClient client;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java Thu
Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.Date;
 import javax.jms.MessageConsumer;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.activemq.MessageAvailableConsumer;
 
@@ -32,7 +32,7 @@ import org.apache.activemq.MessageAvaila
  * Collection of all data needed to fulfill requests from a single web client.
  */
 public class AjaxWebClient extends WebClient {
-    private static final Log LOG = LogFactory.getLog(AjaxWebClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AjaxWebClient.class);
     
     // an instance which has not been accessed in this many milliseconds can be removed.
     final long expireAfter = 60 * 1000;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java Thu
Feb 10 14:24:01 2011
@@ -18,8 +18,8 @@ package org.apache.activemq.web;
 
 import org.apache.activemq.broker.util.AuditLogEntry;
 import org.apache.activemq.broker.util.AuditLogService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -27,7 +27,7 @@ import java.io.IOException;
 
 public class AuditFilter implements Filter {
 
-    private static final Log LOG = LogFactory.getLog("org.apache.activemq.audit");
+    private static final Logger LOG = LoggerFactory.getLogger("org.apache.activemq.audit");
 
     private boolean audit;
     private AuditLogService auditLog;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
(original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import javax.servlet.http.HttpSession;
 
 import org.apache.activemq.MessageAvailableConsumer;
 import org.apache.activemq.MessageAvailableListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 
@@ -63,7 +63,7 @@ import org.eclipse.jetty.continuation.Co
  * @version $Revision: 1.1.1.1 $
  */
 public class MessageListenerServlet extends MessageServletSupport {
-    private static final Log LOG = LogFactory.getLog(MessageListenerServlet.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageListenerServlet.class);
     
     private String readTimeoutParameter = "timeout";
     private long defaultReadTimeout = -1;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
(original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import org.apache.activemq.MessageAvaila
 import org.apache.activemq.MessageAvailableListener;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 
@@ -55,7 +55,7 @@ public class MessageServlet extends Mess
 
     private static final long serialVersionUID = 8737914695188481219L;
 
-    private static final Log LOG = LogFactory.getLog(MessageServlet.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageServlet.class);
 
     private String readTimeoutParameter = "readTimeout";
     private long defaultReadTimeout = -1;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
(original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import javax.servlet.http.HttpServletReq
 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;
 
 /**
  * A useful base class for any JMS related servlet; there are various ways to
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class MessageServletSupport extends HttpServlet {
 
-    private static final transient Log LOG = LogFactory.getLog(MessageServletSupport.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(MessageServletSupport.class);
 
     private boolean defaultTopicFlag = true;
     private Destination defaultDestination;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java
(original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java
Thu Feb 10 14:24:01 2011
@@ -38,8 +38,8 @@ import org.apache.activemq.broker.jmx.Ma
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.web.config.WebConsoleConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link BrokerFacade} which uses a JMX-Connection to communicate with a
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
  */
 public class RemoteJMXBrokerFacade extends BrokerFacadeSupport {
     
-    private static final transient Log LOG = LogFactory.getLog(RemoteJMXBrokerFacade.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(RemoteJMXBrokerFacade.class);
     
     private String brokerName;
     private JMXConnector connector;

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java
(original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java
Thu Feb 10 14:24:01 2011
@@ -17,15 +17,15 @@
 
 package org.apache.activemq.web;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
 
 public class SessionListener implements HttpSessionListener {
-    private static final Log LOG = LogFactory.getLog(SessionListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SessionListener.class);
 
     public void sessionCreated(HttpSessionEvent se) {
     }

Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java Thu Feb
10 14:24:01 2011
@@ -53,8 +53,8 @@ import org.apache.activemq.pool.PooledCo
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a messaging client used from inside a web container typically
@@ -72,7 +72,7 @@ public class WebClient implements HttpSe
     public static final String BROKER_URL_INIT_PARAM = "org.apache.activemq.brokerURL";
     public static final String SELECTOR_NAME = "org.apache.activemq.selectorName";
 
-    private static final Log LOG = LogFactory.getLog(WebClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebClient.class);
 
     private static transient ConnectionFactory factory;
 

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Thu Feb 10 14:24:01 2011
@@ -124,6 +124,11 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java
(original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java
Thu Feb 10 14:24:01 2011
@@ -69,8 +69,8 @@ import org.apache.activemq.transport.xmp
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.IntSequenceGenerator;
 import org.apache.activemq.util.LongSequenceGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jabber.protocol.disco_info.Feature;
 import org.jabber.protocol.disco_info.Identity;
 import org.jabber.protocol.disco_items.Item;
@@ -80,7 +80,7 @@ import org.jabber.protocol.muc_user.X;
  * TODO lots of this code could be shared with Stomp
  */
 public class ProtocolConverter {
-    private static final transient Log LOG = LogFactory.getLog(ProtocolConverter.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(ProtocolConverter.class);
     private static final IdGenerator CONNECTION_ID_GENERATOR = new IdGenerator();
     private static final IdGenerator CLIENT_ID_GENERATOR = new IdGenerator("xmpp");
 

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
(original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
Thu Feb 10 14:24:01 2011
@@ -49,8 +49,8 @@ import org.apache.activemq.transport.tcp
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 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;
 import org.jabber.etherx.streams.Features;
 
 /**
@@ -59,7 +59,7 @@ import org.jabber.etherx.streams.Feature
 public class XmppTransport extends TcpTransport {
     protected static final QName ATTRIBUTE_TO = new QName("to");
 
-    private static final transient Log LOG = LogFactory.getLog(XmppTransport.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(XmppTransport.class);
 
     protected OutputStream outputStream;
     protected InputStream inputStream;

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
(original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.util.ByteArra
 import org.apache.activemq.util.ByteArrayOutputStream;
 import org.apache.activemq.util.ByteSequence;
 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;
 
 /**
  * A wire format which uses XMPP format of messages

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Thu Feb 10 14:24:01 2011
@@ -291,7 +291,11 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jcl</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
     <dependency>
       <groupId>opensymphony</groupId>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Thu Feb 10 14:24:01 2011
@@ -146,7 +146,8 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-        <include>commons-logging:commons-logging</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:jcl-over-slf4j</include>
         <include>${pom.groupId}:activemq-core</include>
         <include>${pom.groupId}:activemq-console</include>
         <include>${pom.groupId}:activemq-jaas</include>
@@ -191,6 +192,7 @@
         <include>commons-codec:commons-codec</include>
         <include>commons-net:commons-net</include>
         <include>commons-lang:commons-lang</include>
+        <include>org.slf4j:slf4j-log4j12</include>
         <include>log4j:log4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
@@ -224,8 +226,6 @@
         <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
         <include>org.eclipse.jetty:jetty-websocket</include>
         <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-jcl</include>
 
         <!-- JSP support -->
         <include>org.mortbay.jetty:jsp-2.1-glassfish</include>

Modified: activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
(original)
+++ activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
Thu Feb 10 14:24:01 2011
@@ -33,12 +33,12 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.transport.stomp.StompConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BrokerXmlConfigStartTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(BrokerXmlConfigStartTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BrokerXmlConfigStartTest.class);
     Properties secProps;
     public void testStartBrokerUsingXmlConfig() throws Exception {
         doTestStartBrokerUsingXmlConfig("xbean:src/release/conf/activemq.xml");

Modified: activemq/trunk/kahadb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/kahadb/pom.xml (original)
+++ activemq/trunk/kahadb/pom.xml Thu Feb 10 14:24:01 2011
@@ -42,36 +42,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
     
     <dependency>
       <groupId>junit</groupId>

Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java Thu Feb 10
14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.page.Page;
 import org.apache.kahadb.page.PageFile;
 import org.apache.kahadb.page.Transaction;
@@ -59,7 +59,7 @@ import org.apache.kahadb.util.Marshaller
  */
 public class BTreeIndex<Key,Value> implements Index<Key,Value> {
 
-    private static final Log LOG = LogFactory.getLog(BTreeIndex.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BTreeIndex.class);
 
     /**
      * Interface used to determine the simple prefix of two keys.

Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java Thu Feb 10
14:24:01 2011
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.page.Page;
 import org.apache.kahadb.page.PageFile;
 import org.apache.kahadb.page.Transaction;
@@ -43,7 +43,7 @@ public class HashIndex<Key,Value> implem
     public static final int OPEN_STATE = 2;
 
 
-    private static final Log LOG = LogFactory.getLog(HashIndex.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HashIndex.class);
 
     public static final int DEFAULT_BIN_CAPACITY;
     public static final int DEFAULT_MAXIMUM_BIN_CAPACITY;

Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java Thu Feb 10
14:24:01 2011
@@ -36,8 +36,8 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.journal.DataFileAppender.WriteCommand;
 import org.apache.kahadb.journal.DataFileAppender.WriteKey;
 import org.apache.kahadb.util.ByteSequence;
@@ -89,7 +89,7 @@ public class Journal {
     public static final int PREFERED_DIFF = 1024 * 512;
     public static final int DEFAULT_MAX_WRITE_BATCH_SIZE = 1024 * 1024 * 4;
     
-    private static final Log LOG = LogFactory.getLog(Journal.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Journal.class);
 
     protected final Map<WriteKey, WriteCommand> inflightWrites = new ConcurrentHashMap<WriteKey,
WriteCommand>();
 

Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Thu Feb 10 14:24:01
2011
@@ -34,8 +34,8 @@ import java.util.concurrent.atomic.Atomi
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.util.DataByteArrayOutputStream;
 import org.apache.kahadb.util.IOExceptionSupport;
 import org.apache.kahadb.util.IOHelper;
@@ -68,7 +68,7 @@ public class PageFile {
     private static final int PAGE_FILE_HEADER_SIZE=1024*4;
 
     // Recovery header is (long offset)
-    private static final Log LOG = LogFactory.getLog(PageFile.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PageFile.class);
 
     // A PageFile will use a couple of files in this directory
     private File directory;

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Feb 10 14:24:01 2011
@@ -72,12 +72,13 @@
     <jxta-version>2.0</jxta-version>
     <karaf-version>2.1.0</karaf-version>
     <log4j-version>1.2.14</log4j-version>
-    <nlog4j-version>1.5.2</nlog4j-version>
+    <nlog4j-version>1.5.2</nlog4j-version> <!-- TODO what's this -->
     <org-apache-derby-version>10.1.3.1</org-apache-derby-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>0.8</rome-version>
-    <slf4j-version>1.5.0</slf4j-version>
+    <!-- pax-logging (osgi) dont support slf4j 1.6.x -->
+    <slf4j-version>1.5.11</slf4j-version>
     <spring-oxm-version>1.5.8</spring-oxm-version>
     <stax-api-version>1.0.1</stax-api-version>
     <stax-version>1.2.0</stax-version>
@@ -356,11 +357,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging-api</artifactId>
-        <version>${commons-logging-version}</version>
-      </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
@@ -915,12 +911,12 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jcl</artifactId>
+        <artifactId>slf4j-log4j12</artifactId>
         <version>${slf4j-version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <artifactId>jcl-over-slf4j</artifactId>
         <version>${slf4j-version}</version>
       </dependency>
       <dependency>



Mime
View raw message