activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1069405 [10/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-fileserver/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/pom.xml (original)
+++ activemq/trunk/activemq-fileserver/pom.xml Thu Feb 10 14:24:01 2011
@@ -61,8 +61,8 @@
   <dependencies>
   
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     
     <!-- web container -->
@@ -98,6 +98,18 @@
       <artifactId>jetty-all-server</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
     
   </dependencies>
 

Modified: activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java (original)
+++ activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java Thu Feb 10 14:24:01 2011
@@ -27,13 +27,13 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class FilenameGuardFilter implements Filter {
 
-    private static final Log LOG = LogFactory.getLog(FilenameGuardFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FilenameGuardFilter.class);
     
     public void destroy() {
         // nothing to destroy

Modified: activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java (original)
+++ activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import javax.servlet.UnavailableExceptio
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -50,7 +50,7 @@ import org.apache.commons.logging.LogFac
  * @author Aleksi Kallio
  */
 public class RestFilter implements Filter {
-    private static final Log LOG = LogFactory.getLog(RestFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RestFilter.class);
 
     private static final String HTTP_HEADER_DESTINATION = "Destination";
     private static final String HTTP_METHOD_MOVE = "MOVE";

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

Modified: activemq/trunk/activemq-jaas/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/pom.xml (original)
+++ activemq/trunk/activemq-jaas/pom.xml Thu Feb 10 14:24:01 2011
@@ -70,10 +70,6 @@
 
   <dependencies>
     <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-      </dependency>
-    <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <scope>test</scope>
@@ -106,17 +102,15 @@
     <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
+        <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${nlog4j-version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>${nlog4j-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java (original)
+++ activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java Thu Feb 10 14:24:01 2011
@@ -33,8 +33,8 @@ import javax.security.auth.login.FailedL
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A LoginModule that allows for authentication based on SSL certificates.
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class CertificateLoginModule implements LoginModule {
 
-    private static final Log LOG = LogFactory.getLog(CertificateLoginModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CertificateLoginModule.class);
 
     private CallbackHandler callbackHandler;
     private Subject subject;

Modified: activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GuestLoginModule.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GuestLoginModule.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GuestLoginModule.java (original)
+++ activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GuestLoginModule.java Thu Feb 10 14:24:01 2011
@@ -17,8 +17,8 @@
 
 package org.apache.activemq.jaas;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
@@ -41,7 +41,7 @@ public class GuestLoginModule implements
     private static final String GUEST_USER = "org.apache.activemq.jaas.guest.user";
     private static final String GUEST_GROUP = "org.apache.activemq.jaas.guest.group";
 
-    private static final Log LOG = LogFactory.getLog(GuestLoginModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GuestLoginModule.class);
     
 
     private String userName = "guest";
@@ -101,4 +101,4 @@ public class GuestLoginModule implements
         }
         return true;
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java (original)
+++ activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java Thu Feb 10 14:24:01 2011
@@ -49,8 +49,8 @@ import javax.security.auth.login.FailedL
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev: $ $Date: $
@@ -72,7 +72,7 @@ public class LDAPLoginModule implements 
     private static final String ROLE_SEARCH_SUBTREE = "roleSearchSubtree";
     private static final String USER_ROLE_NAME = "userRoleName";
 
-    private static Log log = LogFactory.getLog(LDAPLoginModule.class);
+    private static Logger log = LoggerFactory.getLogger(LDAPLoginModule.class);
 
     protected DirContext context;
 
@@ -165,7 +165,7 @@ public class LDAPLoginModule implements 
         try {
             context.close();
         } catch (Exception e) {
-            log.error(e);
+            log.error(e.toString());
         }
     }
 
@@ -382,7 +382,7 @@ public class LDAPLoginModule implements 
             context = new InitialDirContext(env);
 
         } catch (NamingException e) {
-            log.error(e);
+            log.error(e.toString());
             throw e;
         }
         return context;

Modified: activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java (original)
+++ activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,8 @@ import javax.security.auth.login.FailedL
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev: $ $Date: $
@@ -46,7 +46,7 @@ public class PropertiesLoginModule imple
     private static final String USER_FILE = "org.apache.activemq.jaas.properties.user";
     private static final String GROUP_FILE = "org.apache.activemq.jaas.properties.group";
 
-    private static final Log LOG = LogFactory.getLog(PropertiesLoginModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PropertiesLoginModule.class);
 
     private Subject subject;
     private CallbackHandler callbackHandler;

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Thu Feb 10 14:24:01 2011
@@ -124,7 +124,7 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -172,6 +172,11 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
     	<groupId>org.springframework.ws</groupId>
     	<artifactId>spring-oxm-tiger</artifactId>
     	<optional>true</optional>

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java Thu Feb 10 14:24:01 2011
@@ -27,12 +27,12 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DiscoveryRegistryServlet extends HttpServlet {
     
-    private static final Log LOG = LogFactory.getLog(HTTPDiscoveryAgent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HTTPDiscoveryAgent.class);
     long maxKeepAge = 1000*60*60; // 1 hour.
     ConcurrentHashMap<String, ConcurrentHashMap<String, Long>> serviceGroups = new ConcurrentHashMap<String, ConcurrentHashMap<String, Long>>();
     

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java Thu Feb 10 14:24:01 2011
@@ -35,12 +35,12 @@ import org.apache.commons.httpclient.Htt
 import org.apache.commons.httpclient.methods.DeleteMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HTTPDiscoveryAgent implements DiscoveryAgent {
     
-    private static final Log LOG = LogFactory.getLog(HTTPDiscoveryAgent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HTTPDiscoveryAgent.class);
     
     private String registryURL = "http://localhost:8080/discovery-registry/default";
     private HttpClient httpClient = new HttpClient();

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import org.apache.commons.httpclient.met
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A HTTP {@link org.apache.activemq.transport.TransportChannel} which uses the
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
 public class HttpClientTransport extends HttpTransportSupport {
 
     public static final int MAX_CLIENT_TIMEOUT = 30000;
-    private static final Log LOG = LogFactory.getLog(HttpClientTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpClientTransport.class);
     private static final IdGenerator CLIENT_ID_GENERATOR = new IdGenerator();
 
     private HttpClient sendHttpClient;

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java Thu Feb 10 14:24:01 2011
@@ -33,8 +33,8 @@ import org.apache.activemq.util.ByteSequ
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.IOExceptionSupport;
 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;
 
 /**
  * @version $Revision$
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
 @Deprecated
 public class HttpTransport extends HttpTransportSupport {
     
-    private static final Log LOG = LogFactory.getLog(HttpTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpTransport.class);
     
     private HttpURLConnection sendConnection;
     private HttpURLConnection receiveConnection;

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,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)
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  */
 public class HttpTransportFactory extends TransportFactory {
     
-    private static final Log LOG = LogFactory.getLog(HttpTransportFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpTransportFactory.class);
 
     public TransportServer doBind(URI location) throws IOException {
         try {

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java Thu Feb 10 14:24:01 2011
@@ -39,8 +39,8 @@ import org.apache.activemq.transport.uti
 import org.apache.activemq.transport.xstream.XStreamWireFormat;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A servlet which handles server side HTTP transport, delegating to the
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
  */
 public class HttpTunnelServlet extends HttpServlet {
     private static final long serialVersionUID = -3826714430767484333L;
-    private static final Log LOG = LogFactory.getLog(HttpTunnelServlet.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpTunnelServlet.class);
 
     private TransportAcceptListener listener;
     private HttpTransportFactory transportFactory;

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java Thu Feb 10 14:24:01 2011
@@ -32,12 +32,12 @@ import org.apache.activemq.advisory.Cons
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 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 AMQ2764Test extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(AMQ2764Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2764Test.class);
 
     private BrokerService brokerOne;
     private BrokerService brokerTwo;

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java Thu Feb 10 14:24:01 2011
@@ -35,13 +35,20 @@ public class HttpClientReconnectTest ext
 	ActiveMQConnectionFactory factory;
 
 	protected void setUp() throws Exception {
+        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
+        System.setProperty("javax.net.ssl.trustStorePassword", "password");
+        System.setProperty("javax.net.ssl.trustStoreType", "jks");
+        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
+        System.setProperty("javax.net.ssl.keyStorePassword", "password");
+        System.setProperty("javax.net.ssl.keyStoreType", "jks");
+
 		broker = new BrokerService();
-		broker.addConnector("http://localhost:61666?trace=true");
+		broker.addConnector("https://localhost:61666?trace=true");
 		broker.setPersistent(false);
 		broker.setUseJmx(false);
 		broker.deleteAllMessages();
 		broker.start();
-		factory = new ActiveMQConnectionFactory("http://localhost:61666?trace=true");
+		factory = new ActiveMQConnectionFactory("https://localhost:61666?trace=true&soTimeout=1000");
 	}
 
 	protected void tearDown() throws Exception {

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java Thu Feb 10 14:24:01 2011
@@ -22,13 +22,13 @@ import java.net.URL;
 import javax.net.SocketFactory;
 
 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 static junit.framework.Assert.assertTrue;
 
 public class WaitForJettyListener {
-    private static final Log LOG = LogFactory.getLog(WaitForJettyListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WaitForJettyListener.class);
     
     public static void waitForJettySocketToAccept(String bindLocation) throws Exception {
         final URL url = new URL(bindLocation);

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java Thu Feb 10 14:24:01 2011
@@ -21,14 +21,14 @@ import java.io.IOException;
 import org.apache.activemq.command.Command;
 import org.apache.activemq.command.MessageTest;
 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;
 
 /**
  * @version $Revision$
  */
 public class XStreamWireFormatTest extends MessageTest {
-    private static final Log LOG = LogFactory.getLog(XStreamWireFormatTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XStreamWireFormatTest.class);
 
     public void assertBeanMarshalls(Object original) throws IOException {
         super.assertBeanMarshalls(original);

Modified: activemq/trunk/activemq-pool/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/pom.xml (original)
+++ activemq/trunk/activemq-pool/pom.xml Thu Feb 10 14:24:01 2011
@@ -48,8 +48,8 @@
     <!-- Required Dependencies -->
     <!-- =============================== -->
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -90,6 +90,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
     	<groupId>log4j</groupId>
     	<artifactId>log4j</artifactId>
     	<scope>test</scope>

Modified: activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/ActiveMQResourceManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/ActiveMQResourceManager.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/ActiveMQResourceManager.java (original)
+++ activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/ActiveMQResourceManager.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import javax.jms.Session;
 import javax.jms.JMSException;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQSession;
@@ -60,7 +60,7 @@ import org.apache.geronimo.transaction.m
  */
 public class ActiveMQResourceManager {
 
-    private static final Log LOGGER = LogFactory.getLog(ActiveMQResourceManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ActiveMQResourceManager.class);
 
     private String resourceName;
 

Modified: activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java (original)
+++ activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
 import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.pool.ObjectPoolFactory;
 import org.apache.commons.pool.impl.GenericObjectPoolFactory;
 
@@ -58,7 +58,7 @@ import org.apache.commons.pool.impl.Gene
  * @version $Revision: 1.1 $
  */
 public class PooledConnectionFactory implements ConnectionFactory, Service {
-    private static final transient Log LOG = LogFactory.getLog(PooledConnectionFactory.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(PooledConnectionFactory.class);
     private ConnectionFactory connectionFactory;
     private Map<ConnectionKey, LinkedList<ConnectionPool>> cache = new HashMap<ConnectionKey, LinkedList<ConnectionPool>>();
     private ObjectPoolFactory poolFactory;

Modified: activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledSession.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledSession.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledSession.java (original)
+++ activemq/trunk/activemq-pool/src/main/java/org/apache/activemq/pool/PooledSession.java Thu Feb 10 14:24:01 2011
@@ -51,14 +51,14 @@ import org.apache.activemq.ActiveMQQueue
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.ActiveMQTopicPublisher;
 import org.apache.activemq.AlreadyClosedException;
-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 PooledSession implements Session, TopicSession, QueueSession, XASession {
-    private static final transient Log LOG = LogFactory.getLog(PooledSession.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(PooledSession.class);
 
     private ActiveMQSession session;
     private SessionPool sessionPool;

Modified: activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/ConnectionFailureEvictsFromPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/ConnectionFailureEvictsFromPoolTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/ConnectionFailureEvictsFromPoolTest.java (original)
+++ activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/ConnectionFailureEvictsFromPoolTest.java Thu Feb 10 14:24:01 2011
@@ -33,11 +33,11 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.test.TestSupport;
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.transport.mock.MockTransport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConnectionFailureEvictsFromPoolTest extends TestSupport {
-    private static final Log LOG = LogFactory.getLog(ConnectionFailureEvictsFromPoolTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionFailureEvictsFromPoolTest.class);
     private BrokerService broker;
     private ActiveMQConnectionFactory factory;
     private PooledConnectionFactory pooledFactory;

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

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java Thu Feb 10 14:24:01 2011
@@ -30,8 +30,8 @@ import javax.resource.Referenceable;
 import javax.resource.ResourceException;
 import javax.resource.spi.ConnectionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
@@ -40,7 +40,7 @@ public class ActiveMQConnectionFactory i
 
     private static final long serialVersionUID = -5754338187296859149L;
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQConnectionFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQConnectionFactory.class);
     private ConnectionManager manager;
     private ActiveMQManagedConnectionFactory factory;
     private Reference reference;

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionSupport.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionSupport.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.ra;
 import javax.jms.JMSException;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract base class providing support for creating physical
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
 public class ActiveMQConnectionSupport {
     
     private ActiveMQConnectionRequestInfo info = new ActiveMQConnectionRequestInfo();
-    protected Log log = LogFactory.getLog(getClass());
+    protected Logger log = LoggerFactory.getLogger(getClass());
     
     /**
      * Creates a factory for obtaining physical connections to an Active MQ

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java Thu Feb 10 14:24:01 2011
@@ -37,8 +37,8 @@ import org.apache.activemq.ActiveMQConne
 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;
 
 /**
  * @version $Revision$ $Date$
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
 public class ActiveMQEndpointWorker {
 
     public static final Method ON_MESSAGE_METHOD;
-    private static final Log LOG = LogFactory.getLog(ActiveMQEndpointWorker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQEndpointWorker.class);
 
     private static final long INITIAL_RECONNECT_DELAY = 1000; // 1 second.
     private static final long MAX_RECONNECT_DELAY = 1000 * 30; // 30 seconds.

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import javax.transaction.xa.XAResource;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.LocalTransactionEventListener;
 import org.apache.activemq.TransactionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ActiveMQManagedConnection maps to real physical connection to the server.
@@ -55,7 +55,7 @@ public class ActiveMQManagedConnection i
                                                                                             // DissociatableManagedConnection
                                                                                             // {
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQManagedConnection.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQManagedConnection.class);
 
     private PrintWriter logWriter;
 

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java Thu Feb 10 14:24:01 2011
@@ -33,7 +33,7 @@ import javax.resource.spi.ManagedConnect
 import javax.resource.spi.ResourceAdapter;
 import javax.resource.spi.ResourceAdapterAssociation;
 import javax.security.auth.Subject;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revisio n$ TODO: Must override equals and hashCode (JCA spec 16.4)
@@ -132,7 +132,7 @@ public class ActiveMQManagedConnectionFa
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         setInfo((ActiveMQConnectionRequestInfo) in.readObject());
-        log = LogFactory.getLog(getClass());
+        log = LoggerFactory.getLogger(getClass());
     }
     
     /**

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.resource.ResourceException;
 import javax.resource.spi.endpoint.MessageEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:michael.gaffney@panacya.com">Michael Gaffney </a>
@@ -32,7 +32,7 @@ public class MessageEndpointProxy implem
 
     private static final MessageEndpointState ALIVE = new MessageEndpointAlive();
     private static final MessageEndpointState DEAD = new MessageEndpointDead();
-    private static final Log LOG = LogFactory.getLog(MessageEndpointProxy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageEndpointProxy.class);
 
     private static int proxyCount;
     private final int proxyID;

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import javax.resource.spi.work.WorkManag
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.ActiveMQSession.DeliveryListener;
 import org.apache.activemq.TransactionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
@@ -57,7 +57,7 @@ public class ServerSessionImpl implement
 
 
     private int serverSessionId = getNextLogId();
-    private final Log log = LogFactory.getLog(ServerSessionImpl.class.getName() + ":" + serverSessionId);
+    private final Logger log = LoggerFactory.getLogger(ServerSessionImpl.class.getName() + ":" + serverSessionId);
 
     private ActiveMQSession session;
     private WorkManager workManager;

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java Thu Feb 10 14:24:01 2011
@@ -34,15 +34,15 @@ import org.apache.activemq.ActiveMQQueue
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.ActiveMQTopicSession;
 import org.apache.activemq.command.MessageDispatch;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$ $Date$
  */
 public class ServerSessionPoolImpl implements ServerSessionPool {
 
-    private static final Log LOG = LogFactory.getLog(ServerSessionPoolImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ServerSessionPoolImpl.class);
 
     private final ActiveMQEndpointWorker activeMQAsfEndpointWorker;
     private final int maxSessions;

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import javax.resource.spi.ManagedConnect
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple implementation of a ConnectionManager. An Application Server will
@@ -38,7 +38,7 @@ public class SimpleConnectionManager imp
 
     private static final long serialVersionUID = -7662970495944876239L;
 
-    private static final Log LOG = LogFactory.getLog(SimpleConnectionManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleConnectionManager.class);
 
     /**
      * @see javax.resource.spi.ConnectionManager#allocateConnection(javax.resource.spi.ManagedConnectionFactory,

Modified: activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java (original)
+++ activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import javax.resource.spi.ManagedConnect
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple implementation of a ConnectionManager that can be extended so that
@@ -41,7 +41,7 @@ public class ConnectionManagerAdapter im
 
     private static final long serialVersionUID = 5205646563916645831L;
 
-    private static final Log LOG = LogFactory.getLog(ConnectionManagerAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionManagerAdapter.class);
     ArrayList<ConnectionEventListener> listners = new ArrayList<ConnectionEventListener>();
     ArrayList<ManagedConnection> connections = new ArrayList<ManagedConnection>();
 

Modified: activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/FailoverManagedClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/FailoverManagedClusterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/FailoverManagedClusterTest.java (original)
+++ activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/FailoverManagedClusterTest.java Thu Feb 10 14:24:01 2011
@@ -49,11 +49,11 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 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 FailoverManagedClusterTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(FailoverManagedClusterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FailoverManagedClusterTest.class);
     
     long txGenerator = System.currentTimeMillis();
     

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

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Thu Feb 10 14:24:01 2011
@@ -50,8 +50,8 @@
     <!-- Required Dependencies -->
     <!-- =============================== -->
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -122,14 +122,7 @@
     </dependency>
     <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <version>1.4.3</version>
-         <scope>test</scope>
-    </dependency>
-    <dependency>
-         <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
-         <version>1.4.3</version>
          <scope>test</scope>
     </dependency>
     <dependency>

Modified: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java (original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringContextHook.java Thu Feb 10 14:24:01 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.hooks;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.osgi.framework.BundleException;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -27,7 +27,7 @@ import org.springframework.osgi.context.
 
 public class SpringContextHook implements Runnable, ApplicationContextAware {
 
-    private static final transient Log LOG = LogFactory.getLog(SpringContextHook.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(SpringContextHook.class);
     ApplicationContext applicationContext;
     
     public void run() {

Modified: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java (original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import javax.annotation.PreDestroy;
 import javax.jms.ConnectionFactory;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.pool.ObjectPoolFactory;
 import org.springframework.beans.factory.FactoryBean;
 
@@ -47,7 +47,7 @@ import org.springframework.beans.factory
  */
 public class PooledConnectionFactoryBean implements FactoryBean {
 
-    private static final Log LOGGER = LogFactory.getLog(PooledConnectionFactoryBean.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PooledConnectionFactoryBean.class);
 
     private PooledConnectionFactory pooledConnectionFactory;
     private ConnectionFactory connectionFactory;

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/Listener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/Listener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/Listener.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/Listener.java Thu Feb 10 14:24:01 2011
@@ -17,8 +17,8 @@
 package org.apache.activemq.spring;
 
 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 javax.jms.JMSException;
 import javax.jms.Message;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Listener implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(Listener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Listener.class);
 
 	List<Message> messages = new ArrayList<Message>();
 	long lastReceived = 0L;

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java Thu Feb 10 14:24:01 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.spring;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,7 +34,7 @@ import javax.jms.*;
 @ContextConfiguration(locations = {"classpath:spring/spring.xml"})
 @TransactionConfiguration(transactionManager = "transactionManager", defaultRollback = false)
 public class ListenerTest {
-    private static final Log LOG = LogFactory.getLog(ListenerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ListenerTest.class);
 
     int msgNum = 10;
 

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ParallelXATransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ParallelXATransactionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ParallelXATransactionTest.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/spring/ParallelXATransactionTest.java Thu Feb 10 14:24:01 2011
@@ -17,8 +17,8 @@
 
 package org.apache.activemq.spring;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,7 +46,7 @@ import java.util.Arrays;
 @TransactionConfiguration(transactionManager = "transactionManager", defaultRollback = false)
 public class ParallelXATransactionTest {
 
-    private static final Log LOG = LogFactory.getLog(ParallelXATransactionTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ParallelXATransactionTest.class);
 
     @Resource(name = "transactionManager")
     PlatformTransactionManager txManager = null;

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTest3.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTest3.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTest3.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTest3.java Thu Feb 10 14:24:01 2011
@@ -45,15 +45,15 @@ import org.apache.activemq.network.Netwo
 import org.apache.activemq.pool.PooledConnectionFactory;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 public class AMQDeadlockTest3 extends org.apache.activemq.test.TestSupport {
 
-    private static final transient Log LOG = LogFactory.getLog(AMQDeadlockTest3.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(AMQDeadlockTest3.class);
 
     private static final String URL1 = "tcp://localhost:61616";
 

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java Thu Feb 10 14:24:01 2011
@@ -45,15 +45,15 @@ import org.apache.activemq.network.Disco
 import org.apache.activemq.network.NetworkConnector;
 import org.apache.activemq.pool.PooledConnectionFactory;
 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;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 public class AMQDeadlockTestW4Brokers extends org.apache.activemq.test.TestSupport {
 
-    private static final transient Log LOG = LogFactory.getLog(AMQDeadlockTestW4Brokers.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(AMQDeadlockTestW4Brokers.class);
 
     private static final String BROKER_URL1 = "tcp://localhost:61616";
     private static final String BROKER_URL2 = "tcp://localhost:61617";

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/AMQ1730Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/AMQ1730Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/AMQ1730Test.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/AMQ1730Test.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ package org.apache.bugs;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 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.springframework.jms.listener.DefaultMessageListenerContainer;
 
 import javax.jms.Connection;
@@ -38,7 +38,7 @@ import java.util.concurrent.CountDownLat
 
 public class AMQ1730Test extends TestCase {
 
-    private static final Log log = LogFactory.getLog(AMQ1730Test.class);
+    private static final Logger log = LoggerFactory.getLogger(AMQ1730Test.class);
 
 
     private static final String JMSX_DELIVERY_COUNT = "JMSXDeliveryCount";

Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java Thu Feb 10 14:24:01 2011
@@ -38,8 +38,8 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.network.NetworkConnector;
 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;
 import org.junit.Test;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.connection.SingleConnectionFactory;
@@ -48,7 +48,7 @@ import org.springframework.jms.core.Mess
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 public class LoadBalanceTest {
-    private static final Log LOG = LogFactory.getLog(LoadBalanceTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoadBalanceTest.class);
     private static final String TESTING_QUEUE = "testingqueue";
     private static int networkBridgePrefetch = 1000;
 

Modified: activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java Thu Feb 10 14:24:01 2011
@@ -30,13 +30,13 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 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 JMSMemtest {
 
-    private static final Log LOG = LogFactory.getLog(JMSMemtest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JMSMemtest.class);
     private static final int DEFAULT_MESSAGECOUNT = 5000;
     
     protected BrokerService broker;

Modified: activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple container of messages for performing testing and rendezvous style
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
  */
 public class MemMessageIdList implements MessageListener {
 
-    protected static final Log LOG = LogFactory.getLog(MemMessageIdList.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(MemMessageIdList.class);
 
     private List<String> messageIds = new ArrayList<String>();
     private Object semaphore;

Modified: activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java Thu Feb 10 14:24:01 2011
@@ -24,12 +24,12 @@ import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReportGenerator {
 
-    private static final Log LOG = LogFactory.getLog(ReportGenerator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReportGenerator.class);
     private String reportDirectory;
     private String reportName;
     private PrintWriter writer;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java Thu Feb 10 14:24:01 2011
@@ -23,12 +23,12 @@ import javax.jms.JMSException;
 import javax.jms.Session;
 
 import org.apache.activemq.tool.properties.JmsClientProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractJmsClient {
 
-    private static final Log LOG = LogFactory.getLog(AbstractJmsClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractJmsClient.class);
 
     protected ConnectionFactory factory;
     protected Connection jmsConnection;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java Thu Feb 10 14:24:01 2011
@@ -37,11 +37,11 @@ import org.apache.activemq.tool.reports.
 import org.apache.activemq.tool.sampler.CpuSamplerTask;
 import org.apache.activemq.tool.sampler.ThroughputSamplerTask;
 import org.apache.activemq.tool.spi.SPIConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractJmsClientSystem extends AbstractObjectProperties {
-    private static final Log LOG = LogFactory.getLog(AbstractJmsClientSystem.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractJmsClientSystem.class);
 
     protected ThreadGroup clientThreadGroup;
     protected ConnectionFactory jmsConnFactory;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java Thu Feb 10 14:24:01 2011
@@ -28,11 +28,11 @@ import javax.jms.Topic;
 
 import org.apache.activemq.tool.properties.JmsClientProperties;
 import org.apache.activemq.tool.properties.JmsConsumerProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JmsConsumerClient extends AbstractJmsMeasurableClient {
-    private static final Log LOG = LogFactory.getLog(JmsConsumerClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsConsumerClient.class);
 
     protected MessageConsumer jmsConsumer;
     protected JmsConsumerProperties client;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java Thu Feb 10 14:24:01 2011
@@ -27,11 +27,11 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.tool.properties.JmsClientProperties;
 import org.apache.activemq.tool.properties.JmsProducerProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JmsProducerClient extends AbstractJmsMeasurableClient {
-    private static final Log LOG = LogFactory.getLog(JmsProducerClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsProducerClient.class);
 
     protected JmsProducerProperties client;
     protected MessageProducer jmsProducer;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java Thu Feb 10 14:24:01 2011
@@ -25,11 +25,11 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ReflectionUtil {
-    private static final Log LOG = LogFactory.getLog(ReflectionUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReflectionUtil.class);
 
     private ReflectionUtil() {
     }
@@ -155,7 +155,7 @@ public final class ReflectionUtil {
             LOG.debug(debugInfo);
 
         } catch (Exception e) {
-            LOG.warn(e);
+            LOG.warn(e.toString());
         }
     }
 
@@ -179,7 +179,7 @@ public final class ReflectionUtil {
         try {
             props.putAll(retrieveClassProperties("", obj.getClass(), obj));
         } catch (Exception e) {
-            LOG.warn(e);
+            LOG.warn(e.toString());
         }
         return props;
     }

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java Thu Feb 10 14:24:01 2011
@@ -35,12 +35,12 @@ import java.util.StringTokenizer;
 
 import org.apache.activemq.tool.reports.plugins.CpuReportPlugin;
 import org.apache.activemq.tool.reports.plugins.ThroughputReportPlugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class XmlFilePerfReportWriter extends AbstractPerfReportWriter {
 
-    private static final Log LOG = LogFactory.getLog(XmlFilePerfReportWriter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XmlFilePerfReportWriter.class);
 
     private File tempLogFile;
     private PrintWriter tempLogFileWriter;

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.apache.activemq.tool.reports.PerformanceStatisticsUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CpuReportPlugin implements ReportPlugin {
 
@@ -53,7 +53,7 @@ public class CpuReportPlugin implements 
     public static final String KEY_AVE_IDLE_TIME  = "AveIdleTime";
     public static final String KEY_AVE_WAIT_TIME  = "AveWaitingTime";
 
-    private static final Log LOG = LogFactory.getLog(CpuReportPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CpuReportPlugin.class);
 
     protected List<Long> blockRecv = new ArrayList<Long>();
     protected List<Long> blockSent = new ArrayList<Long>();

Modified: activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java (original)
+++ activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java Thu Feb 10 14:24:01 2011
@@ -26,13 +26,13 @@ import java.util.StringTokenizer;
 
 import javax.jms.ConnectionFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class ClassLoaderSPIConnectionFactory implements SPIConnectionFactory {
 
     public static final String KEY_EXT_DIR = "extDir";
-    private static final Log LOG = LogFactory.getLog(ClassLoaderSPIConnectionFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClassLoaderSPIConnectionFactory.class);
 
     public final ConnectionFactory createConnectionFactory(Properties settings) throws Exception {
 

Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java (original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -34,7 +34,7 @@ import org.springframework.web.context.s
  */
 public class WebConsoleStarter implements ServletContextListener {
     
-    private static final Log LOG = LogFactory.getLog(WebConsoleStarter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebConsoleStarter.class);
 
     public void contextInitialized(ServletContextEvent event) {
         LOG.debug("Initializing ActiveMQ WebConsole...");

Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java (original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletRes
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.web.BrokerFacade;
 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.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.m
 public class CopyMessage extends DestinationFacade implements Controller {
     private String messageId;
     private String destination;
-    private static final Log log = LogFactory.getLog(CopyMessage.class);
+    private static final Logger log = LoggerFactory.getLogger(CopyMessage.class);
 
     public CopyMessage(BrokerFacade brokerFacade) {
         super(brokerFacade);

Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java (original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import javax.servlet.http.HttpServletRes
 import org.apache.activemq.broker.jmx.JobSchedulerViewMBean;
 import org.apache.activemq.web.BrokerFacade;
 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.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.m
  */
 public class DeleteJob extends DestinationFacade implements Controller {
     private String jobId;
-    private static final Log LOG = LogFactory.getLog(DeleteJob.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DeleteJob.class);
 
     public DeleteJob(BrokerFacade brokerFacade) {
         super(brokerFacade);

Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java (original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletRes
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.web.BrokerFacade;
 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.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.m
  */
 public class DeleteMessage extends DestinationFacade implements Controller {
     private String messageId;
-    private static final Log log = LogFactory.getLog(DeleteMessage.class);
+    private static final Logger log = LoggerFactory.getLogger(DeleteMessage.class);
 
     public DeleteMessage(BrokerFacade brokerFacade) {
         super(brokerFacade);

Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java (original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletRes
 import org.apache.activemq.broker.jmx.QueueViewMBean;
 import org.apache.activemq.web.BrokerFacade;
 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.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.m
 public class MoveMessage extends DestinationFacade implements Controller {
     private String messageId;
     private String destination;
-    private static final Log log = LogFactory.getLog(MoveMessage.class);
+    private static final Logger log = LoggerFactory.getLogger(MoveMessage.class);
 
     public MoveMessage(BrokerFacade brokerFacade) {
         super(brokerFacade);



Mime
View raw message