feature[ats_ZPPTH]: Configure application server to use https

Change-Id: Ic303fd99ffca233b8a8976b9be7f1b559387cb8a

17 files changed, 236 insertions, 89 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/ApplicationServer.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/ApplicationServer.java
index ad9782ba423..af8b55f581c 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/ApplicationServer.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/ApplicationServer.java
@@ -42,14 +42,14 @@ public class ApplicationServer extends OseeServer {
 
    public String getServerAddress() {
       if (serverAddress == null && serverInfo != null) {
-         serverAddress = String.format("http://%s:%s/", serverInfo.getServerAddress(), serverInfo.getPort());
+         serverAddress = serverInfo.getUri().toString();
       }
       return serverAddress;
    }
 
    public void checkAlive() {
       if (isServerInfoValid()) {
-         boolean alive = HttpProcessor.isAlive(serverInfo.getServerAddress(), serverInfo.getPort());
+         boolean alive = HttpProcessor.isAlive(serverInfo.getUri());
          setAlive(alive);
          if (alive) {
             set(Level.INFO, null, "%s %s Running Since: %s", getServerAddress(),
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
index 2ad23bc29d3..cbbbd55aca5 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
@@ -14,8 +14,6 @@ package org.eclipse.osee.framework.core.client.internal;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import org.eclipse.osee.framework.core.client.OseeClientProperties;
 import org.eclipse.osee.framework.core.data.OseeServerInfo;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -63,7 +61,9 @@ public class OseeApplicationServer {
          if (Strings.isValid(overrideValue)) {
             arbitrationServer.set(Level.INFO, null, "Arbitration Overridden");
             try {
-               serverInfo = parseServerInfo(overrideValue);
+               serverInfo =
+                  new OseeServerInfo("OVERRIDE", overrideValue, new String[] {"OVERRIDE"}, new Timestamp(
+                     new Date().getTime()), true);
             } catch (Exception ex) {
                OseeLog.log(CoreClientActivator.class, Level.SEVERE, ex);
                applicationServer.set(Level.SEVERE, ex, "Error parsing arbitration server override [%s]", overrideValue);
@@ -82,21 +82,4 @@ public class OseeApplicationServer {
       applicationServer.report();
    }
 
-   private static OseeServerInfo parseServerInfo(String value) throws Exception {
-      OseeServerInfo toReturn = null;
-      String rawAddress = value;
-      if (rawAddress.startsWith("http")) {
-         rawAddress = value.replace("http://", "");
-      }
-      Pattern pattern = Pattern.compile("(.*):(\\d+)");
-      Matcher matcher = pattern.matcher(rawAddress);
-      if (matcher.find()) {
-         String address = matcher.group(1);
-         int port = Integer.valueOf(matcher.group(2));
-         toReturn =
-            new OseeServerInfo("OVERRIDE", address, port, new String[] {"OVERRIDE"},
-               new Timestamp(new Date().getTime()), true);
-      }
-      return toReturn;
-   }
 }
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 3d006c02c47..dc0ca400fab 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.server;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -37,9 +38,7 @@ public interface IApplicationServerManager {
 
    String getId();
 
-   String getServerAddress();
-
-   int getPort();
+   URI getServerUri();
 
    Date getDateStarted();
 
@@ -56,4 +55,5 @@ public interface IApplicationServerManager {
    void unregister(String key);
 
    Collection<String> getRegisteredServlets();
+
 }
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 d3376da6051..0536405e033 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
@@ -21,6 +21,7 @@ import org.eclipse.osee.logger.Log;
 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";
@@ -83,7 +84,24 @@ public class OseeServerProperties {
     * @return the application server port
     */
    public static int getOseeApplicationServerPort() {
-      return Integer.valueOf(System.getProperty(OSGI_PORT_PROPERTY, "-1"));
+      int toReturn = Integer.valueOf(System.getProperty(OSGI_SECURE_PORT_PROPERTY, "-1"));
+      if (toReturn == -1) {
+         toReturn = Integer.valueOf(System.getProperty(OSGI_PORT_PROPERTY, "-1"));
+      }
+      return toReturn;
+   }
+
+   /**
+    * Retrieve the application server scheme
+    * 
+    * @return the application server scheme
+    */
+   public static String getOseeApplicationServerScheme() {
+      String toReturn = "https";
+      if (Integer.valueOf(System.getProperty(OSGI_SECURE_PORT_PROPERTY, "-1")) == -1) {
+         toReturn = "http";
+      }
+      return toReturn;
    }
 
    /**
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 6e49413fc72..1b17325927c 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.server.internal;
 
+import java.net.URI;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +37,7 @@ public class ApplicationServerDataStore {
       "SELECT count(1) FROM osee_session WHERE managed_by_server_id = ?";
 
    private static final String SELECT_FROM_LOOKUP_TABLE =
-      "SELECT * FROM osee_server_lookup ORDER BY server_address desc, port desc, version_id desc";
+      "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";
@@ -86,12 +87,10 @@ public class ApplicationServerDataStore {
 
             OseeServerInfoMutable info = infos.get(serverId);
             if (info == null) {
-               String serverAddress = chStmt.getString("server_address");
-               int port = chStmt.getInt("port");
+               String uri = chStmt.getString("server_uri");
                Timestamp timestamp = chStmt.getTimestamp("start_time");
                info =
-                  new OseeServerInfoMutable(serverId, serverAddress, port, new String[] {serverVersion}, timestamp,
-                     isAcceptingRequests);
+                  new OseeServerInfoMutable(serverId, uri, new String[] {serverVersion}, timestamp, isAcceptingRequests);
                infos.put(serverId, info);
             } else {
                boolean acceptingRequests = info.isAcceptingRequests() && isAcceptingRequests;
@@ -145,7 +144,7 @@ public class ApplicationServerDataStore {
    private static final class ServerLookupTx implements IDbTransactionWork {
 
       private static final String INSERT_LOOKUP_TABLE =
-         "INSERT INTO osee_server_lookup (server_id, version_id, server_address, port, start_time, accepts_requests) VALUES (?,?,?,?,?,?)";
+         "INSERT INTO osee_server_lookup (server_id, version_id, server_address, port, server_uri, start_time, accepts_requests) VALUES (?,?,?,?,?,?,?)";
 
       private static final String DELETE_FROM_LOOKUP_TABLE_BY_ID = "DELETE FROM osee_server_lookup WHERE server_id = ?";
 
@@ -185,13 +184,15 @@ public class ApplicationServerDataStore {
          List<Object[]> insertData = new ArrayList<Object[]>();
          for (OseeServerInfo data : datas) {
             String serverId = data.getServerId();
-            String address = data.getServerAddress();
-            int port = data.getPort();
+            URI serverUri = data.getUri();
+            String uri = serverUri.toString();
+            String address = serverUri.getHost();
+            int port = serverUri.getPort();
             Timestamp dateStarted = data.getDateStarted();
             int acceptingRequests = data.isAcceptingRequests() ? 1 : 0;
 
             for (String version : data.getVersion()) {
-               insertData.add(new Object[] {serverId, version, address, port, dateStarted, acceptingRequests});
+               insertData.add(new Object[] {serverId, version, address, port, uri, dateStarted, acceptingRequests});
             }
          }
          if (!insertData.isEmpty()) {
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
index ddfeedb24ac..318ee92d421 100644
--- 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
@@ -146,7 +146,7 @@ public class ApplicationServerLookup implements IApplicationServerLookup {
    }
 
    private boolean isServerAlive(OseeServerInfo info) {
-      return HttpProcessor.isAlive(info.getServerAddress(), info.getPort());
+      return HttpProcessor.isAlive(info.getUri());
    }
 
 }
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 849d2dc503d..b903854f809 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
@@ -13,6 +13,8 @@ package org.eclipse.osee.framework.core.server.internal;
 import java.io.ByteArrayInputStream;
 import java.lang.Thread.State;
 import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -138,6 +140,13 @@ public class ApplicationServerManager implements IApplicationServerManager {
          //
       }
       int port = OseeServerProperties.getOseeApplicationServerPort();
+      String scheme = OseeServerProperties.getOseeApplicationServerScheme();
+      URI uri = null;
+      try {
+         uri = new URI(scheme, null, serverAddress, port, null, null, null);
+      } catch (URISyntaxException ex) {
+         logger.error(ex, "Error generating application server uri");
+      }
 
       String checkSum = "-1";
       try {
@@ -148,8 +157,7 @@ public class ApplicationServerManager implements IApplicationServerManager {
          logger.error(ex, "Error generating application server id");
       }
       OseeServerInfoMutable toReturn =
-         new OseeServerInfoMutable(checkSum, serverAddress, port, new String[0], GlobalTime.GreenwichMeanTimestamp(),
-            false);
+         new OseeServerInfoMutable(checkSum, uri.toString(), new String[0], GlobalTime.GreenwichMeanTimestamp(), false);
       toReturn.setVersions(defaultVersions);
       return toReturn;
    }
@@ -306,13 +314,8 @@ public class ApplicationServerManager implements IApplicationServerManager {
    }
 
    @Override
-   public String getServerAddress() {
-      return getApplicationServerInfo().getServerAddress();
-   }
-
-   @Override
-   public int getPort() {
-      return getApplicationServerInfo().getPort();
+   public URI getServerUri() {
+      return getApplicationServerInfo().getUri();
    }
 
    @Override
@@ -380,4 +383,5 @@ public class ApplicationServerManager implements IApplicationServerManager {
       }
       return status;
    }
+
 }
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
index dabaa0cd838..a1864613361 100644
--- 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
@@ -22,8 +22,8 @@ public class OseeServerInfoMutable extends OseeServerInfo {
 
    private static final long serialVersionUID = 4437012224149055646L;
 
-   public OseeServerInfoMutable(String serverId, String serverAddress, int port, String[] version, Timestamp dateStarted, boolean isAcceptingRequests) {
-      super(serverId, serverAddress, port, version, dateStarted, isAcceptingRequests);
+   public OseeServerInfoMutable(String serverId, String uri, String[] version, Timestamp dateStarted, boolean isAcceptingRequests) {
+      super(serverId, uri, version, dateStarted, isAcceptingRequests);
    }
 
    public void setAcceptingRequests(boolean value) {
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 8a8cbedf51f..c282dd0c591 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
@@ -127,7 +127,7 @@ public class ServerStatsCommand implements ConsoleCommand {
          console.writeln("                  Server Stats");
          console.writeln("----------------------------------------------");
 
-         console.writeln("Server:[%s:%s]", manager.getServerAddress(), manager.getPort());
+         console.writeln("Server:[%s]", manager.getServerUri());
          console.writeln("Id: [%s]", manager.getId());
          console.writeln("Running Since: [%s]\n",
             DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(manager.getDateStarted()));
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
index 90e1b00f2c8..8b173f8450b 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
@@ -11,8 +11,10 @@
 package org.eclipse.osee.framework.core.data;
 
 import java.io.InputStream;
+import java.net.URI;
 import java.sql.Timestamp;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
 
 /**
  * @author Roberto E. Escobar
@@ -20,22 +22,20 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 public class OseeServerInfo extends BaseExchangeData {
    private static final long serialVersionUID = 2696663265012016128L;
    private static final String[] EMPTY_ARRAY = new String[0];
-   private static final String SERVER_ADDRESS = "serverAddress";
-   private static final String PORT = "port";
+   private static final String SERVER_URI = "uri";
    protected static final String VERSION = "version";
    private static final String DATE_CREATED = "creationDate";
    private static final String SERVER_ID = "serverId";
    protected static final String IS_ACCEPTING_REQUESTS = "isAcceptingRequests";
 
-   private OseeServerInfo() {
+   public OseeServerInfo() {
       super();
    }
 
-   public OseeServerInfo(String serverId, String serverAddress, int port, String[] version, Timestamp dateStarted, boolean isAcceptingRequests) {
+   public OseeServerInfo(String serverId, String uri, String[] version, Timestamp dateStarted, boolean isAcceptingRequests) {
       this();
       this.backingData.put(SERVER_ID, serverId);
-      this.backingData.put(SERVER_ADDRESS, serverAddress);
-      this.backingData.put(PORT, port);
+      this.backingData.put(SERVER_URI, uri);
       this.backingData.put(VERSION, version);
       this.backingData.put(DATE_CREATED, dateStarted.getTime());
       this.backingData.put(IS_ACCEPTING_REQUESTS, isAcceptingRequests);
@@ -49,17 +49,21 @@ public class OseeServerInfo extends BaseExchangeData {
    }
 
    /**
-    * @return the serverAddress
+    * @return the server uri
     */
-   public String getServerAddress() {
-      return getString(SERVER_ADDRESS);
-   }
 
-   /**
-    * @return the port
-    */
-   public int getPort() {
-      return backingData.getInt(PORT);
+   // temporary code to remove after release of uri change
+   private static final String SERVER_ADDRESS = "serverAddress";
+   private static final String PORT = "port";
+
+   public URI getUri() {
+      String serverUri = getString(SERVER_URI);
+      if (!Strings.isValid(serverUri)) {
+         String address = getString(SERVER_ADDRESS);
+         String port = getString(PORT);
+         serverUri = String.format("http://%s:%s", address, port);
+      }
+      return URI.create(serverUri);
    }
 
    /**
@@ -94,4 +98,5 @@ public class OseeServerInfo extends BaseExchangeData {
       serverInfo.loadfromXml(inputStream);
       return serverInfo;
    }
+
 }
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
index 1c518b91403..3f3cb33c259 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
@@ -183,27 +183,12 @@ public class HttpProcessor {
       return isAlive;
    }
 
-   public static boolean isAlive(String serverAddress, int port) {
+   public static boolean isAlive(URI uri) {
       boolean isAlive = false;
-      String urlString = null;
-      int internalPort = port < -1 ? -1 : port;
       try {
-         if (internalPort > -1) {
-            urlString = String.format("http://%s:%s", serverAddress, String.valueOf(internalPort));
-         } else {
-            urlString = String.format("http://%s", serverAddress);
-         }
-      } catch (Exception ex) {
-         // Do Nothing
-      }
-
-      if (urlString != null) {
-         try {
-            URL url = new URL(urlString);
-            isAlive = isAlive(url);
-         } catch (MalformedURLException ex) {
-            // Do Nothing
-         }
+         isAlive = isAlive(uri.toURL());
+      } catch (MalformedURLException ex) {
+         // do nothing
       }
       return isAlive;
    }
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/HttpUrlBuilder.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/HttpUrlBuilder.java
index b8fef20387c..d08a0f872d8 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/HttpUrlBuilder.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/HttpUrlBuilder.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.jdk.core.util;
 
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -46,12 +47,13 @@ public final class HttpUrlBuilder {
       return query.toUrl();
    }
 
-   public static String createURL(String address, int port, String context, Map<String, String> parameters) throws UnsupportedEncodingException {
+   public static String createURL(URI uri, String context, Map<String, String> parameters) throws UnsupportedEncodingException {
       StringBuilder sb = new StringBuilder();
-      sb.append("http://");
-      sb.append(address);
+      sb.append(uri.getScheme());
+      sb.append("://");
+      sb.append(uri.getHost());
       sb.append(":");
-      sb.append(port);
+      sb.append(uri.getPort());
       sb.append("/");
       sb.append(context);
       if (parameters != null && !parameters.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java
index 518f135d429..c29a18f3dc4 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java
@@ -98,8 +98,7 @@ public class ServerBranchUpdateOperation extends AbstractOperation {
          if (!manager.getId().equals(serverInfo.getServerId()) && serverInfo.isAcceptingRequests()) {
             try {
                String urlString =
-                  HttpUrlBuilder.createURL(serverInfo.getServerAddress(), serverInfo.getPort(),
-                     OseeServerContext.CACHE_CONTEXT, parameters);
+                  HttpUrlBuilder.createURL(serverInfo.getUri(), OseeServerContext.CACHE_CONTEXT, parameters);
 
                BranchCacheStoreRequest message = is_0_9_2_Compatible(serverInfo.getVersion()) ? request : request0_9_1;
 
diff --git a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
index e0cafd7e67d..7b9b3b710a8 100644
--- a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
+++ b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
@@ -510,13 +510,14 @@
 	<!-- __________________________________________________________ -->
 	
 	<Table name="OSEE_SERVER_LOOKUP" schema="OSEE" tablespace="osee_data">
+		<Column id="SERVER_URI" defaultValue="not null" type="VARCHAR" limits="255" />
 		<Column id="VERSION_ID" defaultValue="not null" type="VARCHAR" limits="100" />
 		<Column id="SERVER_ADDRESS" defaultValue="not null" type="VARCHAR" limits="255"/>
 		<Column id="PORT" defaultValue="not null" type="INTEGER" />
 		<Column id="ACCEPTS_REQUESTS" defaultValue="not null" type="smallint" />
 		<Column id="START_TIME" defaultValue="not null" type="TIMESTAMP" />
 		<Column id="SERVER_ID" defaultValue="not null" type="VARCHAR" limits="40" />
-		<Constraint schema="OSEE" id="OSEE_SERVER_LOOKUP_PK" type="PRIMARY KEY" appliesTo="SERVER_ADDRESS, PORT, VERSION_ID" />
+		<Constraint schema="OSEE" id="OSEE_SERVER_LOOKUP_PK" type="PRIMARY KEY" appliesTo="SERVER_URI, VERSION_ID" />
 	</Table>
 	
 	<TableDescription referenceTable="OSEE_SERVER_LOOKUP">
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch
new file mode 100644
index 00000000000..09b44f644f9
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<setAttribute key="additional_plugins">
+<setEntry value="com.google.guava:10.0.1.v201203051515:default:false"/>
+<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/>
+</setAttribute>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/OSEE_Application_Server_https_[HSQLDB]"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<intAttribute key="default_start_level" value="4"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dosee.db.connection.id=hsql&#13;&#10;-Dosee.db.embedded.server=0.0.0.0:8088&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dosee.connection.info.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml&quot;&#13;&#10;-Dorg.eclipse.equinox.http.jetty.https.enabled=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keystore=${project_loc:org.eclipse.osee.support.config}/launchConfig/demo.keystore&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.password=demoPassword&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keypassword=demoPassword&#13;&#10;-Dorg.osgi.service.http.port.secure=8089"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<setAttribute key="selected_features">
+<setEntry value="org.eclipse.osee.orcs.feature:default"/>
+<setEntry value="org.eclipse.osee.x.core.external.feature:default"/>
+<setEntry value="org.eclipse.osee.x.core.feature:default"/>
+<setEntry value="org.eclipse.osee.x.server.external.feature:default"/>
+<setEntry value="org.eclipse.osee.x.server.feature:default"/>
+<setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/>
+</setAttribute>
+<booleanAttribute key="show_selected_only" value="true"/>
+<stringAttribute key="timestamp" value="1369262663070"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_https_[localhost].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_https_[localhost].launch
new file mode 100644
index 00000000000..7f681daf9de
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_https_[localhost].launch
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<setAttribute key="additional_plugins">
+<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/>
+</setAttribute>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/OSEE_IDE_https_[localhost]"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeFragments" value="false"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/runtime-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -debug"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-XX:MaxPermSize=256m&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.application.server=https://localhost:8089&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Djavax.net.ssl.trustStore=${project_loc:org.eclipse.osee.support.config}/launchConfig/demo.keystore"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/>
+<booleanAttribute key="restart" value="false"/>
+<setAttribute key="selected_features">
+<setEntry value="de.itemis.xtext.antlr.feature:default"/>
+<setEntry value="de.itemis.xtext.antlr.sdk:default"/>
+<setEntry value="de.itemis.xtext.antlr.source.feature:default"/>
+<setEntry value="org.eclipse.cvs.source:default"/>
+<setEntry value="org.eclipse.cvs:default"/>
+<setEntry value="org.eclipse.draw2d:default"/>
+<setEntry value="org.eclipse.emf.codegen.ecore.ui:default"/>
+<setEntry value="org.eclipse.emf.codegen.ecore:default"/>
+<setEntry value="org.eclipse.emf.codegen.ui:default"/>
+<setEntry value="org.eclipse.emf.codegen:default"/>
+<setEntry value="org.eclipse.emf.common.ui:default"/>
+<setEntry value="org.eclipse.emf.common:default"/>
+<setEntry value="org.eclipse.emf.compare:default"/>
+<setEntry value="org.eclipse.emf.converter:default"/>
+<setEntry value="org.eclipse.emf.databinding.edit:default"/>
+<setEntry value="org.eclipse.emf.databinding:default"/>
+<setEntry value="org.eclipse.emf.ecore.edit:default"/>
+<setEntry value="org.eclipse.emf.ecore.editor:default"/>
+<setEntry value="org.eclipse.emf.ecore:default"/>
+<setEntry value="org.eclipse.emf.edit.ui:default"/>
+<setEntry value="org.eclipse.emf.edit:default"/>
+<setEntry value="org.eclipse.emf.mapping.ecore.editor:default"/>
+<setEntry value="org.eclipse.emf.mapping.ecore:default"/>
+<setEntry value="org.eclipse.emf.mapping.ui:default"/>
+<setEntry value="org.eclipse.emf.mapping:default"/>
+<setEntry value="org.eclipse.emf:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui.source:default"/>
+<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
+<setEntry value="org.eclipse.gef:default"/>
+<setEntry value="org.eclipse.help.source:default"/>
+<setEntry value="org.eclipse.help:default"/>
+<setEntry value="org.eclipse.jdt.source:default"/>
+<setEntry value="org.eclipse.nebula.widgets.ganttchart.feature:default"/>
+<setEntry value="org.eclipse.nebula.widgets.xviewer.feature:default"/>
+<setEntry value="org.eclipse.osee.ats.feature:default"/>
+<setEntry value="org.eclipse.osee.client.all.feature:default"/>
+<setEntry value="org.eclipse.osee.client.feature:default"/>
+<setEntry value="org.eclipse.osee.client.ote.feature:default"/>
+<setEntry value="org.eclipse.osee.core.feature:default"/>
+<setEntry value="org.eclipse.osee.core.plugin.feature:default"/>
+<setEntry value="org.eclipse.osee.core.runtime.feature:default"/>
+<setEntry value="org.eclipse.osee.core.ui.feature:default"/>
+<setEntry value="org.eclipse.osee.coverage.feature:default"/>
+<setEntry value="org.eclipse.osee.define.feature:default"/>
+<setEntry value="org.eclipse.osee.external.feature:default"/>
+<setEntry value="org.eclipse.osee.framework.feature:default"/>
+<setEntry value="org.eclipse.osee.framework.ui.feature:default"/>
+<setEntry value="org.eclipse.pde.source:default"/>
+<setEntry value="org.eclipse.pde:default"/>
+<setEntry value="org.eclipse.platform.source:default"/>
+<setEntry value="org.eclipse.platform:default"/>
+<setEntry value="org.eclipse.rcp:default"/>
+<setEntry value="org.eclipse.sdk:default"/>
+<setEntry value="org.eclipse.team.svn:default"/>
+<setEntry value="org.eclipse.xtext.docs:default"/>
+<setEntry value="org.eclipse.xtext.examples.source:default"/>
+<setEntry value="org.eclipse.xtext.examples:default"/>
+<setEntry value="org.eclipse.xtext.runtime.source:default"/>
+<setEntry value="org.eclipse.xtext.runtime:default"/>
+<setEntry value="org.eclipse.xtext.sdk:default"/>
+<setEntry value="org.eclipse.xtext.ui.source:default"/>
+<setEntry value="org.eclipse.xtext.ui:default"/>
+<setEntry value="org.eclipse.xtext.xtext.ui.source:default"/>
+<setEntry value="org.eclipse.xtext.xtext.ui:default"/>
+</setAttribute>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value=""/>
+<stringAttribute key="timestamp" value="1349216380893"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/demo.keystore b/plugins/org.eclipse.osee.support.config/launchConfig/demo.keystore
new file mode 100644
index 00000000000..ac9e653118a
--- /dev/null
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/demo.keystore