Refactoring.

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

src/java/org/jivesoftware/messenger/handler/IQAuthHandler.java

@@ -228,13 +228,12 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
 
     public UserManager userManager;
     public XMPPServer localServer;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
 
     protected TrackInfo getTrackInfo() {
         TrackInfo trackInfo = super.getTrackInfo();
         trackInfo.getTrackerClasses().put(UserManager.class, "userManager");
         trackInfo.getTrackerClasses().put(XMPPServer.class, "localServer");
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         return trackInfo;
     }
 

src/java/org/jivesoftware/messenger/handler/IQRosterHandler.java

@@ -260,7 +260,7 @@ public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider
 
     public UserManager userManager;
     public XMPPServer localServer;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
     public PresenceManager presenceManager;
     public PacketRouter router;
     public RoutingTable routingTable;
@@ -270,7 +270,6 @@ public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider
         trackInfo.getTrackerClasses().put(UserManager.class, "userManager");
         trackInfo.getTrackerClasses().put(RoutingTable.class, "routingTable");
         trackInfo.getTrackerClasses().put(XMPPServer.class, "localServer");
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         trackInfo.getTrackerClasses().put(PresenceManager.class, "presenceManager");
         trackInfo.getTrackerClasses().put(PacketRouter.class, "router");
         return trackInfo;

src/java/org/jivesoftware/messenger/handler/PresenceUpdateHandler.java

@@ -378,7 +378,7 @@ public class PresenceUpdateHandler extends BasicModule implements ChannelHandler
 
     public RosterManager rosterManager;
     public XMPPServer localServer;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
     public PresenceManager presenceManager;
     public PacketDeliverer deliverer;
     public OfflineMessageStore messageStore;
@@ -387,7 +387,6 @@ public class PresenceUpdateHandler extends BasicModule implements ChannelHandler
         TrackInfo trackInfo = new TrackInfo();
         trackInfo.getTrackerClasses().put(RosterManager.class, "rosterManager");
         trackInfo.getTrackerClasses().put(XMPPServer.class, "localServer");
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         trackInfo.getTrackerClasses().put(PresenceManager.class, "presenceManager");
         trackInfo.getTrackerClasses().put(PacketDeliverer.class, "deliverer");
         trackInfo.getTrackerClasses().put(OfflineMessageStore.class, "messageStore");

src/java/org/jivesoftware/messenger/spi/ConnectionManagerImpl.java

@@ -101,7 +101,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
     }
 
     public AuditManager auditManager;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
     public PacketDeliverer deliverer;
     public PacketRouter router;
     private String serverName;
@@ -131,7 +131,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
 
     public TrackInfo getTrackInfo() {
         TrackInfo trackInfo = new TrackInfo();
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         trackInfo.getTrackerClasses().put(XMPPServer.class, "server");
         trackInfo.getTrackerClasses().put(PacketRouter.class, "router");
         trackInfo.getTrackerClasses().put(PacketDeliverer.class, "deliverer");

src/java/org/jivesoftware/messenger/spi/PacketDelivererImpl.java

@@ -31,7 +31,7 @@ public class PacketDelivererImpl extends BasicModule implements PacketDeliverer
     protected ChannelHandler deliverHandler;
 
     public OfflineMessageStrategy messageStrategy;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
 
     public PacketDelivererImpl() {
         super("Packet Delivery");
@@ -49,7 +49,6 @@ public class PacketDelivererImpl extends BasicModule implements PacketDeliverer
 
     protected TrackInfo getTrackInfo() {
         TrackInfo trackInfo = new TrackInfo();
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         trackInfo.getTrackerClasses().put(OfflineMessageStrategy.class, "messageStrategy");
         return trackInfo;
     }

src/java/org/jivesoftware/messenger/spi/PresenceManagerImpl.java

@@ -57,7 +57,7 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
     private Cache foreignUserCache;
 
     public UserManager userManager;
-    public SessionManager sessionManager;
+    private SessionManager sessionManager = SessionManager.getInstance();
     public RoutingTable routingTable;
     public XMPPServer server;
     public PacketDeliverer deliverer;
@@ -399,7 +399,6 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
 
     protected TrackInfo getTrackInfo() {
         TrackInfo trackInfo = new TrackInfo();
-        trackInfo.getTrackerClasses().put(SessionManager.class, "sessionManager");
         trackInfo.getTrackerClasses().put(UserManager.class, "userManager");
         trackInfo.getTrackerClasses().put(XMPPServer.class, "server");
         trackInfo.getTrackerClasses().put(PacketDeliverer.class, "deliverer");

src/java/org/jivesoftware/util/WebManager.java

@@ -112,7 +112,7 @@ public class WebManager extends WebBean {
     }
 
     public SessionManager getSessionManager() {
-        return (SessionManager)getServiceLookup().lookup(SessionManager.class);
+        return SessionManager.getInstance();
     }
 
     public MultiUserChatServer getMultiUserChatServer() {