Replaced all Component.getLog() wrappers with a direct call to the static...

Replaced all Component.getLog() wrappers with a direct call to the static methods of Log. (TINDER-2)
Some initial work on migrating out the old DataForm implementation (TINDER-1)

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

src/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java

@@ -30,6 +30,7 @@ import org.jivesoftware.openfire.commands.event.*;
 import org.jivesoftware.openfire.disco.*;
 import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
 import org.jivesoftware.openfire.handler.IQHandler;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
@@ -103,7 +104,7 @@ public class AdHocCommandHandler extends IQHandler
         return Arrays.asList(NAMESPACE, "jabber:x:data").iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         return null;
     }
 

src/java/org/jivesoftware/openfire/component/InternalComponentManager.java

@@ -345,57 +345,6 @@ public class InternalComponentManager extends BasicModule implements ComponentMa
         return false;
     }
 
-    public org.xmpp.component.Log getLog() {
-        return new  org.xmpp.component.Log() {
-            public void error(String msg) {
-                Log.error(msg);
-            }
-
-            public void error(String msg, Throwable throwable) {
-                Log.error(msg, throwable);
-            }
-
-            public void error(Throwable throwable) {
-                Log.error(throwable);
-            }
-
-            public void warn(String msg) {
-                Log.warn(msg);
-            }
-
-            public void warn(String msg, Throwable throwable) {
-                Log.warn(msg, throwable);
-            }
-
-            public void warn(Throwable throwable) {
-                Log.warn(throwable);
-            }
-
-            public void info(String msg) {
-                Log.info(msg);
-            }
-
-            public void info(String msg, Throwable throwable) {
-                Log.info(msg, throwable);
-            }
-
-            public void info(Throwable throwable) {
-                Log.info(throwable);
-            }
-
-            public void debug(String msg) {
-                Log.debug("InternalComponentManager: "+msg);
-            }
-
-            public void debug(String msg, Throwable throwable) {
-                Log.debug(msg, throwable);
-            }
-
-            public void debug(Throwable throwable) {
-                Log.debug("InternalComponentManager: ",throwable);
-            }
-        };
-    }
 
     /**
      * Retrieves the <code>Component</code> which is mapped to the specified JID. The

src/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java

@@ -13,7 +13,7 @@
 package org.jivesoftware.openfire.disco;
 
 import org.dom4j.Element;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.JID;
 
 import java.util.Iterator;
@@ -63,7 +63,7 @@ public interface DiscoInfoProvider {
      * @param senderJID the XMPPAddress of user that sent the disco info request.
      * @return an XDataForm with the extended information about the entity or null if none.
      */
-    public abstract XDataFormImpl getExtendedInfo(String name, String node, JID senderJID);
+    public abstract DataForm getExtendedInfo(String name, String node, JID senderJID);
 
     /**
      * Returns true if we can provide information related to the requested name and node. For

src/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java

@@ -21,13 +21,13 @@ import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.cluster.ClusterEventListener;
 import org.jivesoftware.openfire.cluster.ClusterManager;
 import org.jivesoftware.openfire.cluster.NodeID;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
 import org.jivesoftware.openfire.handler.IQHandler;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.cache.Cache;
 import org.jivesoftware.util.cache.CacheFactory;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.PacketError;
@@ -161,9 +161,9 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
 				}
                 
                 // Add to the reply the extended info (XDataForm) provided by the DiscoInfoProvider
-                XDataFormImpl dataForm = infoProvider.getExtendedInfo(name, node, packet.getFrom());
+                DataForm dataForm = infoProvider.getExtendedInfo(name, node, packet.getFrom());
                 if (dataForm != null) {
-                    queryElement.add(dataForm.asXMLElement());
+                    queryElement.add(dataForm.getElement());
                 }
             }
             else {
@@ -479,7 +479,7 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
                 }
             }
 
-            public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+            public DataForm getExtendedInfo(String name, String node, JID senderJID) {
                 if (node != null && serverNodeProviders.get(node) != null) {
                     // Redirect the request to the disco info provider of the specified node
                     return serverNodeProviders.get(node).getExtendedInfo(name, node, senderJID);

src/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java

@@ -12,27 +12,40 @@
 
 package org.jivesoftware.openfire.filetransfer.proxy;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-import org.jivesoftware.openfire.*;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.PacketException;
+import org.jivesoftware.openfire.PacketRouter;
+import org.jivesoftware.openfire.RoutableChannelHandler;
+import org.jivesoftware.openfire.RoutingTable;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.auth.UnauthorizedException;
 import org.jivesoftware.openfire.container.BasicModule;
-import org.jivesoftware.openfire.disco.*;
+import org.jivesoftware.openfire.disco.DiscoInfoProvider;
+import org.jivesoftware.openfire.disco.DiscoItem;
+import org.jivesoftware.openfire.disco.DiscoItemsProvider;
+import org.jivesoftware.openfire.disco.DiscoServerItem;
+import org.jivesoftware.openfire.disco.ServerItemsProvider;
 import org.jivesoftware.openfire.filetransfer.FileTransferManager;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
 import org.jivesoftware.util.PropertyEventDispatcher;
 import org.jivesoftware.util.PropertyEventListener;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
 /**
  * Manages the transfering of files between two remote entities on the jabber network.
  * This class acts independtly as a Jabber component from the rest of the server, according to
@@ -308,7 +321,7 @@ public class FileTransferProxy extends BasicModule
                 "http://jabber.org/protocol/disco#info").iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         return null;
     }
 

src/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java

@@ -12,26 +12,38 @@
 
 package org.jivesoftware.openfire.handler;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TimeZone;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-import org.jivesoftware.openfire.*;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.OfflineMessage;
+import org.jivesoftware.openfire.OfflineMessageStore;
+import org.jivesoftware.openfire.RoutingTable;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.auth.UnauthorizedException;
-import org.jivesoftware.openfire.disco.*;
-import org.jivesoftware.openfire.forms.DataForm;
-import org.jivesoftware.openfire.forms.FormField;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
-import org.jivesoftware.openfire.forms.spi.XFormFieldImpl;
+import org.jivesoftware.openfire.disco.DiscoInfoProvider;
+import org.jivesoftware.openfire.disco.DiscoItem;
+import org.jivesoftware.openfire.disco.DiscoItemsProvider;
+import org.jivesoftware.openfire.disco.IQDiscoInfoHandler;
+import org.jivesoftware.openfire.disco.IQDiscoItemsHandler;
+import org.jivesoftware.openfire.disco.ServerFeaturesProvider;
 import org.jivesoftware.openfire.session.LocalClientSession;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.Log;
+import org.xmpp.forms.DataForm;
+import org.xmpp.forms.FormField;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 /**
  * Implements JEP-0013: Flexible Offline Message Retrieval. Allows users to request number of
  * messages, request message headers, retrieve specific messages, remove specific messages,
@@ -137,20 +149,20 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
         return Arrays.asList(NAMESPACE).iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         // Mark that offline messages shouldn't be sent when the user becomes available
         stopOfflineFlooding(senderJID);
 
-        XDataFormImpl dataForm = new XDataFormImpl(DataForm.TYPE_RESULT);
+        final DataForm dataForm = new DataForm(DataForm.Type.result);
 
-        XFormFieldImpl field = new XFormFieldImpl("FORM_TYPE");
-        field.setType(FormField.TYPE_HIDDEN);
-        field.addValue(NAMESPACE);
-        dataForm.addField(field);
+        final FormField field1 = dataForm.addField();
+        field1.setVariable("FORM_TYPE");
+        field1.setType(FormField.Type.hidden);
+        field1.addValue(NAMESPACE);
 
-        field = new XFormFieldImpl("number_of_messages");
-        field.addValue(String.valueOf(messageStore.getMessages(senderJID.getNode(), false).size()));
-        dataForm.addField(field);
+        final FormField field2 = dataForm.addField();
+        field2.setVariable("number_of_messages");
+        field2.addValue(String.valueOf(messageStore.getMessages(senderJID.getNode(), false).size()));
 
         return dataForm;
     }

src/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java

@@ -11,25 +11,38 @@
 
 package org.jivesoftware.openfire.mediaproxy;
 
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 import org.dom4j.Attribute;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-import org.jivesoftware.openfire.*;
+import org.jivesoftware.openfire.PacketException;
+import org.jivesoftware.openfire.PacketRouter;
+import org.jivesoftware.openfire.RoutableChannelHandler;
+import org.jivesoftware.openfire.RoutingTable;
+import org.jivesoftware.openfire.SessionManager;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.auth.UnauthorizedException;
 import org.jivesoftware.openfire.container.BasicModule;
-import org.jivesoftware.openfire.disco.*;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
+import org.jivesoftware.openfire.disco.DiscoInfoProvider;
+import org.jivesoftware.openfire.disco.DiscoItem;
+import org.jivesoftware.openfire.disco.DiscoItemsProvider;
+import org.jivesoftware.openfire.disco.DiscoServerItem;
+import org.jivesoftware.openfire.disco.ServerItemsProvider;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.*;
-
 /**
  * A proxy service for UDP traffic such as RTP. It provides Jingle transport candidates
  * to be used for media transmission. The media proxy is especially useful for users
@@ -319,7 +332,7 @@ public class MediaProxyService extends BasicModule
                 "http://jabber.org/protocol/disco#info").iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         return null;
     }
 

src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java

@@ -12,18 +12,42 @@
 
 package org.jivesoftware.openfire.muc.spi;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.TimeZone;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.jivesoftware.openfire.PacketRouter;
 import org.jivesoftware.openfire.RoutingTable;
 import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.cluster.ClusterManager;
-import org.jivesoftware.openfire.disco.*;
-import org.jivesoftware.openfire.forms.DataForm;
-import org.jivesoftware.openfire.forms.FormField;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
-import org.jivesoftware.openfire.forms.spi.XFormFieldImpl;
-import org.jivesoftware.openfire.muc.*;
+import org.jivesoftware.openfire.disco.DiscoInfoProvider;
+import org.jivesoftware.openfire.disco.DiscoItem;
+import org.jivesoftware.openfire.disco.DiscoItemsProvider;
+import org.jivesoftware.openfire.disco.DiscoServerItem;
+import org.jivesoftware.openfire.disco.ServerItemsProvider;
+import org.jivesoftware.openfire.muc.HistoryStrategy;
+import org.jivesoftware.openfire.muc.MUCEventDelegate;
+import org.jivesoftware.openfire.muc.MUCEventDispatcher;
+import org.jivesoftware.openfire.muc.MUCRole;
+import org.jivesoftware.openfire.muc.MUCRoom;
+import org.jivesoftware.openfire.muc.MUCUser;
+import org.jivesoftware.openfire.muc.MultiUserChatService;
+import org.jivesoftware.openfire.muc.NotAllowedException;
 import org.jivesoftware.openfire.muc.cluster.GetNumberConnectedUsers;
 import org.jivesoftware.openfire.muc.cluster.OccupantAddedEvent;
 import org.jivesoftware.openfire.muc.cluster.RoomAvailableEvent;
@@ -35,16 +59,16 @@ import org.jivesoftware.util.Log;
 import org.jivesoftware.util.cache.CacheFactory;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentManager;
-import org.xmpp.packet.*;
+import org.xmpp.forms.DataForm;
+import org.xmpp.forms.FormField;
+import org.xmpp.forms.DataForm.Type;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
+import org.xmpp.packet.Packet;
+import org.xmpp.packet.Presence;
 import org.xmpp.resultsetmanagement.ResultSet;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * Implements the chat server as a cached memory resident chat server. The server is also
  * responsible for responding Multi-User Chat disco requests as well as removing inactive users from
@@ -1217,42 +1241,42 @@ public class MultiUserChatServiceImpl implements Component, MultiUserChatService
         return features.iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         if (name != null && node == null) {
             // Answer the extended info of a given room
             MUCRoom room = getChatRoom(name);
             if (room != null && canDiscoverRoom(room)) {
-                XDataFormImpl dataForm = new XDataFormImpl(DataForm.TYPE_RESULT);
+                final DataForm dataForm = new DataForm(Type.result);
 
-                XFormFieldImpl field = new XFormFieldImpl("FORM_TYPE");
-                field.setType(FormField.TYPE_HIDDEN);
-                field.addValue("http://jabber.org/protocol/muc#roominfo");
-                dataForm.addField(field);
+                final FormField fieldType = dataForm.addField();
+                fieldType.setVariable("FORM_TYPE");
+                fieldType.setType(FormField.Type.hidden);
+                fieldType.addValue("http://jabber.org/protocol/muc#roominfo");
 
-                field = new XFormFieldImpl("muc#roominfo_description");
-                field.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.desc"));
-                field.addValue(room.getDescription());
-                dataForm.addField(field);
+                final FormField fieldDescr = dataForm.addField();
+                fieldDescr.setVariable("muc#roominfo_description");
+                fieldDescr.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.desc"));
+                fieldDescr.addValue(room.getDescription());
 
-                field = new XFormFieldImpl("muc#roominfo_subject");
-                field.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.subject"));
-                field.addValue(room.getSubject());
-                dataForm.addField(field);
+                final FormField fieldSubj = dataForm.addField();
+                fieldSubj.setVariable("muc#roominfo_subject");
+                fieldSubj.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.subject"));
+                fieldSubj.addValue(room.getSubject());
 
-                field = new XFormFieldImpl("muc#roominfo_occupants");
-                field.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.occupants"));
-                field.addValue(Integer.toString(room.getOccupantsCount()));
-                dataForm.addField(field);
+                final FormField fieldOcc = dataForm.addField();
+                fieldSubj.setVariable("muc#roominfo_occupants");
+                fieldSubj.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.occupants"));
+                fieldSubj.addValue(Integer.toString(room.getOccupantsCount()));
 
                 /*field = new XFormFieldImpl("muc#roominfo_lang");
                 field.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.language"));
                 field.addValue(room.getLanguage());
                 dataForm.addField(field);*/
 
-                field = new XFormFieldImpl("x-muc#roominfo_creationdate");
-                field.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.creationdate"));
-                field.addValue(dateFormatter.format(room.getCreationDate()));
-                dataForm.addField(field);
+                final FormField fieldDate = dataForm.addField();
+                fieldDate.setVariable("x-muc#roominfo_creationdate");
+                fieldDate.setLabel(LocaleUtils.getLocalizedString("muc.extended.info.creationdate"));
+                fieldDate.addValue(dateFormatter.format(room.getCreationDate()));
 
                 return dataForm;
             }

src/java/org/jivesoftware/openfire/pubsub/PubSubModule.java

@@ -24,12 +24,10 @@ import org.jivesoftware.openfire.commands.AdHocCommandManager;
 import org.jivesoftware.openfire.component.InternalComponentManager;
 import org.jivesoftware.openfire.container.BasicModule;
 import org.jivesoftware.openfire.disco.*;
-import org.jivesoftware.openfire.forms.DataForm;
-import org.jivesoftware.openfire.forms.spi.XDataFormImpl;
-import org.jivesoftware.openfire.forms.spi.XFormFieldImpl;
 import org.jivesoftware.openfire.pubsub.models.AccessModel;
 import org.jivesoftware.openfire.pubsub.models.PublisherModel;
 import org.jivesoftware.util.*;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.*;
 
 import java.util.*;
@@ -654,26 +652,13 @@ public class PubSubModule extends BasicModule implements ServerItemsProvider, Di
         return features.iterator();
     }
 
-    public XDataFormImpl getExtendedInfo(String name, String node, JID senderJID) {
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
         if (name == null && node != null) {
             // Answer the extended info of a given node
             Node pubNode = getNode(node);
             if (canDiscoverNode(pubNode)) {
                 // Get the metadata data form
-                org.xmpp.forms.DataForm metadataForm = pubNode.getMetadataForm();
-
-                // Convert Whack data form into old data form format (will go away someday)
-                XDataFormImpl dataForm = new XDataFormImpl(DataForm.TYPE_RESULT);
-                for (org.xmpp.forms.FormField formField : metadataForm.getFields()) {
-                    XFormFieldImpl field = new XFormFieldImpl(formField.getVariable());
-                    field.setLabel(formField.getLabel());
-                    for (String value : formField.getValues()) {
-                        field.addValue(value);
-                    }
-                    dataForm.addField(field);
-                }
-
-                return dataForm;
+                return pubNode.getMetadataForm();
             }
         }
         return null;

src/plugins/broadcast/src/java/org/jivesoftware/openfire/plugin/BroadcastPlugin.java

@@ -12,6 +12,14 @@
 
 package org.jivesoftware.openfire.plugin;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
 import org.dom4j.Element;
 import org.jivesoftware.openfire.SessionManager;
 import org.jivesoftware.openfire.XMPPServer;
@@ -21,16 +29,19 @@ import org.jivesoftware.openfire.group.Group;
 import org.jivesoftware.openfire.group.GroupManager;
 import org.jivesoftware.openfire.group.GroupNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.PropertyEventDispatcher;
 import org.jivesoftware.util.PropertyEventListener;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentException;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.*;
-
-import java.io.File;
-import java.util.*;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
+import org.xmpp.packet.Packet;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.Presence;
 
 /**
  * Broadcast service plugin. It accepts messages and broadcasts them out to
@@ -77,7 +88,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
             componentManager.addComponent(serviceName, this);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         PropertyEventDispatcher.addListener(this);
     }
@@ -90,7 +101,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
                 componentManager.removeComponent(serviceName);
             }
             catch (Exception e) {
-                componentManager.getLog().error(e);
+                Log.error(e);
             }
         }
         componentManager = null;
@@ -190,7 +201,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
                     componentManager.sendPacket(this, error);
                 }
                 catch (Exception e) {
-                    componentManager.getLog().error(e);
+                    Log.error(e);
                 }
                 return;
             }
@@ -214,7 +225,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
                     componentManager.sendPacket(this, error);
                 }
                 catch (Exception e) {
-                    componentManager.getLog().error(e);
+                    Log.error(e);
                 }
             }
             else if (canProceed) {
@@ -227,7 +238,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
                         componentManager.sendPacket(this, newMessage);
                     }
                     catch (Exception e) {
-                        componentManager.getLog().error(e);
+                        Log.error(e);
                     }
                 }
             }
@@ -247,7 +258,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
                     componentManager.sendPacket(this, error);
                 }
                 catch (Exception e) {
-                    componentManager.getLog().error(e);
+                    Log.error(e);
                 }
             }
         }
@@ -293,7 +304,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
             }
         }
         catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -379,7 +390,7 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
             componentManager.sendPacket(this, reply);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -540,13 +551,13 @@ public class BroadcastPlugin implements Plugin, Component, PropertyEventListener
             componentManager.removeComponent(this.serviceName);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         try {
             componentManager.addComponent(serviceName, this);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         this.serviceName = serviceName;
     }

src/plugins/clientControl/src/java/org/jivesoftware/openfire/plugin/spark/SparkManager.java

@@ -81,7 +81,7 @@ public class SparkManager implements Component {
             componentManager.addComponent(serviceName, this);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
 
         // Add VersionManager. This component is cluster-safe.
@@ -89,7 +89,7 @@ public class SparkManager implements Component {
             componentManager.addComponent(SparkVersionManager.SERVICE_NAME, new SparkVersionManager());
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
 
         // Add SessionListener
@@ -245,7 +245,7 @@ public class SparkManager implements Component {
             componentManager.removeComponent(serviceName);
         }
         catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
 
         taskEngine = null;
@@ -307,7 +307,7 @@ public class SparkManager implements Component {
             componentManager.sendPacket(this, packet);
         }
         catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 

src/plugins/clientControl/src/java/org/jivesoftware/openfire/plugin/spark/manager/SparkVersionManager.java

@@ -14,6 +14,7 @@ package org.jivesoftware.openfire.plugin.spark.manager;
 
 import org.dom4j.Element;
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.openfire.XMPPServer;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentException;
@@ -222,7 +223,7 @@ public class SparkVersionManager implements Component {
             componentManager.sendPacket(this, packet);
         }
         catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 }

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/FastpathPlugin.java

@@ -90,7 +90,7 @@ public class FastpathPlugin implements Plugin, ClusterEventListener {
         }
         catch (ComponentException e) {
             // Do nothing. Should never happen.
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         // Register the provider of workgroup names
         UserNameManager.addUserNameProvider(workgroupManager.getAddress().toString(),

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/ImageServlet.java

 package org.jivesoftware.openfire.fastpath;
 
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
-import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettings;
-import org.jivesoftware.openfire.fastpath.settings.chat.ChatSetting;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.JID;
-import org.jivesoftware.util.StringUtils;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-
 import java.io.IOException;
 
 import javax.servlet.ServletConfig;
@@ -19,6 +9,16 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jivesoftware.openfire.fastpath.settings.chat.ChatSetting;
+import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettings;
+import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.xmpp.packet.JID;
+
 /**
  * A servlet that displays images.
  */
@@ -103,7 +103,7 @@ public class ImageServlet extends HttpServlet {
             workgroup = workgroupManager.getWorkgroup(workgroupJID);
         }
         catch (UserNotFoundException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             return null;
         }
 

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/SoundServlet.java

@@ -12,13 +12,6 @@
 
 package org.jivesoftware.openfire.fastpath;
 
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.xmpp.packet.JID;
-import org.xmpp.component.ComponentManagerFactory;
-import org.jivesoftware.util.StringUtils;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-
 import java.io.IOException;
 
 import javax.servlet.ServletConfig;
@@ -27,6 +20,13 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.xmpp.packet.JID;
+
 /**
  * Servlet that writes out sound files.
  */
@@ -53,7 +53,7 @@ public class SoundServlet extends HttpServlet {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (UserNotFoundException e) {
-           ComponentManagerFactory.getComponentManager().getLog().error(e);
+           Log.error(e);
         }
 
         try {
@@ -72,7 +72,7 @@ public class SoundServlet extends HttpServlet {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 }
\ No newline at end of file

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/dataforms/FormManager.java

@@ -12,20 +12,21 @@
 
 package org.jivesoftware.openfire.fastpath.dataforms;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.DbProperties;
 import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import com.thoughtworks.xstream.XStream;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import com.thoughtworks.xstream.XStream;
 
 
 public class FormManager {
@@ -76,7 +77,7 @@ public class FormManager {
                 props.setProperty(context, xmlToSave);
             }
             catch (UnauthorizedException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
 
@@ -171,7 +172,7 @@ public class FormManager {
             props.setProperty(context, xmlToSave);
         }
         catch (UnauthorizedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
 
     }
@@ -189,7 +190,7 @@ public class FormManager {
                 return (DataForm) xstream.fromXML(form);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
         return null;
@@ -214,7 +215,7 @@ public class FormManager {
                     }
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
             else {

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/history/ChatTranscriptManager.java

@@ -12,11 +12,22 @@
 
 package org.jivesoftware.openfire.fastpath.history;
 
-import org.jivesoftware.xmpp.workgroup.DbProperties;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.jivesoftware.xmpp.workgroup.request.Request;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -24,17 +35,15 @@ import org.dom4j.Element;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.EmailService;
 import org.jivesoftware.util.JiveConstants;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.xmpp.workgroup.DbProperties;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.jivesoftware.xmpp.workgroup.request.Request;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
 import org.xmpp.packet.JID;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 /**
  * Utility class to control the update and retrieval of Chat Transcripts within the
  * Fastpath system.
@@ -111,7 +120,7 @@ public class ChatTranscriptManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -144,7 +153,7 @@ public class ChatTranscriptManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -165,7 +174,7 @@ public class ChatTranscriptManager {
             element = DocumentHelper.parseText(transcript);
         }
         catch (DocumentException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
 
         StringBuilder buf = new StringBuilder();
@@ -216,7 +225,7 @@ public class ChatTranscriptManager {
                         }
                     }
                     catch (ParseException e) {
-                        ComponentManagerFactory.getComponentManager().getLog().error(e);
+                        Log.error(e);
                     }
                 }
             }
@@ -272,7 +281,7 @@ public class ChatTranscriptManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -304,7 +313,7 @@ public class ChatTranscriptManager {
             session.setMetadata(metadata);
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -343,7 +352,7 @@ public class ChatTranscriptManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -371,7 +380,7 @@ public class ChatTranscriptManager {
             element = DocumentHelper.parseText(transcript);
         }
         catch (DocumentException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
 
         StringBuilder buf = new StringBuilder();
@@ -431,7 +440,7 @@ public class ChatTranscriptManager {
                         }
                     }
                     catch (ParseException e) {
-                        ComponentManagerFactory.getComponentManager().getLog().error(e);
+                        Log.error(e);
                     }
                 }
             }

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/macros/MacroProvider.java

@@ -12,14 +12,20 @@
 
 package org.jivesoftware.openfire.fastpath.macros;
 
-import org.jivesoftware.xmpp.workgroup.*;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import com.thoughtworks.xstream.XStream;
 import org.dom4j.Element;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.Agent;
+import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
+import org.jivesoftware.xmpp.workgroup.DbProperties;
+import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.PacketError;
 
+import com.thoughtworks.xstream.XStream;
+
 public class MacroProvider implements WorkgroupProvider {
 
     public boolean handleGet(IQ packet) {
@@ -116,7 +122,7 @@ public class MacroProvider implements WorkgroupProvider {
                 props.setProperty("personal.macro", saveString);
             }
             catch (UnauthorizedException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
 
             reply = IQ.createResultIQ(packet);

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/macros/WorkgroupMacros.java

@@ -12,17 +12,17 @@
 
 package org.jivesoftware.openfire.fastpath.macros;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.DbProperties;
 import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
 import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import com.thoughtworks.xstream.XStream;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.xmpp.component.ComponentManagerFactory;
+import com.thoughtworks.xstream.XStream;
 
 public class WorkgroupMacros {
 
@@ -137,7 +137,7 @@ public class WorkgroupMacros {
             props.setProperty("jive.macro" + id, saveString);
         }
         catch (UnauthorizedException e) {
-           ComponentManagerFactory.getComponentManager().getLog().error(e);
+           Log.error(e);
         }
     }
 

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/providers/AgentHistory.java

@@ -11,16 +11,6 @@
  */
 package org.jivesoftware.openfire.fastpath.providers;
 
-import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.IQ;
-import org.xmpp.packet.PacketError;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -29,6 +19,16 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.PacketError;
+
 /**
  * AgentHistory is responsible for retrieving the information for one agent.
  */
@@ -113,14 +113,14 @@ public class AgentHistory implements WorkgroupProvider {
                         }
                     }
                     catch (NumberFormatException e) {
-                        ComponentManagerFactory.getComponentManager().getLog().error(e);
+                        Log.error(e);
                     }
                 }
             }
             result.close();
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -210,7 +210,7 @@ public class AgentHistory implements WorkgroupProvider {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/providers/ChatMetadataProvider.java

@@ -12,24 +12,24 @@
 
 package org.jivesoftware.openfire.fastpath.providers;
 
-import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
-import org.jivesoftware.xmpp.workgroup.AgentSession;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
+import org.jivesoftware.xmpp.workgroup.AgentSession;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.PacketError;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
 public class ChatMetadataProvider implements WorkgroupProvider {
 
     private static final String GET_SESSION_METADATA =
@@ -88,7 +88,7 @@ public class ChatMetadataProvider implements WorkgroupProvider {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/providers/ChatNotes.java

@@ -12,20 +12,20 @@
 
 package org.jivesoftware.openfire.fastpath.providers;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
 import org.jivesoftware.xmpp.workgroup.AgentSession;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.PacketError;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
 /**
  * ChatNotes is responsible for the setting and retrieval off Chat Notes. Each chat note
  * is tied directly to a chat session within Live Assistant.
@@ -53,14 +53,14 @@ public class ChatNotes implements WorkgroupProvider {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
     }
 
@@ -86,7 +86,7 @@ public class ChatNotes implements WorkgroupProvider {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/providers/MetadataProvider.java

@@ -12,16 +12,6 @@
 
 package org.jivesoftware.openfire.fastpath.providers;
 
-import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
-import org.dom4j.Element;
-import org.jivesoftware.util.JiveGlobals;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.IQ;
-import org.xmpp.packet.PacketError;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -32,6 +22,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.dom4j.Element;
+import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.PacketError;
+
 /**
  * MetadataProvider is a generic data handler to retrieve name-value pairs
  * based from properties files in a given location.  To register your own
@@ -98,7 +98,7 @@ public class MetadataProvider implements WorkgroupProvider {
                     }
                 }
                 catch (IOException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/providers/WorkgroupPropertiesProvider.java

@@ -12,15 +12,15 @@
 
 package org.jivesoftware.openfire.fastpath.providers;
 
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
 import org.dom4j.Attribute;
 import org.dom4j.Element;
 import org.jivesoftware.openfire.user.User;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupProvider;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
@@ -65,7 +65,7 @@ public class WorkgroupPropertiesProvider implements WorkgroupProvider {
                 returnPacket.addElement("name").setText(fullName);
             }
             catch (UserNotFoundException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
 
         }

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/settings/SettingsManager.java

@@ -12,18 +12,18 @@
 
 package org.jivesoftware.openfire.fastpath.settings;
 
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.openfire.fastpath.WorkgroupSettings;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.openfire.fastpath.WorkgroupSettings;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
 
 public class SettingsManager {
     private final Map<String, String> settings = new HashMap<String, String>();
@@ -51,7 +51,7 @@ public class SettingsManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);   
+            Log.error(ex);   
         }
     }
 
@@ -92,7 +92,7 @@ public class SettingsManager {
             workgroupSettings.add(workgroup.getJID().toBareJID(), element);
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
     }
 }
\ No newline at end of file

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/settings/chat/ChatSettingsCreator.java

@@ -12,19 +12,6 @@
 
 package org.jivesoftware.openfire.fastpath.settings.chat;
 
-import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import com.thoughtworks.xstream.XStream;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.openfire.container.Plugin;
-import org.jivesoftware.openfire.container.PluginManager;
-import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.JID;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,6 +20,20 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.container.Plugin;
+import org.jivesoftware.openfire.container.PluginManager;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
+import org.xmpp.packet.JID;
+
+import com.thoughtworks.xstream.XStream;
+
 /**
  * Creates the default settings for the Web Chat UI. This includes the Web Chat UI
  * images and text settings.
@@ -232,7 +233,7 @@ public class ChatSettingsCreator {
                 stream = new FileInputStream(image);
             }
             catch (FileNotFoundException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
 
             if (stream != null) {
@@ -250,7 +251,7 @@ public class ChatSettingsCreator {
                             ChatSettings.SettingType.image_settings, encodedFile);
                 }
                 catch (IOException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }
@@ -284,10 +285,10 @@ public class ChatSettingsCreator {
             }
         }
         catch (UserNotFoundException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         catch (UnauthorizedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -394,7 +395,7 @@ public class ChatSettingsCreator {
                             encodedFile);
                 }
                 catch (IOException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/settings/chat/ChatSettingsManager.java

@@ -12,22 +12,22 @@
 
 package org.jivesoftware.openfire.fastpath.settings.chat;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.AgentSession;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.event.WorkgroupEventDispatcher;
 import org.jivesoftware.xmpp.workgroup.event.WorkgroupEventListener;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.PacketError;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Utility class for doing all Database operations related to the ChatSettings.
  * You would use this class to retrieve, update or insert new settings.
@@ -123,7 +123,7 @@ public class ChatSettingsManager implements WorkgroupEventListener {
         }
         catch (Exception ex) {
             cachedSettings.remove(workgroup.getJID().getNode());
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -174,14 +174,14 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         // Add to cache
@@ -209,14 +209,14 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         // Add to cache
@@ -243,14 +243,14 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         // Add to cache
@@ -279,14 +279,14 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         // Add to cache
@@ -344,7 +344,7 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 root.addElement("type").setText(Integer.toString(setting.getType().getType()));
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
 
@@ -439,14 +439,14 @@ public class ChatSettingsManager implements WorkgroupEventListener {
                 pstmt.executeUpdate();
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(ex);
+                Log.error(ex);
             }
             finally {
                 DbConnectionManager.closeConnection(pstmt, con);
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
     }
 

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/settings/offline/OfflineSettingsManager.java

@@ -12,14 +12,14 @@
 
 package org.jivesoftware.openfire.fastpath.settings.offline;
 
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.database.DbConnectionManager;
-import org.xmpp.component.ComponentManagerFactory;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+
 /**
  * Retrieves and persists offline settings for a workgroup.
  *
@@ -74,7 +74,7 @@ public class OfflineSettingsManager {
             pstmt.executeUpdate();
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
             return null;
         }
         finally {
@@ -112,7 +112,7 @@ public class OfflineSettingsManager {
             pstmt.executeUpdate();
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
             return null;
         }
         finally {
@@ -154,7 +154,7 @@ public class OfflineSettingsManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/util/WorkgroupUtils.java

@@ -115,7 +115,7 @@ public class WorkgroupUtils {
                 answer.add(algorithm);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
 
@@ -135,7 +135,7 @@ public class WorkgroupUtils {
                 answer.add(algorithm);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
         return answer;

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/Agent.java

@@ -12,20 +12,21 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
-import org.jivesoftware.xmpp.workgroup.spi.JiveLiveProperties;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Comparator;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.spi.JiveLiveProperties;
 import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Comparator;
-
 /**
  * Workgroup agents, which are stored in the database.
  *
@@ -192,7 +193,7 @@ public class Agent {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -218,7 +219,7 @@ public class Agent {
             pstmt.executeUpdate();
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/AgentManager.java

@@ -293,7 +293,7 @@ public class AgentManager {
             return true;
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -315,7 +315,7 @@ public class AgentManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/AgentSession.java

@@ -12,24 +12,32 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.dom4j.Element;
 import org.jivesoftware.openfire.fastpath.util.TaskEngine;
+import org.jivesoftware.util.FastDateFormat;
+import org.jivesoftware.util.LocaleUtils;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.interceptor.InterceptorManager;
 import org.jivesoftware.xmpp.workgroup.interceptor.OfferInterceptorManager;
 import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
 import org.jivesoftware.xmpp.workgroup.request.UserRequest;
-import org.dom4j.Element;
-import org.jivesoftware.util.FastDateFormat;
-import org.jivesoftware.util.LocaleUtils;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.Presence;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
 /**
  * <p>A 'live' agent session.</p>
  * <p>Agent sessions are only created and maintaned for available agents
@@ -212,7 +220,7 @@ public class AgentSession {
                     sendStatusOfAllAgents(workgroup);
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error("Error sending status of all agents", e);
+                    Log.error("Error sending status of all agents", e);
                 }
             }
         });
@@ -344,14 +352,14 @@ public class AgentSession {
                     offerPacket, false, true);
             }
             catch (PacketRejectedException e) {
-                ComponentManagerFactory.getComponentManager().getLog().warn("Offer was not sent " +
+                Log.warn("Offer was not sent " +
                     "due to interceptor REJECTION: " + offerPacket.toXML(), e);
             }
             return true;
 
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(LocaleUtils.getLocalizedString("admin.error"), e);
+            Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
             return false;
         }
     }
@@ -366,7 +374,7 @@ public class AgentSession {
             removeOffer(offer);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -554,7 +562,7 @@ public class AgentSession {
             this.offer = null;
         }
         else {
-            ComponentManagerFactory.getComponentManager().getLog().debug("Offer not removed. " +
+            Log.debug("Offer not removed. " +
                 "To remove: " +
                 offer +
                 " existing " +

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/RequestFilterFactory.java

@@ -12,9 +12,9 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
-import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.ClassUtils;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 
 /**
  * <p>Allows customers to customize the request filters being used by the workgroup.</p>
@@ -98,13 +98,13 @@ abstract public class RequestFilterFactory {
                             try {
                                 providers[i] = ClassUtils.forName(className);
                             } catch (Exception e){
-                                ComponentManagerFactory.getComponentManager().getLog().error(
+                                Log.error(
                                         "Exception loading class: " + className, e);
                             }
                         }
                         setProviders(providers);
                     } catch (Exception e) {
-                        ComponentManagerFactory.getComponentManager().getLog().error(
+                        Log.error(
                                 "Exception loading class: " + classNames, e);
                     }
                 }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/RequestQueue.java

@@ -11,30 +11,37 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
-import org.jivesoftware.xmpp.workgroup.dispatcher.Dispatcher;
-import org.jivesoftware.xmpp.workgroup.dispatcher.RoundRobinDispatcher;
-import org.jivesoftware.xmpp.workgroup.request.Request;
-import org.jivesoftware.xmpp.workgroup.request.UserRequest;
-import org.jivesoftware.xmpp.workgroup.spi.JiveLiveProperties;
-import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.CopyOnWriteArraySet;
+
 import org.dom4j.Element;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.openfire.group.Group;
 import org.jivesoftware.openfire.group.GroupManager;
 import org.jivesoftware.openfire.group.GroupNotFoundException;
 import org.jivesoftware.util.FastDateFormat;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.NotFoundException;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.xmpp.workgroup.dispatcher.Dispatcher;
+import org.jivesoftware.xmpp.workgroup.dispatcher.RoundRobinDispatcher;
+import org.jivesoftware.xmpp.workgroup.request.Request;
+import org.jivesoftware.xmpp.workgroup.request.UserRequest;
+import org.jivesoftware.xmpp.workgroup.spi.JiveLiveProperties;
+import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Presence;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 /**
  * Maintains a queue of requests waiting to be routed to agents. The workgroup
  * adds and removes requests according to the protocol and the routing engine
@@ -302,7 +309,7 @@ public class RequestQueue {
             workgroup.send(queueStatus);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -314,7 +321,7 @@ public class RequestQueue {
             workgroup.send(queueStatus);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -395,7 +402,7 @@ public class RequestQueue {
                 details.remove(user);
                 // Log an error if the request still belongs to this queue
                 if (this.equals(request.getRequestQueue())) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }
@@ -456,7 +463,7 @@ public class RequestQueue {
             try {
                 objects.add(groupManager.getGroup(group));
             } catch (GroupNotFoundException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error("Error retrieving group: " + group, e);
+                Log.error("Error retrieving group: " + group, e);
             }
         }
         return objects;
@@ -644,7 +651,7 @@ public class RequestQueue {
                 queue = workgroup.getRequestQueue(backupQueueID);
             }
             catch (NotFoundException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(
+                Log.error(
                         "Backup queue with ID " + backupQueueID + " not found", e);
                 queue = null;
             }
@@ -690,7 +697,7 @@ public class RequestQueue {
 
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -714,7 +721,7 @@ public class RequestQueue {
             pstmt.executeUpdate();
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -739,7 +746,7 @@ public class RequestQueue {
             return true;
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -765,7 +772,7 @@ public class RequestQueue {
             return true;
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -785,7 +792,7 @@ public class RequestQueue {
             return true;
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -805,7 +812,7 @@ public class RequestQueue {
             return true;
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -829,7 +836,7 @@ public class RequestQueue {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -854,12 +861,12 @@ public class RequestQueue {
                     agents.add(agent);
                 }
                 catch (AgentNotFoundException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/Workgroup.java

@@ -12,7 +12,35 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.database.SequenceManager;
 import org.jivesoftware.openfire.fastpath.util.TaskEngine;
+import org.jivesoftware.openfire.group.Group;
+import org.jivesoftware.util.FastDateFormat;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.NotFoundException;
+import org.jivesoftware.util.StringUtils;
 import org.jivesoftware.xmpp.workgroup.chatbot.Chatbot;
 import org.jivesoftware.xmpp.workgroup.dispatcher.BasicDispatcherInfo;
 import org.jivesoftware.xmpp.workgroup.dispatcher.DispatcherInfoProvider;
@@ -32,22 +60,18 @@ import org.jivesoftware.xmpp.workgroup.spi.dispatcher.DbDispatcherInfoProvider;
 import org.jivesoftware.xmpp.workgroup.utils.DbWorkgroup;
 import org.jivesoftware.xmpp.workgroup.utils.FastpathConstants;
 import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.database.SequenceManager;
-import org.jivesoftware.openfire.group.Group;
-import org.jivesoftware.util.FastDateFormat;
-import org.jivesoftware.util.NotFoundException;
-import org.jivesoftware.util.StringUtils;
 import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.muc.*;
-import org.xmpp.packet.*;
-
-import java.net.URL;
-import java.sql.*;
-import java.sql.Date;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import org.xmpp.muc.DestroyRoom;
+import org.xmpp.muc.Invitation;
+import org.xmpp.muc.JoinRoom;
+import org.xmpp.muc.LeaveRoom;
+import org.xmpp.muc.RoomConfiguration;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
+import org.xmpp.packet.Packet;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.Presence;
 
 /**
  * <p>Database implementation of a workgroup agent.</p>
@@ -216,7 +240,7 @@ public class Workgroup {
                     }
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error("Error broadcasting workgroup presence", e);
+                    Log.error("Error broadcasting workgroup presence", e);
                 }
             }
         });
@@ -235,7 +259,7 @@ public class Workgroup {
                     }
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error("Error broadcasting status of queues", e);
+                    Log.error("Error broadcasting status of queues", e);
                 }
             }
         });
@@ -275,7 +299,7 @@ public class Workgroup {
                 queue = new RequestQueue(this, queueID);
             }
             catch (UserAlreadyExistsException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
         else {
@@ -304,7 +328,7 @@ public class Workgroup {
                 dispatcherInfoProvider.deleteDispatcherInfo(queue.getID());
             }
             catch (UnauthorizedException e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -408,7 +432,7 @@ public class Workgroup {
             interceptorManager.invokeInterceptors(getJID().toBareJID(), packet, false, true);
         }
         catch (PacketRejectedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().warn("Packet was not sent " +
+            Log.warn("Packet was not sent " +
                 "due to interceptor REJECTION: " + packet.toXML(), e);
         }
     }
@@ -480,7 +504,7 @@ public class Workgroup {
             notification.setBody(e.getRejectionMessage());
             send(notification);
         }
-        ComponentManagerFactory.getComponentManager().getLog().warn("Packet was REJECTED " +
+        Log.warn("Packet was REJECTED " +
             "by interceptor: " + packet.toXML(), e);
     }
 
@@ -515,7 +539,7 @@ public class Workgroup {
                     // Log the error presence
                     String warnMessage = "Possible server misconfiguration. Received error " +
                         "presence:" + presence.toXML();
-                    ComponentManagerFactory.getComponentManager().getLog().warn(warnMessage);
+                    Log.warn(warnMessage);
                     return;
                 }
                 // Get the JID of the presence's user
@@ -832,7 +856,7 @@ public class Workgroup {
             request.invitationsSent(sessionID);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -1260,7 +1284,7 @@ public class Workgroup {
             }
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -1281,7 +1305,7 @@ public class Workgroup {
             }
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -1304,7 +1328,7 @@ public class Workgroup {
             return true;
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -1328,7 +1352,7 @@ public class Workgroup {
             return true;
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -1360,7 +1384,7 @@ public class Workgroup {
             return true;
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -1550,7 +1574,7 @@ public class Workgroup {
             reply.setChildElement(packet.getChildElement().createCopy());
             reply.setError(new PacketError(PacketError.Condition.item_not_found));
             send(reply);
-            ComponentManagerFactory.getComponentManager().getLog().debug("Agent not found while accepting offer");
+            Log.debug("Agent not found while accepting offer");
             return;
         }
         // Answer that the invitation was received and that it is being processed
@@ -1573,7 +1597,7 @@ public class Workgroup {
             reply.setChildElement(packet.getChildElement().createCopy());
             reply.setError(new PacketError(PacketError.Condition.item_not_found));
             send(reply);
-            ComponentManagerFactory.getComponentManager().getLog().debug("Agent not found while accepting offer");
+            Log.debug("Agent not found while accepting offer");
             return;
         }
         // Answer that the transfer was received and that it is being processed
@@ -1731,7 +1755,7 @@ public class Workgroup {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         return true;
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/WorkgroupIQHandler.java

@@ -12,8 +12,12 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
+import org.dom4j.Element;
 import org.jivesoftware.openfire.fastpath.WorkgroupSettings;
 import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
+import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.NotFoundException;
 import org.jivesoftware.xmpp.workgroup.interceptor.InterceptorManager;
 import org.jivesoftware.xmpp.workgroup.interceptor.OfferInterceptorManager;
 import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
@@ -23,10 +27,6 @@ import org.jivesoftware.xmpp.workgroup.request.Request;
 import org.jivesoftware.xmpp.workgroup.request.TransferRequest;
 import org.jivesoftware.xmpp.workgroup.request.UserRequest;
 import org.jivesoftware.xmpp.workgroup.utils.ModelUtil;
-import org.dom4j.Element;
-import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.NotFoundException;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
@@ -97,7 +97,7 @@ public class WorkgroupIQHandler {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             IQ reply = IQ.createResultIQ(packet);
             if (packet.getChildElement() != null) {
                 reply.setChildElement(packet.getChildElement().createCopy());
@@ -161,7 +161,7 @@ public class WorkgroupIQHandler {
             catch (NotFoundException e) {
                 reply.setChildElement(packet.getChildElement().createCopy());
                 reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                ComponentManagerFactory.getComponentManager().getLog().debug("Request not found" +
+                Log.debug("Request not found" +
                         " while departing queue:", e);
             }
         }
@@ -188,7 +188,7 @@ public class WorkgroupIQHandler {
                         if (agentSession == null) {
                             reply.setChildElement(packet.getChildElement().createCopy());
                             reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                            ComponentManagerFactory.getComponentManager().getLog()
+                            Log
                                     .debug("Agent not found while accepting offer");
                         }
                         else {
@@ -214,13 +214,13 @@ public class WorkgroupIQHandler {
             catch (NotFoundException e) {
                 reply.setChildElement(packet.getChildElement().createCopy());
                 reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                ComponentManagerFactory.getComponentManager().getLog().debug("Request not found " +
+                Log.debug("Request not found " +
                         "while accepting offer: ", e);
             }
             catch (AgentNotFoundException e) {
                 reply.setChildElement(packet.getChildElement().createCopy());
                 reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                ComponentManagerFactory.getComponentManager().getLog().debug("Agent not found " +
+                Log.debug("Agent not found " +
                         "while accepting offer: ", e);
             }
         }
@@ -247,7 +247,7 @@ public class WorkgroupIQHandler {
                         if (agentSession == null) {
                             reply.setChildElement(packet.getChildElement().createCopy());
                             reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                            ComponentManagerFactory.getComponentManager().getLog()
+                            Log
                                     .debug("Agent not found while accepting offer");
                         }
                         else {
@@ -269,13 +269,13 @@ public class WorkgroupIQHandler {
             catch (NotFoundException e) {
                 reply.setChildElement(packet.getChildElement().createCopy());
                 reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                ComponentManagerFactory.getComponentManager().getLog().debug("Request not found " +
+                Log.debug("Request not found " +
                         "while rejecting offer: ", e);
             }
             catch (AgentNotFoundException e) {
                 reply.setChildElement(packet.getChildElement().createCopy());
                 reply.setError(new PacketError(PacketError.Condition.item_not_found));
-                ComponentManagerFactory.getComponentManager().getLog().debug("Agent not found " +
+                Log.debug("Agent not found " +
                         "while accepting offer: ", e);
             }
         }
@@ -576,7 +576,7 @@ public class WorkgroupIQHandler {
     }
 
     private void dropPacket(Packet packet) {
-        ComponentManagerFactory.getComponentManager().getLog().info("Dropped packet: " +
+        Log.info("Dropped packet: " +
                 packet.toString());
     }
 }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/WorkgroupManager.java

@@ -12,19 +12,25 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
-import org.jivesoftware.openfire.fastpath.util.TaskEngine;
-import org.jivesoftware.openfire.fastpath.commands.CreateWorkgroup;
-import org.jivesoftware.openfire.fastpath.commands.DeleteWorkgroup;
-import org.jivesoftware.openfire.fastpath.events.EmailTranscriptEvent;
-import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
-import org.jivesoftware.openfire.fastpath.util.WorkgroupUtils;
-import org.jivesoftware.xmpp.workgroup.disco.IQDiscoInfoHandler;
-import org.jivesoftware.xmpp.workgroup.disco.IQDiscoItemsHandler;
-import org.jivesoftware.xmpp.workgroup.event.WorkgroupEventDispatcher;
-import org.jivesoftware.xmpp.workgroup.routing.RoutingManager;
-import org.jivesoftware.xmpp.workgroup.search.ChatSearchManager;
-import org.jivesoftware.xmpp.workgroup.search.IQChatSearchHandler;
-import org.jivesoftware.xmpp.workgroup.utils.FastpathConstants;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 import org.dom4j.Element;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.database.SequenceManager;
@@ -33,26 +39,36 @@ import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.commands.AdHocCommandManager;
 import org.jivesoftware.openfire.event.GroupEventDispatcher;
 import org.jivesoftware.openfire.event.GroupEventListener;
+import org.jivesoftware.openfire.fastpath.commands.CreateWorkgroup;
+import org.jivesoftware.openfire.fastpath.commands.DeleteWorkgroup;
+import org.jivesoftware.openfire.fastpath.events.EmailTranscriptEvent;
+import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
+import org.jivesoftware.openfire.fastpath.util.TaskEngine;
+import org.jivesoftware.openfire.fastpath.util.WorkgroupUtils;
 import org.jivesoftware.openfire.group.Group;
 import org.jivesoftware.openfire.net.SASLAuthentication;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.xmpp.workgroup.disco.IQDiscoInfoHandler;
+import org.jivesoftware.xmpp.workgroup.disco.IQDiscoItemsHandler;
+import org.jivesoftware.xmpp.workgroup.event.WorkgroupEventDispatcher;
+import org.jivesoftware.xmpp.workgroup.routing.RoutingManager;
+import org.jivesoftware.xmpp.workgroup.search.ChatSearchManager;
+import org.jivesoftware.xmpp.workgroup.search.IQChatSearchHandler;
+import org.jivesoftware.xmpp.workgroup.utils.FastpathConstants;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentException;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.*;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
+import org.xmpp.packet.Packet;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.Presence;
 
 /**
  * Manages workgroups in the system. This manager primarily defers to the workgroups
@@ -316,7 +332,7 @@ public class WorkgroupManager implements Component {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             if (id != -1) {
                 try {
                     if (workgroup != null) {
@@ -326,7 +342,7 @@ public class WorkgroupManager implements Component {
                     }
                 }
                 catch (Exception e1) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e1);
+                    Log.error(e1);
                 }
             }
             if (e instanceof UserAlreadyExistsException) {
@@ -532,7 +548,7 @@ public class WorkgroupManager implements Component {
                             ChatSearchManager.getInstanceFor(group).updateIndex(false);
                         }
                         catch (IOException e) {
-                            ComponentManagerFactory.getComponentManager().getLog().error(e);
+                            Log.error(e);
                         }
                     }
                 }
@@ -583,7 +599,7 @@ public class WorkgroupManager implements Component {
             return true;
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -601,7 +617,7 @@ public class WorkgroupManager implements Component {
             pstmt.executeUpdate();
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -626,7 +642,7 @@ public class WorkgroupManager implements Component {
             }
         }
         catch (SQLException ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             workgroupLock.writeLock().unlock();
@@ -695,7 +711,7 @@ public class WorkgroupManager implements Component {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -831,7 +847,7 @@ public class WorkgroupManager implements Component {
         }
         catch (ComponentException e) {
             // Do nothing. This error should never happen
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -909,7 +925,7 @@ public class WorkgroupManager implements Component {
             return true;
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         return false;
     }
@@ -927,7 +943,7 @@ public class WorkgroupManager implements Component {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             return false;
         }
         return true;

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/WorkgroupPresence.java

@@ -12,20 +12,6 @@
 
 package org.jivesoftware.xmpp.workgroup;
 
-import org.jivesoftware.openfire.fastpath.util.TaskEngine;
-import org.jivesoftware.xmpp.workgroup.interceptor.AgentInterceptorManager;
-import org.jivesoftware.xmpp.workgroup.interceptor.InterceptorManager;
-import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.util.ConcurrentHashSet;
-import org.jivesoftware.util.FastDateFormat;
-import org.jivesoftware.util.JiveConstants;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.PacketError;
-import org.xmpp.packet.Presence;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -36,6 +22,20 @@ import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.openfire.fastpath.util.TaskEngine;
+import org.jivesoftware.util.ConcurrentHashSet;
+import org.jivesoftware.util.FastDateFormat;
+import org.jivesoftware.util.JiveConstants;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.interceptor.AgentInterceptorManager;
+import org.jivesoftware.xmpp.workgroup.interceptor.InterceptorManager;
+import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.Presence;
+
 /**
  * <p>The Workgroup's presence handler processes all incoming
  * presence packets sent to the workgroup.</p>
@@ -151,13 +151,13 @@ public class WorkgroupPresence {
                     errorMessage.append(packet.getFrom().toString());
                     errorMessage.append(" Workgroup: ");
                     errorMessage.append(workgroup.getJID().toString());
-                    ComponentManagerFactory.getComponentManager().getLog().debug(errorMessage.toString(), e);
+                    Log.debug(errorMessage.toString(), e);
                 }
             }
 
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             Presence reply = new Presence();
             reply.setError(new PacketError(PacketError.Condition.internal_server_error));
             reply.setTo(packet.getFrom());
@@ -215,7 +215,7 @@ public class WorkgroupPresence {
                     }
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(
+                    Log.error(
                             "Error broadcasting available presence", e);
                 }
             }
@@ -241,7 +241,7 @@ public class WorkgroupPresence {
                     deleteRosterItems();
                 }
                 catch (Exception e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(
+                    Log.error(
                             "Error broadcasting available presence", e);
                 }
             }
@@ -351,7 +351,7 @@ public class WorkgroupPresence {
             presenceSubscribers.addAll(jids);
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(
+            Log.error(
                     "Error loading workgroup roster items ", e);
         }
         finally {

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/WorkgroupStats.java

@@ -132,7 +132,7 @@ public class WorkgroupStats {
                 }
             }
             catch (Exception ex) {
-                ComponentManagerFactory.getComponentManager().getLog().error(
+                Log.error(
                     "Error retrieving chat transcript(s)", ex);
             }
             finally {
@@ -142,7 +142,7 @@ public class WorkgroupStats {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
     }
 
@@ -183,7 +183,7 @@ public class WorkgroupStats {
             workgroup.send(reply);
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(
+            Log.error(
                     "There was an error retrieving the following transcript. SessionID = " +
                     sessionID + " Transcript=" + transcriptXML, ex);
 
@@ -220,7 +220,7 @@ public class WorkgroupStats {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/chatbot/Chatbot.java

@@ -12,6 +12,11 @@
 
 package org.jivesoftware.xmpp.workgroup.chatbot;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.jivesoftware.openfire.fastpath.dataforms.FormElement;
 import org.jivesoftware.openfire.fastpath.dataforms.FormManager;
 import org.jivesoftware.openfire.fastpath.dataforms.WorkgroupForm;
@@ -19,6 +24,8 @@ import org.jivesoftware.openfire.fastpath.history.ChatTranscriptManager;
 import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettings;
 import org.jivesoftware.openfire.fastpath.settings.chat.ChatSettingsManager;
 import org.jivesoftware.openfire.fastpath.settings.chat.KeyEnum;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.NotFoundException;
 import org.jivesoftware.xmpp.workgroup.UnauthorizedException;
 import org.jivesoftware.xmpp.workgroup.UserCommunicationMethod;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
@@ -28,16 +35,9 @@ import org.jivesoftware.xmpp.workgroup.interceptor.PacketRejectedException;
 import org.jivesoftware.xmpp.workgroup.interceptor.QueueInterceptorManager;
 import org.jivesoftware.xmpp.workgroup.request.Request;
 import org.jivesoftware.xmpp.workgroup.request.UserRequest;
-import org.jivesoftware.util.NotFoundException;
-import org.xmpp.component.ComponentManagerFactory;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Message;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * A Chatbot holds a sequence of steps where each step represents an interaction with a
  * user. The user may navigate sequentially between the defined steps in the Chatbot.<p>
@@ -646,7 +646,7 @@ public class Chatbot implements UserCommunicationMethod {
                     true);
         }
         catch (PacketRejectedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().warn("Packet was not sent " +
+            Log.warn("Packet was not sent " +
                     "due to interceptor REJECTION: " + packet.toXML(), e);
         }
     }
@@ -1013,7 +1013,7 @@ public class Chatbot implements UserCommunicationMethod {
         for (ChatbotSession session : sessions.values()) {
             // Do not clean up sessions whose users are having a chat with an agent.
             if (!session.isStartedSupport() && session.getLastActiveDate().getTime() < deadline)  {
-                ComponentManagerFactory.getComponentManager().getLog().debug("Removing idle chat " +
+                Log.debug("Removing idle chat " +
                         "session for: " +
                         session.getUserJID());
                 removeSession(session.getUserJID());
@@ -1032,7 +1032,7 @@ public class Chatbot implements UserCommunicationMethod {
                     String.valueOf(timeout));
         }
         catch (UnauthorizedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error("Error setting timeout",
+            Log.error("Error setting timeout",
                     e);
         }
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/event/WorkgroupEventDispatcher.java

@@ -12,14 +12,13 @@
 
 package org.jivesoftware.xmpp.workgroup.event;
 
-import org.jivesoftware.xmpp.workgroup.AgentSession;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.xmpp.component.ComponentManagerFactory;
-
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.AgentSession;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+
 /**
  * Dispatches workgroup events. Since the dispatching is done on the "main" thread
  * it is important that WorkgroupEventListeners finish their jobs as soon as possible
@@ -68,7 +67,7 @@ public class WorkgroupEventDispatcher {
                 listener.workgroupCreated(workgroup);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -84,7 +83,7 @@ public class WorkgroupEventDispatcher {
                 listener.workgroupDeleting(workgroup);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -100,7 +99,7 @@ public class WorkgroupEventDispatcher {
                 listener.workgroupDeleted(workgroup);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -117,7 +116,7 @@ public class WorkgroupEventDispatcher {
                 listener.workgroupOpened(workgroup);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -134,7 +133,7 @@ public class WorkgroupEventDispatcher {
                 listener.workgroupClosed(workgroup);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -151,7 +150,7 @@ public class WorkgroupEventDispatcher {
                 listener.agentJoined(workgroup, agentSession);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -168,7 +167,7 @@ public class WorkgroupEventDispatcher {
                 listener.agentDeparted(workgroup, agentSession);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -185,7 +184,7 @@ public class WorkgroupEventDispatcher {
                 listener.chatSupportStarted(workgroup, sessionID);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -202,7 +201,7 @@ public class WorkgroupEventDispatcher {
                 listener.chatSupportFinished(workgroup, sessionID);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -224,7 +223,7 @@ public class WorkgroupEventDispatcher {
                 listener.agentJoinedChatSupport(workgroup, sessionID, agentSession);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }
@@ -243,7 +242,7 @@ public class WorkgroupEventDispatcher {
                 listener.agentLeftChatSupport(workgroup, sessionID, agentSession);
             }
             catch (Exception e) {
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/interceptor/RoomInterceptorManager.java

@@ -12,12 +12,12 @@
 
 package org.jivesoftware.xmpp.workgroup.interceptor;
 
-import org.xmpp.packet.Packet;
-import org.xmpp.component.ComponentManagerFactory;
-
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.jivesoftware.util.Log;
+import org.xmpp.packet.Packet;
+
 /**
  * Manages the packet interceptors that will be invoked when sending packets for creating and
  * configuring a room, when sending room invitations to the agent and the user or when detecting
@@ -47,7 +47,7 @@ public class RoomInterceptorManager extends InterceptorManager {
             super.invokeInterceptors(workgroup, packet, read, processed);
         }
         catch (PacketRejectedException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error("Cannot reject " +
+            Log.error("Cannot reject " +
                     "room packet",e);
         }
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/request/Request.java

@@ -12,24 +12,30 @@
 
 package org.jivesoftware.xmpp.workgroup.request;
 
-import org.jivesoftware.xmpp.workgroup.AgentSession;
-import org.jivesoftware.xmpp.workgroup.Offer;
-import org.jivesoftware.xmpp.workgroup.RequestQueue;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.utils.FastpathConstants;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 import org.jivesoftware.database.SequenceManager;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.NotFoundException;
 import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.xmpp.workgroup.AgentSession;
+import org.jivesoftware.xmpp.workgroup.Offer;
+import org.jivesoftware.xmpp.workgroup.RequestQueue;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.utils.FastpathConstants;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * <p>Database compatible workgroup request information.</p>
  *
@@ -78,7 +84,7 @@ public abstract class Request {
     public static Request getRequest(String requestID) throws NotFoundException {
         Request request = requests.get(requestID);
         if (request == null) {
-            ComponentManagerFactory.getComponentManager().getLog().debug("Request not found by ID: " + requestID);
+            Log.debug("Request not found by ID: " + requestID);
             throw new NotFoundException();
         }
         return request;

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/request/UserRequest.java

@@ -12,30 +12,35 @@
 
 package org.jivesoftware.xmpp.workgroup.request;
 
-import org.jivesoftware.xmpp.workgroup.AgentSession;
-import org.jivesoftware.xmpp.workgroup.RequestQueue;
-import org.jivesoftware.xmpp.workgroup.UserCommunicationMethod;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.chatbot.ChatbotSession;
-import org.jivesoftware.xmpp.workgroup.spi.WorkgroupCompatibleClient;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.NotFoundException;
 import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
+import org.jivesoftware.xmpp.workgroup.AgentSession;
+import org.jivesoftware.xmpp.workgroup.RequestQueue;
+import org.jivesoftware.xmpp.workgroup.UserCommunicationMethod;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.chatbot.ChatbotSession;
+import org.jivesoftware.xmpp.workgroup.spi.WorkgroupCompatibleClient;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
 /**
  * Requests made by users to get support by some agent.
  *
@@ -101,7 +106,7 @@ public class UserRequest extends Request {
             }
         }
         if (request == null) {
-            ComponentManagerFactory.getComponentManager().getLog().debug("Request not found for " +
+            Log.debug("Request not found for " +
                     address.toString());
             throw new NotFoundException();
         }
@@ -194,7 +199,7 @@ public class UserRequest extends Request {
             communicationMethod.notifyQueueStatus(workgroup.getJID(), userJID, this, isPolling);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -374,7 +379,7 @@ public class UserRequest extends Request {
             communicationMethod.notifyQueueDepartued(sender, userJID, this, type);
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -455,7 +460,7 @@ public class UserRequest extends Request {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(
+            Log.error(
                     "There was an issue handling offer update using sessionID " + requestID, ex);
         }
         finally {
@@ -484,7 +489,7 @@ public class UserRequest extends Request {
             pstmt.close();
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/routing/RoutingManager.java

@@ -223,7 +223,7 @@ public final class RoutingManager {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/search/ChatSearch.java

@@ -312,19 +312,19 @@ public class ChatSearch {
                     results.add(result);
                 }
                 catch (NumberFormatException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
 
             hits = null;
         }
         catch (ParseException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error("Search failure - " +
+            Log.error("Search failure - " +
                     "lucene error parsing query: " + queryString, e);
             results.clear();
         }
         catch(Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             results.clear();
         }
         finally {

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/search/IQChatSearchHandler.java

 /**
+
  * $RCSfile$
  * $Revision: 19360 $
  * $Date: 2005-07-21 10:04:49 -0700 (Thu, 21 Jul 2005) $
@@ -12,19 +13,6 @@
 
 package org.jivesoftware.xmpp.workgroup.search;
 
-import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.dom4j.Element;
-import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.forms.DataForm;
-import org.xmpp.forms.FormField;
-import org.xmpp.packet.IQ;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.PacketError;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -36,6 +24,19 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.dom4j.Element;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.xmpp.workgroup.AgentNotFoundException;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.xmpp.forms.DataForm;
+import org.xmpp.forms.FormField;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.PacketError;
+
 /**
  * This class is responsible for handling all the packets sent to the workgroup service whose
  * element name is transcript-search. If no data form is present inside the child element then
@@ -90,7 +91,7 @@ public class IQChatSearchHandler {
                             startDate = DataForm.parseDate(field.getValues().get(0));
                         }
                         catch (ParseException e) {
-                            ComponentManagerFactory.getComponentManager().getLog().debug("Invalid startDate " +
+                            Log.debug("Invalid startDate " +
                                 field.getValues().get(0), e);
                         }
                     }
@@ -99,7 +100,7 @@ public class IQChatSearchHandler {
                             endDate = DataForm.parseDate(field.getValues().get(0));
                         }
                         catch (ParseException e) {
-                            ComponentManagerFactory.getComponentManager().getLog().debug("Invalid endDate " +
+                            Log.debug("Invalid endDate " +
                                 field.getValues().get(0), e);
                         }
                     }
@@ -113,7 +114,7 @@ public class IQChatSearchHandler {
                                             new JID(value)));
                                 }
                                 catch (UserNotFoundException e) {
-                                    ComponentManagerFactory.getComponentManager().getLog().debug("Invalid workgroup JID " +
+                                    Log.debug("Invalid workgroup JID " +
                                         value, e);
                                 }
                             }
@@ -233,7 +234,7 @@ public class IQChatSearchHandler {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/spi/ChatHistoryUtils.java

 package org.jivesoftware.xmpp.workgroup.spi;
 
-import org.jivesoftware.xmpp.workgroup.RequestQueue;
-import org.jivesoftware.xmpp.workgroup.Workgroup;
-import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
-import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
-import org.xmpp.packet.JID;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -18,6 +9,15 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.openfire.user.UserNotFoundException;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.xmpp.workgroup.RequestQueue;
+import org.jivesoftware.xmpp.workgroup.Workgroup;
+import org.jivesoftware.xmpp.workgroup.WorkgroupManager;
+import org.xmpp.packet.JID;
+
 
 /**
  * <code>ChatHistoryImpl</code> class is used for statistical reporting of
@@ -103,15 +103,15 @@ public final class ChatHistoryUtils {
                     }
                 }
                 catch (SQLException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
                 catch (NumberFormatException e) {
-                    ComponentManagerFactory.getComponentManager().getLog().error(e);
+                    Log.error(e);
                 }
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -134,7 +134,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         if (workgroup == null) {
             return 0;
@@ -157,7 +157,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -179,7 +179,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         int totalWorkgroupChatTime = 0;
@@ -206,7 +206,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -247,7 +247,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -270,7 +270,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         if (workgroup == null) {
             return 0;
@@ -295,7 +295,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -323,7 +323,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -345,7 +345,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         if (workgroup == null) {
             return 0;
@@ -370,7 +370,7 @@ public final class ChatHistoryUtils {
             }
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -392,7 +392,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
 
         int count = 0;
@@ -457,7 +457,7 @@ public final class ChatHistoryUtils {
             count = rs.getInt(1);
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -483,7 +483,7 @@ public final class ChatHistoryUtils {
             count = rs.getInt(1);
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -509,7 +509,7 @@ public final class ChatHistoryUtils {
             totalWaitTime = rs.getInt(1);
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -531,7 +531,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupName));
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         if (workgroup == null) {
             return 0;
@@ -555,7 +555,7 @@ public final class ChatHistoryUtils {
             waitTime = rs.getInt(1);
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
             DbConnectionManager.closeConnection(rs, pstmt, con);
@@ -606,7 +606,7 @@ public final class ChatHistoryUtils {
             workgroup = WorkgroupManager.getInstance().getWorkgroup(new JID(workgroupJID));
         }
         catch (UserNotFoundException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error("Error retrieving Workgroup", e);
+            Log.error("Error retrieving Workgroup", e);
         }
         return workgroup;
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/spi/JiveLiveProperties.java

@@ -119,7 +119,7 @@ public class JiveLiveProperties implements DbProperties {
             pstmt.executeUpdate();
         }
         catch (SQLException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/spi/routers/MetaDataRouter.java

@@ -11,15 +11,15 @@
  */
 package org.jivesoftware.xmpp.workgroup.spi.routers;
 
+import java.util.List;
+import java.util.Map;
+
+import org.jivesoftware.util.Log;
 import org.jivesoftware.xmpp.workgroup.DbProperties;
 import org.jivesoftware.xmpp.workgroup.RequestQueue;
 import org.jivesoftware.xmpp.workgroup.Workgroup;
 import org.jivesoftware.xmpp.workgroup.request.UserRequest;
 import org.jivesoftware.xmpp.workgroup.routing.RequestRouter;
-import org.xmpp.component.ComponentManagerFactory;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>Routes requests to the queue with the most matching meta-data.</p>
@@ -132,7 +132,7 @@ public class MetaDataRouter extends RequestRouter {
             }
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         return currentMatch;
     }

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/utils/DbWorkgroup.java

@@ -12,14 +12,14 @@
 
 package org.jivesoftware.xmpp.workgroup.utils;
 
-import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.util.StringUtils;
-import org.xmpp.component.ComponentManagerFactory;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.util.Date;
 
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+
 /**
  * Handles basic DB Operations.
  */
@@ -56,7 +56,7 @@ public class DbWorkgroup {
             pstmt.executeUpdate();
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
         finally {
             DbConnectionManager.closeConnection(pstmt, con);
@@ -93,7 +93,7 @@ public class DbWorkgroup {
             pstmt.executeUpdate();
         }
         catch (Exception ex) {
-            ComponentManagerFactory.getComponentManager().getLog().error(ex);
+            Log.error(ex);
         }
         finally {
            DbConnectionManager.closeConnection(pstmt, con);

src/plugins/fastpath/src/java/org/jivesoftware/xmpp/workgroup/utils/URLFileSystem.java

@@ -12,13 +12,17 @@
 
 package org.jivesoftware.xmpp.workgroup.utils;
 
-import org.xmpp.component.ComponentManagerFactory;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLConnection;
 
+import org.jivesoftware.util.Log;
+
 /**
  * <code>URLFileSystem</code> class handles some of the most common
  * functionallity when working with URLs.
@@ -457,7 +461,7 @@ public class URLFileSystem {
             return seed;
         }
         catch (Exception e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
             return null;
         }
     }

src/plugins/fastpath/src/web/upload.jsp

-<%@ page import="
+<%@ page import="org.jivesoftware.util.Log,
                  org.jivesoftware.xmpp.workgroup.Workgroup,
                  org.jivesoftware.xmpp.workgroup.WorkgroupManager,
                  org.xmpp.component.ComponentManagerFactory,
@@ -55,7 +55,7 @@
         response.sendRedirect("workgroup-image-settings.jsp?wgID=" + workgroup + "&updated=true");
     }
     catch (Exception ex) {
-        ComponentManagerFactory.getComponentManager().getLog().error(ex);
+        Log.error(ex);
     }
 %>
 
@@ -66,7 +66,7 @@
              return encodedFile;
          }
          catch (Exception ex) {
-             ComponentManagerFactory.getComponentManager().getLog().error(ex);
+             Log.error(ex);
          }
          return null;
      }
@@ -79,7 +79,7 @@
              workgroup = WorkgroupManager.getInstance().getWorkgroup(workgroupJID);
          }
          catch (UserNotFoundException e) {
-             ComponentManagerFactory.getComponentManager().getLog().error(e);
+             Log.error(e);
              return;
          }
          ChatSetting set = chatSettingsManager.getChatSetting(workgroup, setting);

src/plugins/fastpath/src/web/uploadSounds.jsp

@@ -8,6 +8,7 @@
                  org.xmpp.packet.JID,
                  java.util.Iterator,
                  java.util.List,
+                 org.jivesoftware.util.Log,
                  org.jivesoftware.util.StringUtils,
                  org.jivesoftware.openfire.user.UserNotFoundException,
                  org.jivesoftware.xmpp.workgroup.UnauthorizedException,
@@ -51,7 +52,7 @@
         response.sendRedirect("workgroup-sound-settings.jsp?wgID=" + workgroup + "&updated=true");
     }
     catch (Exception ex) {
-        ComponentManagerFactory.getComponentManager().getLog().error(ex);
+        Log.error(ex);
     }
 %>
 
@@ -62,7 +63,7 @@
              return encodedFile;
          }
          catch (Exception ex) {
-             ComponentManagerFactory.getComponentManager().getLog().error(ex);
+             Log.error(ex);
          }
          return null;
      }
@@ -74,7 +75,7 @@
              workgroup = WorkgroupManager.getInstance().getWorkgroup(workgroupJID);
          }
          catch (UserNotFoundException e) {
-             ComponentManagerFactory.getComponentManager().getLog().error(e);
+             Log.error(e);
              return;
          }
 

src/plugins/fastpath/src/web/workgroup-queue-agents.jsp

@@ -12,6 +12,7 @@
                 org.jivesoftware.xmpp.workgroup.WorkgroupAdminManager,
                 org.jivesoftware.xmpp.workgroup.WorkgroupManager,
                 org.jivesoftware.xmpp.workgroup.dispatcher.DispatcherInfo,
+                org.jivesoftware.util.Log,
                 org.jivesoftware.util.ParamUtils,
                 org.jivesoftware.openfire.group.Group,
                 org.jivesoftware.openfire.group.GroupManager,
@@ -77,7 +78,7 @@
             }
             catch (Exception e) {
                 errors.put("groups", "Group not found.");
-                ComponentManagerFactory.getComponentManager().getLog().error(e);
+                Log.error(e);
             }
         }
 

src/plugins/monitoring/src/java/org/jivesoftware/openfire/archive/ConversationUtils.java

@@ -85,7 +85,7 @@ public class ConversationUtils {
             info = toConversationInfo(conversation, formatParticipants);
         }
         catch (NotFoundException e) {
-            ComponentManagerFactory.getComponentManager().getLog().error(e);
+            Log.error(e);
         }
 
         return info;

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

@@ -12,7 +12,10 @@
 
 package org.jivesoftware.openfire.plugin;
 
-import org.jivesoftware.util.JiveGlobals;
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.jivesoftware.openfire.PresenceManager;
 import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.container.Plugin;
@@ -20,6 +23,8 @@ import org.jivesoftware.openfire.container.PluginManager;
 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.xmpp.component.Component;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
@@ -27,10 +32,6 @@ import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.Presence;
 
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * Plugin that includes a servlet that provides information about users' and components'
  * presence in the server. For security reasons, the XMPP spec does not allow anyone to see
@@ -75,7 +76,7 @@ public class PresencePlugin implements Plugin, Component {
             componentManager.addComponent(subdomain, this);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 
@@ -88,7 +89,7 @@ public class PresencePlugin implements Plugin, Component {
             componentManager = null;
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
     }
 

src/plugins/search/src/java/org/jivesoftware/openfire/plugin/SearchPlugin.java

@@ -139,7 +139,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
             componentManager.addComponent(serviceName, this);
         }
         catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         PropertyEventDispatcher.addListener(this);
     }
@@ -175,7 +175,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
         }
         catch (Exception e) {
             if (componentManager != null) {
-                componentManager.getLog().error(e);
+                Log.error(e);
             }
         }
         serviceName = null;
@@ -217,7 +217,7 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
         try {
             componentManager.sendPacket(this, replyPacket);
         } catch (ComponentException e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
 
     }
@@ -936,14 +936,14 @@ public class SearchPlugin implements Component, Plugin, PropertyEventListener {
             componentManager.removeComponent(this.serviceName);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         
         try {
             componentManager.addComponent(serviceName, this);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         
         this.serviceName = serviceName;

src/plugins/sip/src/java/org/jivesoftware/openfire/sip/SipManager.java

@@ -12,20 +12,21 @@
 
 package org.jivesoftware.openfire.sip;
 
+import java.io.File;
+import java.util.Map;
+
 import org.jivesoftware.openfire.container.Plugin;
 import org.jivesoftware.openfire.container.PluginManager;
 import org.jivesoftware.openfire.sip.log.LogComponent;
 import org.jivesoftware.openfire.sip.log.LogListenerImpl;
 import org.jivesoftware.openfire.sip.sipaccount.SipComponent;
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.PropertyEventDispatcher;
 import org.jivesoftware.util.PropertyEventListener;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
 
-import java.util.Map;
-import java.io.File;
-
 /**
  * Remote management for users SIP account for Spark SIP Plugin
  *
@@ -62,17 +63,17 @@ public class SipManager implements Plugin, PropertyEventListener {
             componentManager.addComponent(serviceName, sipComponent);
 
         } catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         try {
             componentManager.addComponent(LogComponent.NAME, logComponent);
 
         } catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
 
         PropertyEventDispatcher.addListener(this);
-        componentManager.getLog().debug("SIPARK STARTED");
+        Log.debug("SIPARK STARTED");
     }
 
     public void destroyPlugin() {
@@ -82,12 +83,12 @@ public class SipManager implements Plugin, PropertyEventListener {
             try {
                 componentManager.removeComponent(serviceName);
             } catch (Exception e) {
-                componentManager.getLog().error(e);
+                Log.error(e);
             }
             try {
                 componentManager.removeComponent(LogComponent.NAME);
             } catch (Exception e) {
-                componentManager.getLog().error(e);
+                Log.error(e);
             }
         }
         sipComponent = null;
@@ -130,12 +131,12 @@ public class SipManager implements Plugin, PropertyEventListener {
         try {
             componentManager.removeComponent(this.serviceName);
         } catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         try {
             componentManager.addComponent(serviceName, sipComponent);
         } catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
         this.serviceName = serviceName;
     }

src/plugins/sip/src/java/org/jivesoftware/openfire/sip/log/LogComponent.java

@@ -13,6 +13,7 @@
 package org.jivesoftware.openfire.sip.log;
 
 import org.dom4j.Element;
+import org.jivesoftware.util.Log;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.packet.IQ;
@@ -100,7 +101,7 @@ public class LogComponent implements Component{
 		try {
 			componentManager.sendPacket(this, reply);
 		} catch (Exception e) {
-			componentManager.getLog().error(e);
+			Log.error(e);
 		}
 
 	} // Other Methods

src/plugins/sip/src/java/org/jivesoftware/openfire/sip/log/LogListenerImpl.java

@@ -12,16 +12,17 @@
 
 package org.jivesoftware.openfire.sip.log;
 
+import java.sql.SQLException;
+import java.util.Date;
+
 import org.dom4j.Element;
 import org.jivesoftware.openfire.sip.calllog.CallLog;
 import org.jivesoftware.openfire.sip.calllog.CallLogDAO;
 import org.jivesoftware.openfire.sip.calllog.CallLogExtension;
+import org.jivesoftware.util.Log;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.packet.IQ;
 
-import java.sql.SQLException;
-import java.util.Date;
-
 /**
  * Implements a LogListener.
  * Log every call events of SIP users that are using Spark SIP plugin
@@ -65,7 +66,7 @@ public class LogListenerImpl implements LogListener {
                 try {
                     CallLogDAO.insert(callLog);
                 } catch (SQLException e) {
-                    componentManager.getLog().error(e);
+                    Log.error(e);
                 }
             }
         }

src/plugins/sip/src/java/org/jivesoftware/openfire/sip/sipaccount/SipComponent.java

@@ -12,10 +12,13 @@
 
 package org.jivesoftware.openfire.sip.sipaccount;
 
+import java.sql.SQLException;
+
 import org.dom4j.Element;
 import org.jivesoftware.openfire.event.SessionEventDispatcher;
 import org.jivesoftware.openfire.event.SessionEventListener;
 import org.jivesoftware.openfire.session.Session;
+import org.jivesoftware.util.Log;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentManager;
 import org.xmpp.component.ComponentManagerFactory;
@@ -24,8 +27,6 @@ import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 
-import java.sql.SQLException;
-
 /**
  * Implements an openfire Component and SessionEventListener. Controls every
  * registration inf request and process user's SIP presence informations.
@@ -63,7 +64,7 @@ public class SipComponent implements Component, SessionEventListener {
     // Component Interface
 
     public void processPacket(Packet packet) {
-        componentManager.getLog().debug(packet.toXML());
+        Log.debug(packet.toXML());
         if (packet instanceof IQ) {
             // Handle disco packets
             IQ iq = (IQ)packet;
@@ -131,7 +132,7 @@ public class SipComponent implements Component, SessionEventListener {
                                 SipAccountDAO.update(sipAccount);
                             }
                             catch (SQLException e) {
-                                componentManager.getLog().error(e);
+                                Log.error(e);
                             }
                         }
                     }
@@ -147,9 +148,9 @@ public class SipComponent implements Component, SessionEventListener {
             componentManager.sendPacket(this, reply);
         }
         catch (Exception e) {
-            componentManager.getLog().error(e);
+            Log.error(e);
         }
-        componentManager.getLog().debug("PACKET SENT: " + reply.toXML());
+        Log.debug("PACKET SENT: " + reply.toXML());
     } // Other Methods
 
     public String getDescription() {
@@ -191,7 +192,7 @@ public class SipComponent implements Component, SessionEventListener {
                 SipAccountDAO.update(sipAccount);
             }
             catch (SQLException e) {
-                componentManager.getLog().error(e);
+                Log.error(e);
             }
         }