Merge pull request #519 from opengeospatial/issue#418

Issue#418

src/site/markdown/installation.md

@@ -175,3 +175,11 @@ directory can be modified to provide site-specific content:
 - **site/welcome.txt**: The main text.
 - **site/footer.txt**: Footer content.
 - **site/title.html**: Title of the web application
+
+### TEAM Engine behind a reverse proxy
+
+If you run TEAM Engine behind a reverse proxy using HTTPS, you will need to configure your proxy as described in the following:
+
+Configure your proxy to add the **x-forwarded-proto** header, with value **https**, to any requests that are forwarded to the TEAM Engine. 
+
+

teamengine-web/src/main/java/com/occamlab/te/web/TestServlet.java

@@ -84,6 +84,7 @@ public class TestServlet extends HttpServlet {
     public static final String CTL_NS = "http://www.occamlab.com/ctl";
     /** Alias is declared in the web app Context element. */
     private static final String ABOUT_ALIAS = "about/";
+	private static final String X_FORWARDED_PROTO = "X-Forwarded-Proto";
 
     private static Logger LOGR = Logger
             .getLogger("com.occamlab.te.web.TestServlet");
@@ -363,7 +364,11 @@ public void process(HttpServletRequest request, HttpServletResponse response)
                 opts.setBaseURI(baseURL.toString());
                 TECore core = new TECore(engine, indexes.get(opts
                         .getSourcesName()), opts);
-                String servletURL = request.getRequestURL().toString();
+                String scheme = request.getHeader(X_FORWARDED_PROTO);
+                if( scheme == null) {
+                	scheme = "http";
+                }
+                String servletURL = scheme  + "://"  + request.getServerName() + (request.getServerPort() != 80 ? ":" + request.getServerPort() : "") +  request.getRequestURI();
                 LOGR.fine("Request URL is " + servletURL);
                 core.setTestServletURL(servletURL);
                 MonitorServlet.setBaseServletURL(servletURL.substring(0,