Index: main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/common.xsl
===================================================================
--- main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/common.xsl	(revision 2713)
+++ main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/common.xsl	(working copy)
@@ -188,7 +188,7 @@
          <tr>
             <td class="{$server.class}">
                <xsl:if test="not ($selection='server')">
-                  <a href="/serverbydomain" class="tabs">
+                  <a href="serverbydomain" class="tabs">
                      <xsl:call-template name="str">
                         <xsl:with-param name="id">common.tabs.serverview</xsl:with-param>
                      </xsl:call-template>
@@ -205,7 +205,7 @@
             <td width="2"/>
 
             <td class="{$mbean.class}">
-               <a href="/empty?template=emptymbean" class="tabs">
+               <a href="empty?template=emptymbean" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.mbeanview</xsl:with-param>
                   </xsl:call-template>
@@ -215,7 +215,7 @@
             <td width="2"/>
 
             <td class="{$timer.class}">
-               <a href="/serverbydomain?instanceof=javax.management.timer.Timer&amp;template=timer" class="tabs">
+               <a href="serverbydomain?instanceof=javax.management.timer.Timer&amp;template=timer" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.timerview</xsl:with-param>
                   </xsl:call-template>
@@ -225,7 +225,7 @@
             <td width="2"/>
 
             <td class="{$monitor.class}">
-               <a href="/serverbydomain?instanceof=javax.management.monitor.Monitor&amp;template=monitor" class="tabs">
+               <a href="serverbydomain?instanceof=javax.management.monitor.Monitor&amp;template=monitor" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.monitorview</xsl:with-param>
                   </xsl:call-template>
@@ -235,7 +235,7 @@
             <td width="2"/>
 
             <td class="{$relation.class}">
-               <a href="/relation?instanceof=javax.management.relation.Relation&amp;template=relation" class="tabs">
+               <a href="relation?instanceof=javax.management.relation.Relation&amp;template=relation" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.relationview</xsl:with-param>
                   </xsl:call-template>
@@ -245,7 +245,7 @@
             <td width="2"/>
 
             <td class="{$mlet.class}">
-               <a href="/serverbydomain?instanceof=javax.management.loading.MLetMBean&amp;template=mlet" class="tabs">
+               <a href="serverbydomain?instanceof=javax.management.loading.MLetMBean&amp;template=mlet" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.mletview</xsl:with-param>
                   </xsl:call-template>
@@ -255,7 +255,7 @@
             <td width="2"/>
 <!--
             <td class="{$about.class}">
-               <a href="/mbean?objectname=JMImplementation%3Atype%3DMBeanServerDelegate&amp;template=about" class="tabs">
+               <a href="mbean?objectname=JMImplementation%3Atype%3DMBeanServerDelegate&amp;template=about" class="tabs">
                   <xsl:call-template name="str">
                      <xsl:with-param name="id">common.tabs.about</xsl:with-param>
                   </xsl:call-template>
@@ -269,7 +269,7 @@
    <xsl:template name="serverview">
       <tr>
          <td class="darkline" align="right">
-            <a href="/">
+            <a href="">
                <xsl:call-template name="str">
                   <xsl:with-param name="id">common.serverview.return</xsl:with-param>
                </xsl:call-template>
@@ -291,7 +291,7 @@
                </xsl:call-template>
             </xsl:variable>
 
-            <a href="/mbean?objectname={$objectname-encode}">
+            <a href="mbean?objectname={$objectname-encode}">
                <xsl:call-template name="str">
                   <xsl:with-param name="id">
                      <xsl:value-of select="$text"/>
Index: main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/mbean_attributes.xsl
===================================================================
--- main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/mbean_attributes.xsl	(revision 2713)
+++ main/xsl/net/sourceforge/cruisecontrol/jmx/xsl/mbean_attributes.xsl	(working copy)
@@ -204,7 +204,7 @@
                   </xsl:with-param>
                </xsl:call-template>
             </xsl:variable>
-            <a href="/mbean?objectname={$name_encoded}">
+            <a href="mbean?objectname={$name_encoded}">
                <xsl:value-of select="$objectvalue"/>
             </a>
          </xsl:when>
Index: reporting/jsp/build.xml
===================================================================
--- reporting/jsp/build.xml	(revision 2713)
+++ reporting/jsp/build.xml	(working copy)
@@ -91,7 +91,7 @@
             <include name="xml*.jar"/>
             <include name="xwork*.jar"/>
         </fileset>
-        <fileset dir="${lib}" includes="servlet*.jar"/>
+        <fileset dir="${lib}" includes="servlet*.jar,jsp*.jar"/>
         <pathelement location="${classes}"/>
         <pathelement location="${test.classes}"/>
     </path>
Index: reporting/jsp/lib/jsp-api-2.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: reporting\jsp\lib\jsp-api-2.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: reporting/jsp/lib/servlet-api-2.4.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: reporting\jsp\lib\servlet-api-2.4.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: reporting/jsp/lib/servlet.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTag.java
===================================================================
--- reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTag.java	(revision 2713)
+++ reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTag.java	(working copy)
@@ -77,6 +77,8 @@
 
     private String getArtifactURL() throws JspException {    
         StringBuffer urlBuffer = new StringBuffer();
+        urlBuffer.append(getRequest().getContextPath());
+        urlBuffer.append("/");
         urlBuffer.append(ARTIFACTS_SERVLET_CONTEXT);
         String project = getProject();
         if (project.length() > 0) {
Index: reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/TabSheetTag.java
===================================================================
--- reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/TabSheetTag.java	(revision 2713)
+++ reporting/jsp/src/net/sourceforge/cruisecontrol/taglib/TabSheetTag.java	(working copy)
@@ -64,13 +64,13 @@
             + EOL
             + "  <tr>"
             + EOL
-            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"images/bluestripestop.gif\"></td>"
+            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"@contextPath@/images/bluestripestop.gif\"></td>"
             + EOL
             + "  </tr>"
             + EOL;
     private static final String END_SHEET = "  <tr>"
             + EOL
-            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"images/bluestripesbottom.gif\"></td>"
+            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"@contextPath@/images/bluestripesbottom.gif\"></td>"
             + EOL
             + "  </tr>"
             + EOL
@@ -123,11 +123,13 @@
     }
 
     private void endTable(final JspWriter out) throws IOException {
-        out.write(END_SHEET);
+        final String endSheet = new String(END_SHEET).replaceAll("@contextPath@", getRequest().getContextPath());
+        out.write(endSheet);
     }
 
     private void startTable(final JspWriter out) throws IOException {
-        out.write(START_SHEET);
+        final String startSheet = new String(START_SHEET).replaceAll("@contextPath@", getRequest().getContextPath());
+        out.write(startSheet);
     }
 
     private void clearTabs() {
Index: reporting/jsp/src/net/sourceforge/cruisecontrol/util/URLProxyResolver.java
===================================================================
--- reporting/jsp/src/net/sourceforge/cruisecontrol/util/URLProxyResolver.java	(revision 0)
+++ reporting/jsp/src/net/sourceforge/cruisecontrol/util/URLProxyResolver.java	(revision 0)
@@ -0,0 +1,132 @@
+package net.sourceforge.cruisecontrol.util;
+
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Helper for getting the proxy real hostname/port. <br/>
+ * 
+ * Available headers from cruisecontrol when accessed with an apache proxy (tested with apache 2.2). <br/>
+ * <ul>
+ * <li>Host - [ccontrol_hostame]:[ccontrol_port] ex: localhost:8080</li>
+ * <li>User-Agent - Mozilla/5.0 (Windows; U; Windows NT 5.1; fr; rv:1.8.0.7) Gecko/20060909 Firefox/1.5.0.7</li>
+ * <li>Accept - text/xml,application/xml,application/xhtml+xml,text/html;...</li>
+ * <li>Accept-Language - fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3</li>
+ * <li>Accept-Encoding - gzip,deflate</li>
+ * <li>Accept-Charset - ISO-8859-1,utf-8;q=0.7,*;q=0.7</li>
+ * <li>Cookie - JSESSIONID=3m1p9evfp7x49</li>
+ * <li>Cache-Control - max-age=0</li>
+ * <li>Max-Forwards - 10</li>
+ * <li>X-Forwarded-For - [the browser IP than asked for the page]</li>
+ * <li>X-Forwarded-Host - [proxy_hostname] or [proxy_hostname]:[port_number] 
+ * (port_number = if it was written in the URL the end-user typed)</li>
+ * <li>X-Forwarded-Server - [proxy_IP]</li>
+ * <li>Connection - keep-alive</li>
+ * </ul>
+ */
+public class URLProxyResolver {
+    public static final String X_FORWARDED_FOR = "X-Forwarded-For";
+    public static final String X_FORWARDED_HOST = "X-Forwarded-Host";
+    
+    private final HttpServletRequest request;
+
+    public URLProxyResolver(final HttpServletRequest request) {
+        if (isProxied(request)) {
+            this.request = new UnProxyServletRequest(request);
+        } else {
+            this.request = request;
+        }
+    }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public static boolean isProxied(final HttpServletRequest request) {
+        return request.getHeader(X_FORWARDED_FOR) != null;
+    }
+    
+    /**
+     * This implementation assumes that both X-Forwarded-For and X-Forwarded-Host exist in the request
+     * otherwise if it is not the case and the application use the getRemoteAddr() and getRemoteHost()
+     * there will be some strange results. :)
+     * 
+     * <ul><li>X-Forwarded-Host: host.name.com</li>
+     * <li>X-Forwarded-For: [browser's IP]</li></ul>
+     */
+    private class UnProxyServletRequest extends HttpServletRequestWrapper {
+        
+        private final Log log = LogFactory.getLog(UnProxyServletRequest.class);
+        
+        private final String remoteHost;
+        private final int remotePort;
+        
+        public UnProxyServletRequest(final HttpServletRequest request) {
+            super(request);
+            // X-forwarded-host contains also the port as hostname:port 
+            // if the user typed something like localhost:port in the browser address bar
+            String host = getProxyHeader(X_FORWARDED_HOST);
+            if (log.isDebugEnabled()) {
+                log.debug("host: " + host);
+            }
+            remoteHost = (host != null ? host : super.getRemoteHost());
+                    
+            remotePort = extractPortNumber(host);
+        }
+
+        public String getRemoteAddr() {
+            String ip = getProxyHeader(X_FORWARDED_FOR);
+            if (log.isDebugEnabled()) {
+                log.debug("ip: " + ip);
+            }
+            return ip != null ? ip : super.getRemoteAddr();
+        }
+
+        public String getRemoteHost() {
+            return remoteHost;
+        }
+        
+        public int getRemotePort() {
+            return remotePort;
+        }
+
+        public String getScheme() {
+            if (remotePort == 443) {
+                return "https";
+            }
+            return super.getScheme();
+        }
+        
+        private int extractPortNumber(final String host) {
+            final StringTokenizer tokenizer = new StringTokenizer(host, ":");
+            if (tokenizer.countTokens() < 2) {
+                return super.getRemotePort();
+            }
+            
+            String token = Integer.toString(super.getRemotePort());
+            while (tokenizer.hasMoreTokens()) {
+                token = tokenizer.nextToken();
+            }
+            return Integer.parseInt(token);
+        }
+
+        protected String getProxyHeader(final String name) {
+            String value = getHeader(name);
+            if (value == null) {
+                return null;
+            }
+            // apparently in case of chained proxies you have comma separated ips/host
+            boolean unique = (value.indexOf(',') == -1);
+            if (unique) {
+                return value;
+            }
+            String[] ips = value.split(",");
+            return ips[ips.length - 1];
+        }
+    }
+}

Property changes on: reporting\jsp\src\net\sourceforge\cruisecontrol\util\URLProxyResolver.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Revision Author HeadURL Id
Name: svn:eol-style
   + native

Index: reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockPageContext.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockPageContext.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockPageContext.java	(working copy)
@@ -48,6 +48,8 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
 
 /**
  *
@@ -156,4 +158,24 @@
     public void setHttpServletRequest(MockServletRequest mockRequest) {
         request = mockRequest;
     }
+
+    public void handlePageException(Throwable arg0) throws ServletException, IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void include(String arg0, boolean arg1) throws ServletException, IOException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public ExpressionEvaluator getExpressionEvaluator() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public VariableResolver getVariableResolver() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletContext.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletContext.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletContext.java	(working copy)
@@ -46,6 +46,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.ServletContext;
 import javax.servlet.RequestDispatcher;
@@ -161,4 +162,14 @@
     public void setBaseResourceDir(File dir) {
         baseResourceDir = dir;
     }
+
+    public Set getResourcePaths(String arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getServletContextName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletRequest.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletRequest.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletRequest.java	(working copy)
@@ -38,6 +38,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.security.Principal;
 import java.util.Enumeration;
 import java.util.Locale;
@@ -45,6 +46,8 @@
 import java.util.HashMap;
 import java.util.Collections;
 import java.util.ArrayList;
+import java.util.Random;
+
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.Cookie;
@@ -56,6 +59,11 @@
  * @author <a href="mailto:robertdw@sourceforge.net">Robert Watkins</a>
  */
 public class MockServletRequest implements HttpServletRequest {
+    
+    private static final String LOCALHOST = "localhost";
+    private static final String LOCALHOST_IP = "127.0.0.1";
+    private static final int PORT = 8080;
+    private Map headers = new HashMap();
     private String contextPath = "";
     private String servletPath;
     private Map params = new HashMap();
@@ -115,19 +123,19 @@
     }
 
     public String getProtocol() {
-        return null;
+        return "HTTP/1.1";
     }
 
     public String getScheme() {
-        return null;
+        return "http";
     }
 
     public String getServerName() {
-        return null;
+        return LOCALHOST;
     }
 
     public int getServerPort() {
-        return 0;
+        return PORT;
     }
 
     public BufferedReader getReader() throws IOException {
@@ -135,11 +143,11 @@
     }
 
     public String getRemoteAddr() {
-        return null;
+        return LOCALHOST_IP;
     }
 
     public String getRemoteHost() {
-        return null;
+        return LOCALHOST_IP;
     }
 
     public void setAttribute(String s, Object o) {
@@ -180,7 +188,11 @@
         return 0;
     }
 
-    public String getHeader(String s) {
+    public String getHeader(String name) {
+        final Object value = headers.get(name);
+        if (value != null) {
+            return value.toString();
+        }
         return null;
     }
 
@@ -288,4 +300,39 @@
     public void setLocale(Locale locale) {
         this.locale = locale;
     }
+
+    public StringBuffer getRequestURL() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getLocalAddr() {
+        return LOCALHOST_IP;
+    }
+
+    public String getLocalName() {
+        return LOCALHOST;
+    }
+
+    public int getLocalPort() {
+        return PORT;
+    }
+
+    public Map getParameterMap() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public int getRemotePort() {
+        return (new Random(System.currentTimeMillis())).nextInt();
+    }
+
+    public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void setHeaders(Map headers) {
+        this.headers = headers;
+    }
 }
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletResponse.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletResponse.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/mock/MockServletResponse.java	(working copy)
@@ -254,4 +254,14 @@
     public Locale getLocale() {
         return null;
     }
+
+    public void resetBuffer() {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void setCharacterEncoding(String arg0) {
+        // TODO Auto-generated method stub
+        
+    }
 }
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTagTest.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTagTest.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/ArtifactsLinkTagTest.java	(working copy)
@@ -97,7 +97,7 @@
         request.addParameter("log", "log20030611123100");
         tag.doInitBody();
         String url = (String) pageContext.getAttribute(ArtifactsLinkTag.URL_ATTRIBUTE);
-        assertEquals("artifacts/20030611123100", url);
+        assertEquals("/context/artifacts/20030611123100", url);
         request.removeParameter("log");
     }
 
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/TabSheetTagTest.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/TabSheetTagTest.java	(revision 2713)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/taglib/TabSheetTagTest.java	(working copy)
@@ -72,10 +72,10 @@
     private static final String START_SHEET = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">"
             + "<tbody>\r\n"
             + "  <tr>\r\n"
-            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"images/bluestripestop.gif\"></td>\r\n"
+            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"/context/images/bluestripestop.gif\"></td>\r\n"
             + "  </tr>\r\n";
     private static final String END_OF_TABLE = "  <tr>\r\n"
-            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"images/bluestripesbottom.gif\"></td>\r\n"
+            + "    <td bgcolor=\"#FFFFFF\"><img border=\"0\" src=\"/context/images/bluestripesbottom.gif\"></td>\r\n"
             + "  </tr>\r\n"
             + "</tbody></table>\r\n";
     private static final String START_OF_HEADERS = "<tr><td bgcolor=\"#FFFFFF\"><div align=\"left\"><table"
Index: reporting/jsp/test/net/sourceforge/cruisecontrol/util/URLProxyResolverTest.java
===================================================================
--- reporting/jsp/test/net/sourceforge/cruisecontrol/util/URLProxyResolverTest.java	(revision 0)
+++ reporting/jsp/test/net/sourceforge/cruisecontrol/util/URLProxyResolverTest.java	(revision 0)
@@ -0,0 +1,64 @@
+package net.sourceforge.cruisecontrol.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.cruisecontrol.mock.MockServletRequest;
+
+import junit.framework.TestCase;
+
+public class URLProxyResolverTest extends TestCase {
+
+    private MockServletRequest mock;
+    
+    protected void setUp() throws Exception {
+        mock = new MockServletRequest("cruisecontrol", "");
+    }
+    
+    public void testGetRequest() {
+        final Map headers = getHeaders("proxy.hostname.com");
+        mock.setHeaders(headers);
+
+        final URLProxyResolver resolver = new URLProxyResolver(mock);
+        final HttpServletRequest request = resolver.getRequest();
+        assertEquals("http", request.getScheme());
+        assertEquals("proxy.hostname.com", request.getRemoteHost());
+        assertEquals("/cruisecontrol", request.getContextPath());
+    }
+
+    public void testGetRequestSsl() {
+        final Map headers = getHeaders("proxy.hostname.com:443");
+        mock.setHeaders(headers);
+
+        final URLProxyResolver resolver = new URLProxyResolver(mock);
+        final HttpServletRequest request = resolver.getRequest();
+        assertEquals("https", request.getScheme());
+        assertEquals("proxy.hostname.com:443", request.getRemoteHost());
+        assertEquals("/cruisecontrol", request.getContextPath());
+    }
+
+    public void testGetRequestNoApacheProxyHeaders() {
+        final URLProxyResolver resolver = new URLProxyResolver(mock);
+        final HttpServletRequest request = resolver.getRequest();
+        assertEquals("http", request.getScheme());
+        assertEquals("127.0.0.1", request.getRemoteHost());
+        assertEquals(8080, request.getServerPort());
+        assertEquals("/cruisecontrol", request.getContextPath());
+    }
+
+    public void testIsProxied() {
+        final Map headers = getHeaders("proxy.hostname.com");
+        mock.setHeaders(headers);
+
+        assertTrue(URLProxyResolver.isProxied(mock));
+    }
+
+    private Map getHeaders(final String proxyHostname) {
+        final Map headers = new HashMap();
+        headers.put(URLProxyResolver.X_FORWARDED_FOR, "1.2.3.4");
+        headers.put(URLProxyResolver.X_FORWARDED_HOST, proxyHostname);
+        return headers;
+    }
+}

Property changes on: reporting\jsp\test\net\sourceforge\cruisecontrol\util\URLProxyResolverTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Revision Author HeadURL Id
Name: svn:eol-style
   + native

Index: reporting/jsp/webcontent/config.jsp
===================================================================
--- reporting/jsp/webcontent/config.jsp	(revision 2713)
+++ reporting/jsp/webcontent/config.jsp	(working copy)
@@ -39,9 +39,9 @@
 <html>
 <head>
     <title><ww:property value="project"/> Configuration</title>
-    <link type="text/css" rel="stylesheet" href="css/cruisecontrol.css"/>
-    <script type="text/javascript" language="JavaScript" src="prototype.js"></script>
-    <script type="text/javascript" language="JavaScript" src="cc-config.js"></script>
+    <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/cruisecontrol.css"/>
+    <script type="text/javascript" language="JavaScript" src="<%=request.getContextPath()%>/prototype.js"></script>
+    <script type="text/javascript" language="JavaScript" src="<%=request.getContextPath()%>/cc-config.js"></script>
 </head>
 
 <body>
Index: reporting/jsp/webcontent/controlpanel.jsp
===================================================================
--- reporting/jsp/webcontent/controlpanel.jsp	(revision 2713)
+++ reporting/jsp/webcontent/controlpanel.jsp	(working copy)
@@ -35,12 +35,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ********************************************************************************--%>
 <%@ taglib uri="/WEB-INF/cruisecontrol-jsp11.tld" prefix="cruisecontrol"%>
-<%@page import="java.net.*,java.io.*"%>
+<%@page import="java.net.*,java.io.*,
+            net.sourceforge.cruisecontrol.util.URLProxyResolver"%>
 <cruisecontrol:jmxbase id="jmxBase"/>
 <%
-    URL jmx = new URL(jmxBase, "mbean?objectname=CruiseControl+Project%3Aname%3D" +
-            request.getPathInfo().substring(1));
+    String jmx;
+    if (URLProxyResolver.isProxied(request)) {
+        jmx = request.getContextPath() + "/jmx/mbean?objectname=CruiseControl+Project%3Aname%3D" +
+            request.getPathInfo().substring(1);
+    } else {
+        URL url = new URL(jmxBase, "mbean?objectname=CruiseControl+Project%3Aname%3D" +
+           request.getPathInfo().substring(1));
+        jmx = url.toExternalForm();
+    }
 %>
+
 <p>
 <table width="100%" align="center" cellpadding="0" cellspacing="0">
     <tr>
@@ -51,7 +60,7 @@
     <tr>
         <td align="center">
             <iframe name="controlPanelFrame" id="controlPanelFrame" height="520" marginheight="0" frameborder="1"
-                marginwidth="0" src="<%= jmx.toExternalForm() %>" height="600" width="90%">
+                marginwidth="0" src="<%=jmx%>" height="600" width="90%">
             </iframe>
         </td>
     </tr>
Index: reporting/jsp/webcontent/error.jsp
===================================================================
--- reporting/jsp/webcontent/error.jsp	(revision 2713)
+++ reporting/jsp/webcontent/error.jsp	(working copy)
@@ -39,11 +39,7 @@
             java.io.PrintWriter,
             javax.servlet.http.HttpUtils"%>
 <%
-    String baseURL = request.getScheme() + "://" + request.getServerName();
-    if (!request.getScheme().equals("http") || request.getServerPort() != 80) {
-        baseURL += ":" + request.getServerPort();
-    }
-    baseURL += request.getContextPath() + "/";
+    String baseURL = request.getContextPath() + "/";
     String message = exception.getMessage();
     if (message == null) {
         message = "(null)";
Index: reporting/jsp/webcontent/index.jsp
===================================================================
--- reporting/jsp/webcontent/index.jsp	(revision 2713)
+++ reporting/jsp/webcontent/index.jsp	(working copy)
@@ -50,8 +50,8 @@
 <%@ page import="java.util.Date" %>
 <%@ page import="java.util.Comparator" %>
 <%@ page import="java.util.Map" %>
+<%@ page import="net.sourceforge.cruisecontrol.util.URLProxyResolver" %>
 
-
 <%
   final DateFormat dateTimeFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, request.getLocale());
   final DateFormat dateOnlyFormat = DateFormat.getDateInstance(DateFormat.SHORT, request.getLocale());
@@ -127,12 +127,16 @@
   String name = System.getProperty("ccname", "");
   String hostname = InetAddress.getLocalHost().getHostName();
   boolean jmxEnabled = true;
-  URL jmxURLPrefix = new URL(jmxBase, "invoke?operation=build&objectname=CruiseControl+Project%3Aname%3D");
+  String jmx;
+  if (URLProxyResolver.isProxied(request)) {
+      jmx = request.getContextPath() + "/jmx/invoke?operation=build&objectname=CruiseControl+Project%3Aname%3D";
+  } else {
+      URL url = new URL(jmxBase, "invoke?operation=build&objectname=CruiseControl+Project%3Aname%3D");
+      jmx = url.toExternalForm();
+  }
 
   final String statusFileName = application.getInitParameter("currentBuildStatusFile");
 
-  String baseURL = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
-                   + request.getContextPath() + "/";
   String thisURL = request.getRequestURI();
 
   String sort = request.getParameter("sort");
@@ -315,9 +319,8 @@
 <head>
   <title><%= name%> CruiseControl at <%= hostname %></title>
 
-  <base href="<%=baseURL%>"/>
-  <link type="application/rss+xml" rel="alternate" href="rss" title="RSS"/>
-  <link type="text/css" rel="stylesheet" href="css/cruisecontrol.css"/>
+  <link type="application/rss+xml" rel="alternate" href="<%=request.getContextPath()%>/rss" title="RSS"/>
+  <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/cruisecontrol.css"/>
   <META HTTP-EQUIV="Refresh" CONTENT="10" URL="<%=thisURL%>?sort=<%=sort%>">
 
   <style type="text/css">
@@ -418,8 +421,8 @@
 </head>
 
 
-<body background="images/bluebg.gif" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0"
-      onload="checkIframe('<%=baseURL + "css/cruisecontrol.css"%>')">
+<body background="<%=request.getContextPath()%>/images/bluebg.gif" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0"
+      onload="checkIframe('<%=request.getContextPath() + "/css/cruisecontrol.css"%>')">
 <p>&nbsp;</p>
 
 <h1 class="white" align="center"><%= name%> CruiseControl at <%= hostname %>
@@ -433,8 +436,8 @@
 
       <tr><td colspan="2">&nbsp;</td></tr>
       <tr>
-        <td class="header-row"><img border="0" src="images/bluestripestop.gif"/></td>
-        <td class="header-row" align="right"><img border="0" src="images/bluestripestopright.gif"/></td>
+        <td class="header-row"><img border="0" src="<%=request.getContextPath()%>/images/bluestripestop.gif"/></td>
+        <td class="header-row" align="right"><img border="0" src="<%=request.getContextPath()%>/images/bluestripestopright.gif"/></td>
       </tr>
 
 
@@ -494,7 +497,7 @@
               for (int i = 0; i < info.length; i++) {
             %>
             <tr class="<%= (i % 2 == 1) ? "even-row" : "odd-row" %> ">
-              <td class="data"><a href="buildresults/<%=info[i].project%>"><%=info[i].project%></a></td>
+              <td class="data"><a href="<%=request.getContextPath()%>/buildresults/<%=info[i].project%>"><%=info[i].project%></a></td>
               <td class="data date status-<%= info[i].getStatus().getImportance() %>"><%= info[i].getStatus()%> <em>(<%= info[i].getStatusSince() %>)</em></td>
               <td class="data date failure"><%= (info[i].failed()) ? info[i].getLastBuildTime() : "" %></td>
               <td class="data date"><%= info[i].getLastSuccessfulBuildTime() %></td>
@@ -502,7 +505,7 @@
 
               <% if (jmxEnabled) { %>
               <td class="data"><input id="<%= "force_" + info[i].project %>" type="button"
-                                      onclick="callServer('<%= jmxURLPrefix.toExternalForm() + info[i].project %>', '<%=info[i].project%>')"
+                                      onclick="callServer('<%= jmx + info[i].project %>', '<%=info[i].project%>')"
                                       value="Build"/></td>
               <% } %>
             </tr>
@@ -518,15 +521,15 @@
 
       </td></tr>
       <tr>
-        <td bgcolor="#FFFFFF"><img border="0" src="images/bluestripesbottom.gif"/></td>
-        <td align="right" bgcolor="#FFFFFF"><img border="0" src="images/bluestripesbottomright.gif"/></td>
+        <td bgcolor="#FFFFFF"><img border="0" src="<%=request.getContextPath()%>/images/bluestripesbottom.gif"/></td>
+        <td align="right" bgcolor="#FFFFFF"><img border="0" src="<%=request.getContextPath()%>/images/bluestripesbottomright.gif"/></td>
       </tr>
       <tr><td colspan="2">&nbsp;</td></tr>
 
     </tbody>
     <tfoot>
         <tr>
-            <td colspan="2" align="right"><a href="rss"><img border="0" src="images/rss.png"/></a></td>
+            <td colspan="2" align="right"><a href="<%=request.getContextPath()%>/rss"><img border="0" src="<%=request.getContextPath()%>/images/rss.png"/></a></td>
         </tr>
     </tfoot>
   </table>
Index: reporting/jsp/webcontent/main.jsp
===================================================================
--- reporting/jsp/webcontent/main.jsp	(revision 2713)
+++ reporting/jsp/webcontent/main.jsp	(working copy)
@@ -43,15 +43,16 @@
 
     String ccname = System.getProperty("ccname", "");
     String project = request.getPathInfo().substring(1);
+    
+    String baseURL = request.getContextPath() + "/";
 %>
 <html>
 <head>
   <title><%= ccname%> CruiseControl Build Results</title>
-  <base href="<%=request.getScheme()%>://<%=request.getServerName()%>:<%=request.getServerPort()%><%=request.getContextPath()%>/" />
-  <link type="text/css" rel="stylesheet" href="css/cruisecontrol.css"/>
+  <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/css/cruisecontrol.css"/>
   <link type="application/rss+xml" rel="alternate" href="<%= request.getContextPath() %>/rss/<%= project %>" title="RSS"/>
 </head>
-<body background="images/bluebg.gif" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
+<body background="<%=request.getContextPath()%>/images/bluebg.gif" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
   <table border="0" align="center" cellpadding="0" cellspacing="0" width="98%">
     <tr>
       <td valign="top">
@@ -72,7 +73,7 @@
               </cruisecontrol:tab>
 
               <cruisecontrol:loglink id="logs_url"/>
-              <cruisecontrol:tab name="log" url="<%=logs_url%>" label="XML Log File" />
+              <cruisecontrol:tab name="log" url="<%= request.getContextPath() + "/" + logs_url%>" label="XML Log File" />
 
               <cruisecontrol:tab name="metrics" label="Metrics" >
                 <%@ include file="metrics.jsp" %>
@@ -80,7 +81,7 @@
 
               <% if (rmiEnabled) { %>
               <cruisecontrol:tab name="config" label="Config">
-                <iframe src="config.jspa?project=<%= project %>" width="90%"
+                <iframe src="<%=request.getContextPath()%> + /config.jspa?project=<%= project %>" width="90%"
                     height="600" frameborder="0"></iframe>
               </cruisecontrol:tab>
               <% } %>
Index: reporting/jsp/webcontent/metrics.jsp
===================================================================
--- reporting/jsp/webcontent/metrics.jsp	(revision 2713)
+++ reporting/jsp/webcontent/metrics.jsp	(working copy)
@@ -19,7 +19,7 @@
         </cewolf:producer>
     </cewolf:data>
 </cewolf:chart>
-<cewolf:img chartid="pie" renderer="cewolf" width="400" height="300"/>
+<cewolf:img chartid="pie" renderer="/cewolf" width="400" height="300"/>
 
 <hr />
 <jsp:useBean id="chartData" class="net.sourceforge.cruisecontrol.chart.TimeChartData" />
@@ -31,7 +31,7 @@
     </cewolf:data>
     <cewolf:chartpostprocessor id="chartData" />
 </cewolf:chart>
-<cewolf:img chartid="chart" renderer="cewolf" width="400" height="300"/>
+<cewolf:img chartid="chart" renderer="/cewolf" width="400" height="300"/>
 
 <hr />
 <jsp:useBean id="xpathData" class="net.sourceforge.cruisecontrol.chart.XPathChartData" />
@@ -48,4 +48,4 @@
     </cewolf:data>
     <cewolf:chartpostprocessor id="xpathData" />
 </cewolf:chart>
-<cewolf:img chartid="chart" renderer="cewolf" width="400" height="300"/>
+<cewolf:img chartid="chart" renderer="/cewolf" width="400" height="300"/>
Index: reporting/jsp/webcontent/navigation.jsp
===================================================================
--- reporting/jsp/webcontent/navigation.jsp	(revision 2713)
+++ reporting/jsp/webcontent/navigation.jsp	(working copy)
@@ -36,13 +36,13 @@
  ********************************************************************************--%>
 <%@page import="java.io.File, java.util.Arrays"%>
 <%@ taglib uri="/WEB-INF/cruisecontrol-jsp11.tld" prefix="cruisecontrol"%>
-        <img src="images/blank8.gif" border="0"/><br/>
-        <a href="http://cruisecontrol.sourceforge.net" border="0"><img src="images/logo.gif" border="0"/></a><p>
+        <img src="<%=request.getContextPath()%>/images/blank8.gif" border="0"/><br/>
+        <a href="http://cruisecontrol.sourceforge.net" border="0"><img src="<%=request.getContextPath()%>/images/logo.gif" border="0"/></a><p>
         <table border="0" align="center" width="98%">
 <%
     String singleProjectMode = application.getInitParameter("singleProject");
     if (Boolean.valueOf(singleProjectMode).booleanValue() == false) {  %>
-            <tr><td><a class="link" href="index">Project</a></td></tr>
+            <tr><td><a class="link" href="<%=request.getContextPath()%>/index">Project</a></td></tr>
             <tr><td>
               <form action="index" >
                 <select name="projecttarget" onchange="self.location.href = this.form.projecttarget.options[this.form.projecttarget.selectedIndex].value">
@@ -60,13 +60,13 @@
             <tr><td>&nbsp;</td></tr>
 
             <cruisecontrol:link id="baseUrl" />
-            <tr><td><a class="link" href="<%=baseUrl%>">Latest Build</a></td></tr>
+            <tr><td><a class="link" href="<%=request.getContextPath()%>/buildresults/<%=request.getPathInfo().substring(1)%>">Latest Build</a></td></tr>
             <cruisecontrol:nav startingBuildNumber="0" finalBuildNumber="9" >
               <tr><td><a class="link" href="<%= url %>"><%= linktext %></a></td></tr>
             </cruisecontrol:nav>
             <cruisecontrol:navCount startingBuildNumber="10">
               <tr><td>
-                <form method="GET" action="<%=baseUrl%>" >
+                <form method="GET" action="<%=request.getContextPath()%>" >
                   <select name="log" onchange="form.submit()">
                     <option>More builds</option>
                     <cruisecontrol:nav startingBuildNumber="10">
@@ -78,5 +78,5 @@
             </cruisecontrol:navCount>
             <tr><td>&nbsp;</td></tr>
 
-            <tr><td><a href="rss/<%= request.getPathInfo().substring(1) %>"><img border="0" src="images/rss.png"/></a></td></tr>
+            <tr><td><a href="<%=request.getContextPath()%>/rss/<%= request.getPathInfo().substring(1) %>"><img border="0" src="<%=request.getContextPath()%>/images/rss.png"/></a></td></tr>
         </table>
Index: reporting/jsp/webcontent/rss.jsp
===================================================================
--- reporting/jsp/webcontent/rss.jsp	(revision 2713)
+++ reporting/jsp/webcontent/rss.jsp	(working copy)
@@ -5,7 +5,8 @@
             java.util.Arrays,
             java.util.Date,
             java.util.Locale,
-            net.sourceforge.cruisecontrol.BuildInfo" %>
+            net.sourceforge.cruisecontrol.BuildInfo,
+            net.sourceforge.cruisecontrol.util.URLProxyResolver" %>
 <%--********************************************************************************
  * CruiseControl, a Continuous Integration Toolkit
  * This file copyright (c) 2004, Mark Doliner.
@@ -56,6 +57,17 @@
     // The publication date is in RFC 822 format which is in english
     // see http://blogs.law.harvard.edu/tech/rss
     SimpleDateFormat rfc822Format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.ENGLISH);
+    
+    // We need canonical urls for a feed (http://host:port/contextpath/...)
+    // But it will fail when acces with a proxy
+    // Since there are no standard way to get proxy hostname/port we need to use special headers
+    // This part only works for Apache proxy
+    if (URLProxyResolver.isProxied(request)) {
+        URLProxyResolver resolver = new URLProxyResolver(request);
+        request = resolver.getRequest();
+    }
+    // getRemoteHost return proxy host or ccontrol host if no proxy is use
+    String baseURL = request.getScheme() + "://" + request.getRemoteHost() + request.getContextPath();
 %>
 
 <rss version="2.0">
@@ -66,7 +78,7 @@
     {
 %>
 <title>CruiseControl Results - <%= project %></title>
-<link><%= request.getScheme() %>://<%= request.getServerName() %>:<%= request.getServerPort() %><%= request.getContextPath() %>/buildresults/<%= project %></link>
+<link><%= baseURL %>/buildresults/<%= project %></link>
 <description>Summary of the 10 most recent builds for this project.</description>
 <language>en-us</language>
 
@@ -86,7 +98,7 @@
 	<description>Build FAILED!</description>
 <% } %>
 <pubDate><%= rfc822Format.format(date) %></pubDate>
-<link><%= request.getScheme() %>://<%= request.getServerName() %>:<%= request.getServerPort() %><%= request.getContextPath() %>/buildresults/<%= project %>?log=<%= logfile %></link>
+<link><%= baseURL %>/buildresults/<%= project %>?log=<%= logfile %></link>
 </item>
 </cruisecontrol:nav>
 <%
@@ -96,7 +108,7 @@
         java.io.File logDir = new java.io.File(logDirPath);
 %>
 <title>CruiseControl Results</title>
-<link><%= request.getScheme() %>://<%= request.getServerName() %>:<%= request.getServerPort() %><%= request.getContextPath() %></link>
+<link><%= baseURL %></link>
 <description>Summary of the project build results.</description>
 <language>en-us</language>
 <%
@@ -121,7 +133,7 @@
 <title><%= project %> <%= result %> <%= date %></title>
 <description>Build <%= result %></description>
 <pubDate><%= date %></pubDate>
-<link><%= request.getScheme() %>://<%= request.getServerName() %>:<%= request.getServerPort() %><%= request.getContextPath() %>/buildresults/<%= project %></link>
+<link><%= baseURL %>/buildresults/<%= project %></link>
 </item>
 <%
 }