feature[ats_46MNL]: Remove version checks from server lookup

Remove version checks from code.
Remove add/remove supported version cmds.
Remove use of is accepting requests column to prevent
incompatible servers from sending cache updates.
Remove server lookup manager code since it is no longer used.
Server lookup table will only be used to track down rogue servers.
Therefore, server registration/deregistration code will be left untouched.

Change-Id: I8773ed461a03f4f7fd6d6b23007ec38dfd4ba3b8

19 files changed, 52 insertions, 664 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml
deleted file mode 100644
index e1c5aacee85..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.core.server.internal.ApplicationServerLookup">
-	<implementation class="org.eclipse.osee.framework.core.server.internal.ApplicationServerLookup"/>
-	<service>
-		<provide interface="org.eclipse.osee.framework.core.server.IApplicationServerLookup"/>
-	</service>
- <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.servlet.request.console.command.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.servlet.request.console.command.xml
deleted file mode 100644
index 838650016e6..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.servlet.request.console.command.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.framework.core.server.internal.console.ServerServletRequestsCommand">
-   <implementation class="org.eclipse.osee.framework.core.server.internal.console.ServerServletRequestsCommand"/>
-   <service>
-      <provide interface="org.eclipse.osee.console.admin.ConsoleCommand"/>
-   </service>
-   <reference bind="setApplicationServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.version.console.command.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.version.console.command.xml
deleted file mode 100644
index aad894a9775..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.version.console.command.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.framework.core.server.internal.console.ServerVersionCommand">
-   <implementation class="org.eclipse.osee.framework.core.server.internal.console.ServerVersionCommand"/>
-   <service>
-      <provide interface="org.eclipse.osee.console.admin.ConsoleCommand"/>
-   </service>
-   <reference bind="setApplicationServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml
index 478b8230bd7..34991198db7 100644
--- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml
+++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml
@@ -5,7 +5,6 @@
       <provide interface="org.eclipse.osee.framework.core.server.ISessionManager"/>
    </service>
    <reference bind="setDbService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
-   <reference bind="setServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/>
    <reference bind="setAuthenticationManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IAuthenticationManager" name="IAuthenticationManager" policy="static"/>
    <reference bind="setDbInfoRegistry" cardinality="1..1" interface="org.eclipse.osee.framework.database.DatabaseInfoRegistry" name="DatabaseInfoRegistry" policy="static"/>
    <reference bind="setCacheAdmin" cardinality="1..1" interface="org.eclipse.osee.cache.admin.CacheAdmin" name="CacheAdmin" policy="static"/>
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerLookup.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerLookup.java
deleted file mode 100644
index e3c5f275535..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerLookup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server;
-
-import java.net.URI;
-import java.util.Collection;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface IApplicationServerLookup {
-
-   public Collection<URI> getAvailableServerUris() throws OseeCoreException;
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManager.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManager.java
index 03cdceb17aa..d4365837b0a 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManager.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManager.java
@@ -32,8 +32,6 @@ public interface IApplicationServerManager {
 
    List<String> getCurrentProcesses();
 
-   void setServletRequestsAllowed(boolean value) throws OseeCoreException;
-
    boolean executeLookupRegistration();
 
    String getId();
@@ -42,13 +40,7 @@ public interface IApplicationServerManager {
 
    Date getDateStarted();
 
-   boolean isAcceptingRequests();
-
-   String[] getSupportedVersions();
-
-   void addSupportedVersion(String version) throws OseeCoreException;
-
-   void removeSupportedVersion(String version) throws OseeCoreException;
+   String[] getVersions();
 
    void register(String context, OseeHttpServlet servlets) throws OseeCoreException;
 
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManagerProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManagerProvider.java
deleted file mode 100644
index 8db792e0924..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/IApplicationServerManagerProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server;
-
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface IApplicationServerManagerProvider {
-
-   IApplicationServerManager getApplicationServerManager() throws OseeCoreException;
-}
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java
index 0536405e033..3bdb36a38dd 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java
@@ -22,7 +22,6 @@ public class OseeServerProperties {
    private static final String OSEE_APPLICATION_SERVER_DATA = "osee.application.server.data";
    private static final String OSGI_PORT_PROPERTY = "org.osgi.service.http.port";
    private static final String OSGI_SECURE_PORT_PROPERTY = "org.osgi.service.http.port.secure";
-   private static final String OSEE_VERSION = "osee.version";
 
    private static final String OSEE_AUTHENTICATION_PROTOCOL = "osee.authentication.protocol";
 
@@ -32,20 +31,6 @@ public class OseeServerProperties {
       super();
    }
 
-   /**
-    * Get OSEE application server version settings
-    * 
-    * @return OSEE application server versions
-    */
-   public static String[] getOseeVersion() {
-      String[] toReturn = new String[0];
-      String versionString = System.getProperty(OSEE_VERSION, "");
-      if (Strings.isValid(versionString)) {
-         toReturn = versionString.split(";");
-      }
-      return toReturn;
-   }
-
    private static String internalGetOseeApplicationServerData() {
       String toReturn = System.getProperty(OSEE_APPLICATION_SERVER_DATA);
       if (toReturn == null) {
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
index f0fb871d182..554d9e13e85 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
@@ -13,44 +13,25 @@ package org.eclipse.osee.framework.core.server.internal;
 import java.net.URI;
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.eclipse.osee.framework.core.data.OseeServerInfo;
 import org.eclipse.osee.framework.database.IOseeDatabaseService;
 import org.eclipse.osee.framework.database.core.DatabaseTransactions;
 import org.eclipse.osee.framework.database.core.IDbTransactionWork;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
 import org.eclipse.osee.framework.database.core.OseeConnection;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
 
 /**
  * @author Roberto E. Escobar
  */
 public class ApplicationServerDataStore {
 
-   private static final String SELECT_FROM_LOOKUP_TABLE =
-      "SELECT * FROM osee_server_lookup ORDER BY server_uri desc, version_id desc";
-
-   private static final String SELECT_FROM_LOOKUP_TABLE_BY_SERVER_ID =
-      "SELECT * FROM osee_server_lookup where server_id = ? ORDER BY version_id desc";
-
-   private final Log logger;
    private final IOseeDatabaseService dbService;
 
-   public ApplicationServerDataStore(Log logger, IOseeDatabaseService dbService) {
-      this.logger = logger;
+   public ApplicationServerDataStore(IOseeDatabaseService dbService) {
       this.dbService = dbService;
    }
 
-   private Log getLogger() {
-      return logger;
-   }
-
    private IOseeDatabaseService getDbService() {
       return dbService;
    }
@@ -72,62 +53,6 @@ public class ApplicationServerDataStore {
       DatabaseTransactions.execute(getDbService(), getDbService().getConnection(), tx);
    }
 
-   public Collection<? extends OseeServerInfo> getAll() throws OseeCoreException {
-      Map<String, OseeServerInfoMutable> infos = new HashMap<String, OseeServerInfoMutable>();
-      IOseeStatement chStmt = getDbService().getStatement();
-      try {
-         chStmt.runPreparedQuery(SELECT_FROM_LOOKUP_TABLE);
-         while (chStmt.next()) {
-            String serverId = chStmt.getString("server_id");
-            String serverVersion = chStmt.getString("version_id");
-            boolean isAcceptingRequests = chStmt.getInt("accepts_requests") != 0 ? true : false;
-
-            OseeServerInfoMutable info = infos.get(serverId);
-            if (info == null) {
-               String uri = chStmt.getString("server_uri");
-               Timestamp timestamp = chStmt.getTimestamp("start_time");
-               info =
-                  new OseeServerInfoMutable(serverId, uri, new String[] {serverVersion}, timestamp, isAcceptingRequests);
-               infos.put(serverId, info);
-            } else {
-               boolean acceptingRequests = info.isAcceptingRequests() && isAcceptingRequests;
-               info.addVersion(serverVersion);
-               info.setAcceptingRequests(acceptingRequests);
-            }
-         }
-      } finally {
-         chStmt.close();
-      }
-      return infos.values();
-   }
-
-   public void refresh(OseeServerInfoMutable info) {
-      Set<String> original = info.getVersionSet();
-      boolean origAcceptingRequests = info.isAcceptingRequests();
-      IOseeStatement chStmt = null;
-      try {
-         chStmt = getDbService().getStatement();
-         chStmt.runPreparedQuery(SELECT_FROM_LOOKUP_TABLE_BY_SERVER_ID, info.getServerId());
-         info.setVersions(Collections.<String> emptySet());
-         while (chStmt.next()) {
-            String serverVersion = chStmt.getString("version_id");
-            boolean isAcceptingRequests = chStmt.getInt("accepts_requests") != 0 ? true : false;
-
-            boolean acceptingRequests = info.isAcceptingRequests() && isAcceptingRequests;
-            info.addVersion(serverVersion);
-            info.setAcceptingRequests(acceptingRequests);
-         }
-      } catch (Exception ex) {
-         getLogger().info("Server lookup table is not initialized");
-         info.setVersions(original);
-         info.setAcceptingRequests(origAcceptingRequests);
-      } finally {
-         if (chStmt != null) {
-            chStmt.close();
-         }
-      }
-   }
-
    private static enum TxType {
       CREATE,
       UPDATE,
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java
deleted file mode 100644
index 63efe4467a6..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server.internal;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.OseeServerInfo;
-import org.eclipse.osee.framework.core.server.IApplicationServerLookup;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ApplicationServerLookup implements IApplicationServerLookup {
-
-   private Log logger;
-   private IOseeDatabaseService dbService;
-
-   private ApplicationServerDataStore serverDataStore;
-
-   public void setLogger(Log logger) {
-      this.logger = logger;
-   }
-
-   private Log getLogger() {
-      return logger;
-   }
-
-   public void setDatabaseService(IOseeDatabaseService dbService) {
-      this.dbService = dbService;
-   }
-
-   private IOseeDatabaseService getDatabaseService() {
-      return dbService;
-   }
-
-   public void start() {
-      serverDataStore = new ApplicationServerDataStore(getLogger(), getDatabaseService());
-   }
-
-   public void stop() {
-      serverDataStore = null;
-   }
-
-   private ApplicationServerDataStore getDataStore() {
-      return serverDataStore;
-   }
-
-   @Override
-   public Collection<URI> getAvailableServerUris() throws OseeCoreException {
-      Collection<? extends OseeServerInfo> infos = getDataStore().getAll();
-      return getHealthyServers(infos);
-   }
-
-   private Collection<URI> getHealthyServers(Collection<? extends OseeServerInfo> infos) {
-      Set<URI> healthyServers = new LinkedHashSet<URI>();
-      for (OseeServerInfo info : infos) {
-         if (info.isAcceptingRequests()) {
-            if (info.isAcceptingRequests()) {
-               healthyServers.add(info.getUri());
-            }
-         }
-      }
-      return healthyServers;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java
index 1b96d0cdc77..2d09f27c98b 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java
@@ -19,10 +19,8 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
@@ -36,9 +34,7 @@ import org.eclipse.osee.framework.core.server.OseeServerProperties;
 import org.eclipse.osee.framework.database.IOseeDatabaseService;
 import org.eclipse.osee.framework.database.core.OseeInfo;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
 import org.eclipse.osee.framework.jdk.core.util.ChecksumUtil;
-import org.eclipse.osee.framework.jdk.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime;
 import org.eclipse.osee.logger.Log;
@@ -54,9 +50,8 @@ public class ApplicationServerManager implements IApplicationServerManager {
    private IOseeDatabaseService dbService;
 
    private ApplicationServerDataStore dataStore;
-   private OseeServerInfoMutable serverInfo;
+   private OseeServerInfo serverInfo;
    private Timer timer;
-   private final Set<String> defaultVersions = new HashSet<String>();
 
    public ApplicationServerManager() {
       this.oseeHttpServlets = new ConcurrentHashMap<String, InternalOseeHttpServlet>();
@@ -80,18 +75,8 @@ public class ApplicationServerManager implements IApplicationServerManager {
    }
 
    public void start() throws Exception {
-      defaultVersions.clear();
-      String[] userSpecifiedVersion = OseeServerProperties.getOseeVersion();
-      if (Conditions.hasValues(userSpecifiedVersion)) {
-         for (String version : userSpecifiedVersion) {
-            defaultVersions.add(version);
-         }
-      } else {
-         defaultVersions.add(OseeCodeVersion.getVersion());
-      }
-
-      dataStore = new ApplicationServerDataStore(getLogger(), getDatabaseService());
-      serverInfo = createOseeServerInfo(getLogger(), dataStore, defaultVersions);
+      dataStore = new ApplicationServerDataStore(getDatabaseService());
+      serverInfo = createOseeServerInfo(getLogger(), dataStore, OseeCodeVersion.getVersion());
       System.setProperty("OseeApplicationServer", serverInfo.getUri().toString());
 
       timer = new Timer();
@@ -100,15 +85,12 @@ public class ApplicationServerManager implements IApplicationServerManager {
          public void run() {
             if (isDbInitialized()) {
                try {
-                  boolean wasRegistered = executeLookupRegistration();
-                  setServletRequestsAllowed(wasRegistered);
+                  executeLookupRegistration();
                } catch (Exception ex) {
                   getLogger().error(ex, "Error during lookup registration");
                } finally {
                   timer.cancel();
                }
-            } else {
-               setServletRequestsAllowedNoDbUpdate(true);
             }
          }
 
@@ -129,10 +111,9 @@ public class ApplicationServerManager implements IApplicationServerManager {
 
    public void stop() {
       shutdown();
-      defaultVersions.clear();
    }
 
-   private static OseeServerInfoMutable createOseeServerInfo(Log logger, ApplicationServerDataStore dataStore, Set<String> defaultVersions) {
+   private static OseeServerInfo createOseeServerInfo(Log logger, ApplicationServerDataStore dataStore, String... defaultVersions) {
       String serverAddress = "127.0.0.1";
       try {
          serverAddress = InetAddress.getLocalHost().getCanonicalHostName();
@@ -156,26 +137,12 @@ public class ApplicationServerManager implements IApplicationServerManager {
       } catch (Exception ex) {
          logger.error(ex, "Error generating application server id");
       }
-      OseeServerInfoMutable toReturn =
-         new OseeServerInfoMutable(checkSum, uri.toString(), new String[0], GlobalTime.GreenwichMeanTimestamp(), false);
-      toReturn.setVersions(defaultVersions);
-      return toReturn;
-   }
-
-   private void refreshData(OseeServerInfoMutable info) {
-      dataStore.refresh(info);
-
-      Set<String> supportedVersions = info.getVersionSet();
-      if (!supportedVersions.containsAll(defaultVersions)) {
-         supportedVersions.addAll(defaultVersions);
-         info.setVersions(supportedVersions);
-      }
+      return new OseeServerInfo(checkSum, uri.toString(), defaultVersions, GlobalTime.GreenwichMeanTimestamp(), false);
    }
 
    @Override
    public boolean executeLookupRegistration() {
-      OseeServerInfoMutable info = getApplicationServerInfo();
-      refreshData(info);
+      OseeServerInfo info = getApplicationServerInfo();
       deregisterWithDb(info);
       boolean isRegistered = registerWithDb(info);
       if (isRegistered) {
@@ -187,7 +154,6 @@ public class ApplicationServerManager implements IApplicationServerManager {
    @Override
    public void register(String context, OseeHttpServlet servlet) {
       InternalOseeHttpServlet internalServlet = servlet;
-      internalServlet.setRequestsAllowed(getApplicationServerInfo().isAcceptingRequests());
       this.oseeHttpServlets.put(context, internalServlet);
    }
 
@@ -202,7 +168,7 @@ public class ApplicationServerManager implements IApplicationServerManager {
       return oseeHttpServlets.keySet();
    }
 
-   private OseeServerInfoMutable getApplicationServerInfo() {
+   private OseeServerInfo getApplicationServerInfo() {
       return serverInfo;
    }
 
@@ -227,43 +193,12 @@ public class ApplicationServerManager implements IApplicationServerManager {
       return !Operations.areOperationsScheduled();
    }
 
-   private static enum PersistType {
-      ALLOW_DB_PERSIST,
-      DONT_DB_PERSIST;
-   }
-
-   private synchronized void setServletRequestsAllowed(final boolean value, PersistType persistType) throws OseeCoreException {
-      OseeServerInfoMutable info = getApplicationServerInfo();
-      info.setAcceptingRequests(value);
-      if (PersistType.ALLOW_DB_PERSIST == persistType) {
-         dataStore.update(info);
-      }
-      for (String contexts : oseeHttpServlets.keySet()) {
-         InternalOseeHttpServlet servlets = oseeHttpServlets.get(contexts);
-         servlets.setRequestsAllowed(value);
-      }
-   }
-
-   private void setServletRequestsAllowedNoDbUpdate(final boolean value) {
-      try {
-         setServletRequestsAllowed(value, PersistType.DONT_DB_PERSIST);
-      } catch (OseeCoreException ex) {
-         logger.warn(ex, "Error updating servlet requests allowed to [%s]- current setting is [%s]", value,
-            getApplicationServerInfo().isAcceptingRequests());
-      }
-   }
-
-   @Override
-   public synchronized void setServletRequestsAllowed(final boolean value) throws OseeCoreException {
-      setServletRequestsAllowed(value, PersistType.ALLOW_DB_PERSIST);
-   }
-
    @Override
    public void shutdown() {
       if (timer != null) {
          timer.cancel();
       }
-      OseeServerInfoMutable info = getApplicationServerInfo();
+      OseeServerInfo info = getApplicationServerInfo();
       deregisterWithDb(info);
    }
 
@@ -324,44 +259,10 @@ public class ApplicationServerManager implements IApplicationServerManager {
    }
 
    @Override
-   public boolean isAcceptingRequests() {
-      return getApplicationServerInfo().isAcceptingRequests();
-   }
-
-   @Override
-   public String[] getSupportedVersions() {
-      OseeServerInfoMutable info = getApplicationServerInfo();
-      refreshData(info);
+   public String[] getVersions() {
       return getApplicationServerInfo().getVersion();
    }
 
-   @Override
-   public void addSupportedVersion(String version) throws OseeCoreException {
-      Conditions.checkNotNull(version, "Osee Version");
-      OseeServerInfoMutable info = getApplicationServerInfo();
-      refreshData(info);
-      info.addVersion(version);
-      dataStore.update(info);
-   }
-
-   @Override
-   public void removeSupportedVersion(String version) throws OseeCoreException {
-      Conditions.checkNotNull(version, "Osee Version");
-      Conditions.checkExpressionFailOnTrue(defaultVersions.contains(version),
-         "Unable to remove default Osee version [%s]", version);
-
-      OseeServerInfoMutable info = getApplicationServerInfo();
-      refreshData(info);
-      Set<String> versions = info.getVersionSet();
-      boolean wasRemoved = versions.remove(version);
-      if (wasRemoved) {
-         info.setVersions(versions);
-         dataStore.update(info);
-      } else {
-         throw new OseeStateException("Not part of the supported version [%s]", version);
-      }
-   }
-
    private boolean deregisterWithDb(OseeServerInfo info) {
       boolean status = false;
       try {
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java
index ad391079aec..71abde7b01c 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java
@@ -24,7 +24,6 @@ import org.eclipse.osee.logger.Log;
  */
 public abstract class InternalOseeHttpServlet extends HttpServlet {
    private static final long serialVersionUID = -4965613535312739355L;
-   private boolean areRequestsAllowed;
    private boolean areLogsAllowed;
    private ProcessingStateEnum processingState;
    private HttpServletRequest request;
@@ -32,7 +31,6 @@ public abstract class InternalOseeHttpServlet extends HttpServlet {
 
    public InternalOseeHttpServlet(Log logger) {
       this.logger = logger;
-      this.areRequestsAllowed = true;
       this.areLogsAllowed = false;
       this.processingState = ProcessingStateEnum.IDLE;
       this.request = null;
@@ -42,18 +40,10 @@ public abstract class InternalOseeHttpServlet extends HttpServlet {
       return logger;
    }
 
-   protected boolean areRequestsAllowed() {
-      return areRequestsAllowed;
-   }
-
    protected boolean areLogsAllowed() {
       return areLogsAllowed;
    }
 
-   void setRequestsAllowed(boolean value) {
-      areRequestsAllowed = value;
-   }
-
    void setLogsAllowed(boolean value) {
       areLogsAllowed = value;
    }
@@ -76,20 +66,15 @@ public abstract class InternalOseeHttpServlet extends HttpServlet {
          start = System.currentTimeMillis();
       }
       try {
-         if (areRequestsAllowed()) {
-            this.processingState = ProcessingStateEnum.BUSY;
-            this.request = request;
-            try {
-               checkAccessControl(request);
-               super.service(request, response);
-            } catch (OseeCoreException ex) {
-               response.setStatus(HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED);
-               response.getWriter().write(Lib.exceptionToString(ex));
-               throw new ServletException(ex);
-            }
-         } else {
-            response.setStatus(HttpServletResponse.SC_FORBIDDEN);
-            response.getWriter().write("All requests are currently blocked.");
+         this.processingState = ProcessingStateEnum.BUSY;
+         this.request = request;
+         try {
+            checkAccessControl(request);
+            super.service(request, response);
+         } catch (OseeCoreException ex) {
+            response.setStatus(HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED);
+            response.getWriter().write(Lib.exceptionToString(ex));
+            throw new ServletException(ex);
          }
       } finally {
          if (areLogsAllowed()) {
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/OseeServerInfoMutable.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/OseeServerInfoMutable.java
deleted file mode 100644
index a1864613361..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/OseeServerInfoMutable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server.internal;
-
-import java.sql.Timestamp;
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.osee.framework.core.data.OseeServerInfo;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeServerInfoMutable extends OseeServerInfo {
-
-   private static final long serialVersionUID = 4437012224149055646L;
-
-   public OseeServerInfoMutable(String serverId, String uri, String[] version, Timestamp dateStarted, boolean isAcceptingRequests) {
-      super(serverId, uri, version, dateStarted, isAcceptingRequests);
-   }
-
-   public void setAcceptingRequests(boolean value) {
-      backingData.put(IS_ACCEPTING_REQUESTS, value);
-   }
-
-   public void setVersions(Set<String> versions) {
-      backingData.put(VERSION, versions.toArray(new String[versions.size()]));
-   }
-
-   public void addVersion(String version) {
-      Set<String> versions = getVersionSet();
-      versions.add(version);
-      setVersions(versions);
-   }
-
-   public Set<String> getVersionSet() {
-      Set<String> versions = new HashSet<String>();
-      for (String current : getVersion()) {
-         versions.add(current);
-      }
-      return versions;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerServletRequestsCommand.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerServletRequestsCommand.java
deleted file mode 100644
index 94c8a3a5802..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerServletRequestsCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server.internal.console;
-
-import java.util.concurrent.Callable;
-import org.eclipse.osee.console.admin.Console;
-import org.eclipse.osee.console.admin.ConsoleCommand;
-import org.eclipse.osee.console.admin.ConsoleParameters;
-import org.eclipse.osee.framework.core.server.IApplicationServerManager;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ServerServletRequestsCommand implements ConsoleCommand {
-
-   private IApplicationServerManager appManager;
-
-   public void setApplicationServerManager(IApplicationServerManager appManager) {
-      this.appManager = appManager;
-   }
-
-   private IApplicationServerManager getApplicationServerManager() {
-      return appManager;
-   }
-
-   @Override
-   public String getName() {
-      return "server_servlet_requests";
-   }
-
-   @Override
-   public String getDescription() {
-      return "Set servlets to accept/reject requests";
-   }
-
-   @Override
-   public String getUsage() {
-      return "[accept=<TRUE|FALSE>] - Accept/Reject servlet requests\n" + //
-      "                      - To display whether server is accepting servlet requests\n";
-   }
-
-   @Override
-   public Callable<?> createCallable(Console console, ConsoleParameters params) {
-      return new ServerServletRequestsCallable(getApplicationServerManager(), console, params);
-   }
-
-   private static final class ServerServletRequestsCallable implements Callable<Boolean> {
-      private final Console console;
-      private final ConsoleParameters parameters;
-
-      private final IApplicationServerManager appManager;
-
-      public ServerServletRequestsCallable(IApplicationServerManager appManager, Console console, ConsoleParameters parameters) {
-         this.appManager = appManager;
-         this.console = console;
-         this.parameters = parameters;
-      }
-
-      @Override
-      public Boolean call() throws Exception {
-         if (parameters.exists("accept")) {
-            boolean value = parameters.getBoolean("accept");
-            appManager.setServletRequestsAllowed(value);
-         }
-         console.writeln("Osee Application Server: [%s] - servlet requests",
-            appManager.isAcceptingRequests() ? "ACCEPTING" : "REJECTING");
-         return Boolean.TRUE;
-      }
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerShutdownCommand.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerShutdownCommand.java
index 8131f4c1ea5..2dc4453ec38 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerShutdownCommand.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerShutdownCommand.java
@@ -68,8 +68,6 @@ public class ServerShutdownCommand implements ConsoleCommand {
 
       @Override
       public Boolean call() throws Exception {
-         manager.setServletRequestsAllowed(false);
-
          while (!manager.isSystemIdle()) {
             try {
                Thread.sleep(1000);
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerStatsCommand.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerStatsCommand.java
index b672222f9c3..6d1bbae930c 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerStatsCommand.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerStatsCommand.java
@@ -129,8 +129,7 @@ public class ServerStatsCommand implements ConsoleCommand {
          console.writeln("Supported Authentication Schemes: %s", Arrays.deepToString(authManager.getProtocols()));
          console.writeln();
 
-         console.writeln("Supported Versions: %s", Arrays.deepToString(manager.getSupportedVersions()));
-         console.writeln("Accepting Requests: [%s]", manager.isAcceptingRequests());
+         console.writeln("Supported Versions: %s", Arrays.deepToString(manager.getVersions()));
          console.writeln(Lib.getMemoryInfo());
 
          logServlets(manager);
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerVersionCommand.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerVersionCommand.java
deleted file mode 100644
index b4f2116fd6e..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/console/ServerVersionCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server.internal.console;
-
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-import org.eclipse.osee.console.admin.Console;
-import org.eclipse.osee.console.admin.ConsoleCommand;
-import org.eclipse.osee.console.admin.ConsoleParameters;
-import org.eclipse.osee.framework.core.server.IApplicationServerManager;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ServerVersionCommand implements ConsoleCommand {
-
-   private IApplicationServerManager appManager;
-
-   public void setApplicationServerManager(IApplicationServerManager appManager) {
-      this.appManager = appManager;
-   }
-
-   private IApplicationServerManager getApplicationServerManager() {
-      return appManager;
-   }
-
-   @Override
-   public String getName() {
-      return "server_version";
-   }
-
-   @Override
-   public String getDescription() {
-      return "Adds/Removes/Lists supported versions from this osee server instance";
-   }
-
-   @Override
-   public String getUsage() {
-      return "[add=<VERSIONS>] [remove=<VERSIONS>]";
-   }
-
-   @Override
-   public Callable<?> createCallable(Console console, ConsoleParameters params) {
-      return new ServerVersionCallable(getApplicationServerManager(), console, params);
-   }
-
-   private static final class ServerVersionCallable implements Callable<Boolean> {
-      private final Console console;
-      private final ConsoleParameters parameters;
-
-      private final IApplicationServerManager appManager;
-
-      public ServerVersionCallable(IApplicationServerManager appManager, Console console, ConsoleParameters parameters) {
-         this.appManager = appManager;
-         this.console = console;
-         this.parameters = parameters;
-      }
-
-      @Override
-      public Boolean call() throws Exception {
-         String[] toAdd = parameters.getArray("add");
-         String[] toRemove = parameters.getArray("remove");
-
-         if (toAdd != null && toAdd.length > 0) {
-            for (String version : toAdd) {
-               appManager.addSupportedVersion(version);
-            }
-         }
-
-         if (toRemove != null && toRemove.length > 0) {
-            for (String version : toRemove) {
-               appManager.removeSupportedVersion(version);
-            }
-         }
-         console.writeln("Osee Application Server: %s", Arrays.deepToString(appManager.getSupportedVersions()));
-         return Boolean.TRUE;
-      }
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
index 3c4509ee62a..f249eb0870f 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.data.OseeCredential;
 import org.eclipse.osee.framework.core.data.OseeSessionGrant;
 import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.server.IApplicationServerManager;
 import org.eclipse.osee.framework.core.server.IAuthenticationManager;
 import org.eclipse.osee.framework.core.server.ISession;
 import org.eclipse.osee.framework.core.server.ISessionManager;
@@ -41,70 +40,52 @@ public final class SessionManagerImpl implements ISessionManager {
    private final Cache<String, Session> sessionCache;
    private final IAuthenticationManager authenticationManager;
    private final WriteDataAccessor<Session> storeDataAccessor;
-   private final IApplicationServerManager serverManager;
 
-   public SessionManagerImpl(SessionFactory sessionFactory, Cache<String, Session> sessionCache, IAuthenticationManager authenticationManager, WriteDataAccessor<Session> storeDataAccessor, IApplicationServerManager serverManager) {
+   public SessionManagerImpl(SessionFactory sessionFactory, Cache<String, Session> sessionCache, IAuthenticationManager authenticationManager, WriteDataAccessor<Session> storeDataAccessor) {
       this.sessionFactory = sessionFactory;
       this.sessionCache = sessionCache;
       this.authenticationManager = authenticationManager;
       this.storeDataAccessor = storeDataAccessor;
-      this.serverManager = serverManager;
    }
 
    @Override
    public OseeSessionGrant createSession(final OseeCredential credential) throws OseeCoreException {
       Conditions.checkNotNull(credential, "credential");
       OseeSessionGrant sessionGrant = null;
-      boolean supportedVersion = checkVersion(credential);
-      if (supportedVersion) {
-         final String newSessionId = GUID.create();
-         boolean isAuthenticated = authenticationManager.authenticate(credential);
-         if (isAuthenticated) {
-            final IUserToken userToken = authenticationManager.asUserToken(credential);
-
-            Callable<Session> callable = new Callable<Session>() {
-
-               @Override
-               public Session call() throws Exception {
-
-                  Date creationDate = GlobalTime.GreenwichMeanTimestamp();
-                  Session session =
-                     sessionFactory.createNewSession(newSessionId, userToken.getUserId(), creationDate,
-                        credential.getVersion(), credential.getClientMachineName(), credential.getClientAddress(),
-                        credential.getPort());
-
-                  // if the user is BootStrap we do not want to insert into database since tables may not exist
-                  if (!SystemUser.BootStrap.equals(userToken)) {
-                     storeDataAccessor.create(Collections.singleton(session));
-                  }
-
-                  return session;
+      final String newSessionId = GUID.create();
+      boolean isAuthenticated = authenticationManager.authenticate(credential);
+      if (isAuthenticated) {
+         final IUserToken userToken = authenticationManager.asUserToken(credential);
+
+         Callable<Session> callable = new Callable<Session>() {
+
+            @Override
+            public Session call() throws Exception {
+
+               Date creationDate = GlobalTime.GreenwichMeanTimestamp();
+               Session session =
+                  sessionFactory.createNewSession(newSessionId, userToken.getUserId(), creationDate,
+                     credential.getVersion(), credential.getClientMachineName(), credential.getClientAddress(),
+                     credential.getPort());
+
+               // if the user is BootStrap we do not want to insert into database since tables may not exist
+               if (!SystemUser.BootStrap.equals(userToken)) {
+                  storeDataAccessor.create(Collections.singleton(session));
                }
-            };
-
-            try {
-               Session session = sessionCache.get(newSessionId, callable);
-               sessionGrant =
-                  sessionFactory.createSessionGrant(session, userToken, authenticationManager.getProtocol());
-            } catch (Exception e) {
-               OseeExceptions.wrapAndThrow(e);
+
+               return session;
             }
+         };
 
+         try {
+            Session session = sessionCache.get(newSessionId, callable);
+            sessionGrant = sessionFactory.createSessionGrant(session, userToken, authenticationManager.getProtocol());
+         } catch (Exception e) {
+            OseeExceptions.wrapAndThrow(e);
          }
-      }
-      return sessionGrant;
-   }
 
-   private boolean checkVersion(OseeCredential credential) {
-      boolean supported = false;
-      String clientVersion = credential.getVersion();
-      for (String version : serverManager.getSupportedVersions()) {
-         if (version.equals(clientVersion)) {
-            supported = true;
-            break;
-         }
       }
-      return supported;
+      return sessionGrant;
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java
index a905a91c5e5..3ebe08bd42b 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java
@@ -17,7 +17,6 @@ import org.eclipse.osee.cache.admin.CacheConfiguration;
 import org.eclipse.osee.framework.core.data.OseeCredential;
 import org.eclipse.osee.framework.core.data.OseeSessionGrant;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.server.IApplicationServerManager;
 import org.eclipse.osee.framework.core.server.IAuthenticationManager;
 import org.eclipse.osee.framework.core.server.ISession;
 import org.eclipse.osee.framework.core.server.ISessionManager;
@@ -36,7 +35,6 @@ public final class SessionManagerService implements ISessionManager {
    private Log logger;
    private DatabaseInfoRegistry registry;
    private IOseeDatabaseService dbService;
-   private IApplicationServerManager serverManager;
    private IAuthenticationManager authenticationManager;
    private CacheAdmin cacheAdmin;
    private ISessionManager proxiedSessionManager;
@@ -53,10 +51,6 @@ public final class SessionManagerService implements ISessionManager {
       this.dbService = dbService;
    }
 
-   public void setServerManager(IApplicationServerManager serverManager) {
-      this.serverManager = serverManager;
-   }
-
    public void setAuthenticationManager(IAuthenticationManager authenticationManager) {
       this.authenticationManager = authenticationManager;
    }
@@ -69,10 +63,6 @@ public final class SessionManagerService implements ISessionManager {
       return dbService;
    }
 
-   private IApplicationServerManager getServerManager() {
-      return serverManager;
-   }
-
    private IAuthenticationManager getAuthenticationManager() {
       return authenticationManager;
    }
@@ -95,7 +85,7 @@ public final class SessionManagerService implements ISessionManager {
       }
 
       proxiedSessionManager =
-         new SessionManagerImpl(sessionFactory, sessionCache, getAuthenticationManager(), accessor, getServerManager());
+         new SessionManagerImpl(sessionFactory, sessionCache, getAuthenticationManager(), accessor);
    }
 
    public void stop() {