Removed log4j deps

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@602084 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 28 insertions, 34 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml b/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
index de64423a51..3465e75611 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
+++ b/java/client/example/src/main/java/org/apache/qpid/example/log4j.xml
@@ -38,7 +38,7 @@
     </appender>
 
     <root>
-        <priority value="debug"/>
+        <priority value="info"/>
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="FileAppender"/>
     </root>
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
index 6a7626c51d..1849f733e9 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
@@ -24,10 +24,11 @@ import java.io.File;
 
 import javax.jms.JMSException;
 
-import org.apache.log4j.Logger;
 
 import org.apache.qpid.example.shared.FileUtils;
 import org.apache.qpid.example.shared.Statics;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Class that sends message files to the Publisher to distribute
@@ -37,7 +38,7 @@ import org.apache.qpid.example.shared.Statics;
 public class FileMessageDispatcher
 {
 
-    protected static final Logger _logger = Logger.getLogger(FileMessageDispatcher.class);
+    protected static final Logger _logger = LoggerFactory.getLogger(FileMessageDispatcher.class);
 
     protected static Publisher _publisher = null;
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index 8c51f61522..3d16e01af4 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
@@ -18,8 +18,9 @@
  */
 package org.apache.qpid.example.publisher;
 
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
@@ -31,7 +32,7 @@ import javax.jms.JMSException;
 public class MonitorMessageDispatcher
 {
 
-    private static final Logger _logger = Logger.getLogger(MonitorMessageDispatcher.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MonitorMessageDispatcher.class);
 
     protected static MonitorPublisher _monitorPublisher = null;
 
@@ -46,8 +47,6 @@ public class MonitorMessageDispatcher
     public static void main(String[] args)
     {
         //Switch on logging appropriately for your app
-        BasicConfigurator.configure();
-
         try
         {
             int i =0;
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index a67b602e58..750f57d9dc 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
@@ -18,8 +18,9 @@
  */
 package org.apache.qpid.example.publisher;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.client.BasicMessageProducer;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
@@ -33,7 +34,7 @@ import javax.jms.Session;
 public class MonitorPublisher extends Publisher
 {
 
-    private static final Logger _log = Logger.getLogger(Publisher.class);
+    private static final Logger _log = LoggerFactory.getLogger(Publisher.class);
 
     BasicMessageProducer _producer;
 
@@ -64,7 +65,7 @@ public class MonitorPublisher extends Publisher
         catch (JMSException e)
         {
             //Have to assume our commit failed but do not rollback here as channel closed
-            _log.error(e);
+            _log.error("JMSException", e);
             e.printStackTrace();
             throw new UndeliveredMessageException("Cannot deliver immediate message", e);
         }
@@ -93,7 +94,7 @@ public class MonitorPublisher extends Publisher
         catch (JMSException e)
         {
             //Have to assume our commit failed but do not rollback here as channel closed
-            _log.error(e);
+            _log.error("JMSException", e);
             e.printStackTrace();
             throw new UndeliveredMessageException("Cannot deliver immediate message", e);
         }
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
index 2bde4ec35c..87fc543dbe 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
@@ -18,8 +18,6 @@
  */
 package org.apache.qpid.example.publisher;
 
-import org.apache.log4j.Logger;
-
 import org.apache.qpid.client.AMQConnectionFactory;
 
 import javax.jms.JMSException;
@@ -33,10 +31,12 @@ import javax.jms.Session;
 import javax.naming.InitialContext;
 
 import org.apache.qpid.example.shared.InitialContextHelper;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 public class Publisher
 {
-    private static final Logger _log = Logger.getLogger(Publisher.class);
+    private static final Logger _log = LoggerFactory.getLogger(Publisher.class);
 
     protected InitialContextHelper _contextHelper;
 
@@ -88,7 +88,7 @@ public class Publisher
         catch (Exception e)
         {
             e.printStackTrace();
-            _log.error(e);
+            _log.error("Exception", e);
         }
     }
 
@@ -113,7 +113,7 @@ public class Publisher
             try
             {
                 _session.rollback();
-                _log.error(e);
+                _log.error("JMSException", e);
                 e.printStackTrace();
                 return false;
             }
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java b/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
index 98a2c0d497..1328816602 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
@@ -27,7 +27,8 @@ import java.util.Properties;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Class that provides helper methods for JNDI
@@ -38,7 +39,7 @@ public class InitialContextHelper
     public static final String _defaultPropertiesName = "example.properties";
     protected static Properties _fileProperties;
     protected static InitialContext _initialContext;
-    protected static final Logger _log = Logger.getLogger(InitialContextHelper.class);
+    protected static final Logger _log = LoggerFactory.getLogger(InitialContextHelper.class);
 
     public InitialContextHelper(String propertiesName) throws ContextException
     {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index 1d2e5e0e66..d43b823a13 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
@@ -18,11 +18,11 @@
  */
 package org.apache.qpid.example.subscriber;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.example.shared.Statics;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 import javax.jms.*;
-
 /**
  * Subclass of Subscriber which consumes a heartbeat message
  */
@@ -31,7 +31,7 @@ public class MonitoredSubscriber extends Subscriber
 {
     protected String _monitorDestinationName;
 
-    private static final Logger _logger = Logger.getLogger(MonitoredSubscriber.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MonitoredSubscriber.class);
 
     private static MessageConsumer _monitorConsumer;
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
index d2f27da052..5e78107182 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
@@ -18,7 +18,6 @@
  */
 package org.apache.qpid.example.subscriber;
 
-import org.apache.log4j.BasicConfigurator;
 
 /**
  * Allows you to simply start a monitored subscriber
@@ -32,10 +31,7 @@ public class MonitoredSubscriptionWrapper {
      * @param args - no params required
      */
     public static void main(String args[])
-    {
-        //switch on logging
-        BasicConfigurator.configure();
-
+    {      
         _subscriber = new MonitoredSubscriber();
 
         _subscriber.subscribe();
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
index d443dca828..f2dd478121 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
@@ -18,7 +18,6 @@
  */
 package org.apache.qpid.example.subscriber;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnectionFactory;
 
 import javax.jms.*;
@@ -28,6 +27,8 @@ import javax.jms.Session;
 import javax.naming.InitialContext;
 
 import org.apache.qpid.example.shared.InitialContextHelper;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Subscriber which consumes messages from a queue
@@ -35,7 +36,7 @@ import org.apache.qpid.example.shared.InitialContextHelper;
 
 public class Subscriber
 {
-    private static final Logger _log = Logger.getLogger(Subscriber.class);
+    private static final Logger _log = LoggerFactory.getLogger(Subscriber.class);
 
     protected static Connection _connection;
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
index 32a0ef685c..f8fbf63037 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
@@ -18,8 +18,6 @@
  */
 package org.apache.qpid.example.subscriber;
 
-import org.apache.log4j.BasicConfigurator;
-
 /**
  * Allows you to simply start a subscriber
  */
@@ -33,9 +31,6 @@ public class SubscriptionWrapper {
      */
     public static void main(String args[])
     {
-        //switch on logging
-        BasicConfigurator.configure();
-        
          _subscriber = new Subscriber();
 
         _subscriber.subscribe();