Updating 'presence' plugin to make use of SLF4J instead of custom logging (OF-53).

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11444 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/presence/changelog.html

@@ -44,6 +44,12 @@
 Presence Plugin Changelog
 </h1>
 
+<p><b>1.5.0</b> -- December 2, 2009</p>
+<ul>
+     <li>Now requires Openfire 3.6.5.</li>
+     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-53'>OF-53</a>] - Replace custom logging implementation with a third party library.</li>
+</ul>
+
 <p><b>1.4.0</b> -- April 12, 2007</p>
 <ul>
     <li>Now requires Openfire 3.3.0.</li>

src/plugins/presence/plugin.xml

@@ -5,9 +5,9 @@
     <name>Presence Service</name>
     <description>Exposes presence information through HTTP.</description>
     <author>Jive Software</author>
-    <version>1.4.1</version>
-    <date>4/12/2007</date>
-    <minServerVersion>3.5.0</minServerVersion>
+    <version>1.5.0</version>
+    <date>12/2/2009</date>
+    <minServerVersion>3.6.5</minServerVersion>
 	
     <adminconsole>		
         <tab id="tab-server">

src/plugins/presence/src/java/org/jivesoftware/openfire/plugin/PresencePlugin.java

@@ -32,7 +32,8 @@ import org.jivesoftware.openfire.user.User;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
@@ -60,6 +61,8 @@ import org.xmpp.packet.Presence;
  */
 public class PresencePlugin implements Plugin, Component {
 
+	private static final Logger Log = LoggerFactory.getLogger(PresencePlugin.class);
+	
     private static final String subdomain = "presence";
 
     private UserManager userManager;
@@ -84,7 +87,7 @@ public class PresencePlugin implements Plugin, Component {
             componentManager.addComponent(subdomain, this);
         }
         catch (Exception e) {
-            Log.error(e);
+            Log.error(e.getMessage(), e);
         }
     }
 
@@ -97,7 +100,7 @@ public class PresencePlugin implements Plugin, Component {
             componentManager = null;
         }
         catch (Exception e) {
-            Log.error(e);
+            Log.error(e.getMessage(), e);
         }
     }
 

src/plugins/presence/src/java/org/jivesoftware/openfire/plugin/presence/ImagePresenceProvider.java

@@ -20,12 +20,6 @@
 
 package org.jivesoftware.openfire.plugin.presence;
 
-import org.jivesoftware.util.Log;
-import org.xmpp.packet.Presence;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,6 +28,14 @@ import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.Presence;
+
 /**
  * The ImagePresenceProvider provides information about the users presence by returning
  * images. There are many ways to specify the images to use.
@@ -59,6 +61,8 @@ import java.util.Map;
  */
 class ImagePresenceProvider extends PresenceInfoProvider {
 
+	private static final Logger Log = LoggerFactory.getLogger(ImagePresenceProvider.class);
+	
     private PresenceStatusServlet servlet;
     private Map<String, byte[]> imageCache = new HashMap<String, byte[]>();
     private Map<String, String> imageTypeCache = new HashMap<String, String>();
@@ -136,7 +140,7 @@ class ImagePresenceProvider extends PresenceInfoProvider {
                 }
             }
             catch (IOException e) {
-                Log.error(e);
+                Log.error(e.getMessage(), e);
             }
         }
         response.setContentType(contentType);

src/plugins/presence/src/java/org/jivesoftware/openfire/plugin/presence/PresenceStatusServlet.java

@@ -20,12 +20,9 @@
 
 package org.jivesoftware.openfire.plugin.presence;
 
-import org.jivesoftware.admin.AuthCheckFilter;
-import org.jivesoftware.util.Log;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.plugin.PresencePlugin;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.xmpp.packet.Presence;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -33,9 +30,14 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+
+import org.jivesoftware.admin.AuthCheckFilter;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.plugin.PresencePlugin;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.Presence;
 
 /**
  * Servlet that provides information about the presence status of the users in the system.
@@ -51,6 +53,8 @@ import java.io.InputStream;
  */
 public class PresenceStatusServlet extends HttpServlet {
 
+	private static final Logger Log = LoggerFactory.getLogger(PresenceStatusServlet.class);
+	
     private PresencePlugin plugin;
     private XMLPresenceProvider xmlProvider;
     private ImagePresenceProvider imageProvider;