Refactoring wortk. JM-924

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

src/java/org/jivesoftware/wildfire/Channel.java

@@ -3,7 +3,7 @@
  * $Revision: 617 $
  * $Date: 2004-12-03 05:59:50 -0300 (Fri, 03 Dec 2004) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,13 +11,15 @@
 
 package org.jivesoftware.wildfire;
 
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.util.Log;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.Packet;
 
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 /**
  * A channel provides a mechanism to queue work units for processing. Each work unit is
  * encapsulated as a ChannelMessage, and processing of each message is performed by a

src/java/org/jivesoftware/wildfire/audit/AuditEvent.java

@@ -3,7 +3,7 @@
  * $Revision: 37 $
  * $Date: 2004-10-21 03:08:43 -0300 (Thu, 21 Oct 2004) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,7 +11,8 @@
 
 package org.jivesoftware.wildfire.audit;
 
-import org.jivesoftware.wildfire.Session;
+import org.jivesoftware.wildfire.session.Session;
+
 import java.util.Date;
 
 /**

src/java/org/jivesoftware/wildfire/audit/Auditor.java

@@ -3,7 +3,7 @@
  * $Revision: 719 $
  * $Date: 2004-12-20 13:16:01 -0300 (Mon, 20 Dec 2004) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,8 +11,8 @@
 
 package org.jivesoftware.wildfire.audit;
 
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.Packet;
-import org.jivesoftware.wildfire.Session;
 
 /**
  * <p>Use auditors to audit events and messages on the server.</p>

src/java/org/jivesoftware/wildfire/audit/SessionEvent.java

@@ -3,7 +3,7 @@
  * $Revision: 38 $
  * $Date: 2004-10-21 03:30:10 -0300 (Thu, 21 Oct 2004) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,7 +11,8 @@
 
 package org.jivesoftware.wildfire.audit;
 
-import org.jivesoftware.wildfire.Session;
+import org.jivesoftware.wildfire.session.Session;
+
 import java.util.Date;
 
 /**
@@ -72,6 +73,8 @@ public class SessionEvent extends AuditEvent {
      * Create an event associated with the failure of a session to authenticate.
      *
      * @param session the session that made the attempt
+     * @param user the user that made the attempt
+     * @param resource the resource used for the attempt
      * @return an event representing the connection event
      */
     public static SessionEvent createAuthFailureEvent(Session session, String user,

src/java/org/jivesoftware/wildfire/audit/spi/AuditManagerImpl.java

@@ -3,7 +3,7 @@
  * $Revision: 1632 $
  * $Date: 2005-07-15 02:49:00 -0300 (Fri, 15 Jul 2005) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -12,13 +12,13 @@
 package org.jivesoftware.wildfire.audit.spi;
 
 import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.wildfire.audit.AuditManager;
 import org.jivesoftware.wildfire.audit.Auditor;
 import org.jivesoftware.wildfire.container.BasicModule;
 import org.jivesoftware.wildfire.interceptor.InterceptorManager;
 import org.jivesoftware.wildfire.interceptor.PacketInterceptor;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Packet;
 

src/java/org/jivesoftware/wildfire/audit/spi/AuditorImpl.java

@@ -3,7 +3,7 @@
  * $Revision: 3186 $
  * $Date: 2005-12-11 00:07:52 -0300 (Sun, 11 Dec 2005) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -14,9 +14,9 @@ package org.jivesoftware.wildfire.audit.spi;
 import org.dom4j.DocumentFactory;
 import org.dom4j.Element;
 import org.jivesoftware.util.*;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.audit.AuditManager;
 import org.jivesoftware.wildfire.audit.Auditor;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.Message;
 import org.xmpp.packet.Packet;
@@ -198,9 +198,9 @@ public class AuditorImpl implements Auditor {
         if (totalLength > maxTotalSize) {
             // Sort files by name (chronological order)
             List<File> sortedFiles = new ArrayList<File>(Arrays.asList(files));
-            Collections.sort(sortedFiles, new Comparator() {
-                public int compare(Object o1, Object o2) {
-                    return ((File)o1).getName().compareTo(((File)o2).getName());
+            Collections.sort(sortedFiles, new Comparator<File>() {
+                public int compare(File o1, File o2) {
+                    return o1.getName().compareTo(o2.getName());
                 }
             });
             // Delete as many old files as required to be under the limit

src/java/org/jivesoftware/wildfire/commands/admin/GetListActiveUsers.java

@@ -2,7 +2,7 @@
  * $Revision: $
  * $Date: $
  *
- * Copyright (C) 2006 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,10 +11,10 @@
 package org.jivesoftware.wildfire.commands.admin;
 
 import org.dom4j.Element;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.commands.AdHocCommand;
 import org.jivesoftware.wildfire.commands.SessionData;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 

src/java/org/jivesoftware/wildfire/commands/admin/GetNumberActiveUsers.java

@@ -2,7 +2,7 @@
  * $Revision: $
  * $Date: $
  *
- * Copyright (C) 2006 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,10 +11,10 @@
 package org.jivesoftware.wildfire.commands.admin;
 
 import org.dom4j.Element;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.commands.AdHocCommand;
 import org.jivesoftware.wildfire.commands.SessionData;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 

src/java/org/jivesoftware/wildfire/commands/admin/GetNumberOnlineUsers.java

@@ -2,7 +2,7 @@
  * $Revision: $
  * $Date: $
  *
- * Copyright (C) 2006 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,10 +11,10 @@
 package org.jivesoftware.wildfire.commands.admin;
 
 import org.dom4j.Element;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.commands.AdHocCommand;
 import org.jivesoftware.wildfire.commands.SessionData;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 

src/java/org/jivesoftware/wildfire/commands/admin/GetServerStats.java

+/**
+ * $Revision: $
+ * $Date: $
+ *
+ * Copyright (C) 2007 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
 package org.jivesoftware.wildfire.commands.admin;
 
 import org.dom4j.Element;
@@ -5,12 +15,12 @@ import org.jivesoftware.admin.AdminConsole;
 import org.jivesoftware.util.FastDateFormat;
 import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.LocaleUtils;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.wildfire.commands.AdHocCommand;
 import org.jivesoftware.wildfire.commands.SessionData;
 import org.jivesoftware.wildfire.component.InternalComponentManager;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 import org.xmpp.packet.JID;

src/java/org/jivesoftware/wildfire/commands/admin/GetUsersPresence.java

@@ -2,7 +2,7 @@
  * $Revision: $
  * $Date: $
  *
- * Copyright (C) 2006 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -11,11 +11,11 @@
 package org.jivesoftware.wildfire.commands.admin;
 
 import org.dom4j.Element;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.commands.AdHocCommand;
 import org.jivesoftware.wildfire.commands.SessionData;
 import org.jivesoftware.wildfire.component.InternalComponentManager;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 import org.xmpp.packet.JID;

src/java/org/jivesoftware/wildfire/component/ExternalComponentManager.java

+/**
+ * $Revision: $
+ * $Date: $
+ *
+ * Copyright (C) 2007 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
 package org.jivesoftware.wildfire.component;
 
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.wildfire.component.ExternalComponentConfiguration.Permission;
+import org.jivesoftware.wildfire.session.ComponentSession;
+import org.jivesoftware.wildfire.session.Session;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

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

@@ -3,7 +3,7 @@
  * $Revision: 3126 $
  * $Date: 2005-11-30 15:20:53 -0300 (Wed, 30 Nov 2005) $
  *
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2007 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution.
@@ -16,6 +16,7 @@ import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
 import org.jivesoftware.wildfire.*;
 import org.jivesoftware.wildfire.container.BasicModule;
+import org.jivesoftware.wildfire.session.ComponentSession;
 import org.xmpp.component.Component;
 import org.xmpp.component.ComponentException;
 import org.xmpp.component.ComponentManager;