Refactoring wortk. JM-924

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

src/java/org/jivesoftware/wildfire/http/HttpSession.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.
@@ -11,23 +11,23 @@
 
 package org.jivesoftware.wildfire.http;
 
-import org.jivesoftware.wildfire.ClientSession;
-import org.jivesoftware.wildfire.StreamID;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
 import org.jivesoftware.wildfire.Connection;
+import org.jivesoftware.wildfire.StreamID;
 import org.jivesoftware.wildfire.XMPPServer;
-import org.jivesoftware.wildfire.net.VirtualConnection;
-import org.jivesoftware.wildfire.net.SASLAuthentication;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
-import org.xmpp.packet.Packet;
+import org.jivesoftware.wildfire.net.SASLAuthentication;
+import org.jivesoftware.wildfire.net.VirtualConnection;
+import org.jivesoftware.wildfire.session.ClientSession;
 import org.xmpp.packet.Message;
-import org.dom4j.Element;
-import org.dom4j.DocumentHelper;
-import org.dom4j.QName;
-import org.dom4j.Namespace;
+import org.xmpp.packet.Packet;
 
+import java.net.InetAddress;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArraySet;
-import java.net.InetAddress;
 
 /**
  * A session represents a serious of interactions with an XMPP client sending packets using the HTTP

src/java/org/jivesoftware/wildfire/interceptor/InterceptorManager.java

@@ -3,7 +3,7 @@
  * $Revision: 3142 $
  * $Date: 2005-12-01 13:39:33 -0300 (Thu, 01 Dec 2005) $
  *
- * Copyright (C) 2005 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,8 +12,8 @@
 package org.jivesoftware.wildfire.interceptor;
 
 import org.jivesoftware.util.Log;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.XMPPServer;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.Packet;
 
 import java.util.Collection;

src/java/org/jivesoftware/wildfire/interceptor/PacketCopier.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.
@@ -15,10 +15,10 @@ import org.jivesoftware.util.FastDateFormat;
 import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.util.Log;
-import org.jivesoftware.wildfire.Session;
 import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.wildfire.component.ComponentEventListener;
 import org.jivesoftware.wildfire.component.InternalComponentManager;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.component.Component;
 import org.xmpp.packet.*;
 

src/java/org/jivesoftware/wildfire/interceptor/PacketInterceptor.java

@@ -3,7 +3,7 @@
  * $Revision: 3010 $
  * $Date: 2005-10-31 20:28:11 -0300 (Mon, 31 Oct 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.
@@ -11,7 +11,7 @@
 
 package org.jivesoftware.wildfire.interceptor;
 
-import org.jivesoftware.wildfire.Session;
+import org.jivesoftware.wildfire.session.Session;
 import org.xmpp.packet.Packet;
 
 /**