Refactoring wortk. JM-924

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

src/java/org/jivesoftware/wildfire/disco/IQDiscoItemsHandler.java

@@ -3,7 +3,7 @@
  * $Revision: 1701 $
  * $Date: 2005-07-26 02:23:45 -0300 (Tue, 26 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.
@@ -15,12 +15,12 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 import org.jivesoftware.wildfire.IQHandlerInfo;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
 import org.jivesoftware.wildfire.handler.IQHandler;
 import org.jivesoftware.wildfire.roster.RosterItem;
+import org.jivesoftware.wildfire.session.Session;
 import org.jivesoftware.wildfire.user.User;
 import org.jivesoftware.wildfire.user.UserManager;
 import org.jivesoftware.wildfire.user.UserNotFoundException;

src/java/org/jivesoftware/wildfire/event/SessionEventDispatcher.java

@@ -3,7 +3,7 @@
  * $Revision: 1.1 $
  * $Date: 2005/04/10 18:21:58 $
  *
- * Copyright 2004 Jive Software.
+ * Copyright 2007 Jive Software.
  *
  * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 
 package org.jivesoftware.wildfire.event;
 
+import org.jivesoftware.util.Log;
+import org.jivesoftware.wildfire.session.Session;
+
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.jivesoftware.wildfire.Session;
-import org.jivesoftware.util.Log;
-
 /**
  * Dispatches session events. Each event has a {@link EventType type}
  *

src/java/org/jivesoftware/wildfire/event/SessionEventListener.java

 /**
- * Copyright (C) 2004-2005 Jive Software. All rights reserved.
+ * Copyright (C) 2004-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.
@@ -7,7 +7,7 @@
 
 package org.jivesoftware.wildfire.event;
 
-import org.jivesoftware.wildfire.Session;
+import org.jivesoftware.wildfire.session.Session;
 
 /**
  * Interface to listen for session events. Use the

src/java/org/jivesoftware/wildfire/filetransfer/DefaultFileTransferManager.java

@@ -3,31 +3,31 @@
  * $Revision: 1217 $
  * $Date: 2005-04-11 18:11:06 -0300 (Mon, 11 Apr 2005) $
  *
- * Copyright (C) 1999-2006 Jive Software. All rights reserved.
+ * Copyright (C) 1999-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.filetransfer;
 
-import org.jivesoftware.util.JiveGlobals;
+import org.dom4j.Element;
 import org.jivesoftware.util.Cache;
+import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
 import org.jivesoftware.wildfire.container.BasicModule;
+import org.jivesoftware.wildfire.filetransfer.proxy.ProxyConnectionManager;
+import org.jivesoftware.wildfire.filetransfer.proxy.ProxyTransfer;
 import org.jivesoftware.wildfire.interceptor.InterceptorManager;
 import org.jivesoftware.wildfire.interceptor.PacketInterceptor;
 import org.jivesoftware.wildfire.interceptor.PacketRejectedException;
-import org.jivesoftware.wildfire.Session;
-import org.jivesoftware.wildfire.filetransfer.proxy.ProxyConnectionManager;
-import org.jivesoftware.wildfire.filetransfer.proxy.ProxyTransfer;
-import org.dom4j.Element;
-import org.xmpp.packet.Packet;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
+import org.xmpp.packet.Packet;
 
-import java.util.Map;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Provides several utility methods for file transfer manager implementaions to utilize.

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

@@ -3,7 +3,7 @@
  * $Revision: 1761 $
  * $Date: 2005-08-09 19:34:09 -0300 (Tue, 09 Aug 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.
@@ -22,6 +22,7 @@ import org.jivesoftware.wildfire.forms.DataForm;
 import org.jivesoftware.wildfire.forms.FormField;
 import org.jivesoftware.wildfire.forms.spi.XDataFormImpl;
 import org.jivesoftware.wildfire.forms.spi.XFormFieldImpl;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.jivesoftware.wildfire.user.UserManager;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;

src/java/org/jivesoftware/wildfire/handler/IQPrivacyHandler.java

@@ -3,7 +3,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.
@@ -12,7 +12,6 @@
 package org.jivesoftware.wildfire.handler;
 
 import org.dom4j.Element;
-import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.IQHandlerInfo;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.XMPPServer;
@@ -22,6 +21,7 @@ import org.jivesoftware.wildfire.event.UserEventListener;
 import org.jivesoftware.wildfire.privacy.PrivacyList;
 import org.jivesoftware.wildfire.privacy.PrivacyListManager;
 import org.jivesoftware.wildfire.privacy.PrivacyListProvider;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.jivesoftware.wildfire.user.User;
 import org.jivesoftware.wildfire.user.UserManager;
 import org.xmpp.packet.IQ;