Author: charles.crouch(a)jboss.com Date: 2008-11-10 12:12:28 -0500 (Mon, 10 Nov 2008) New Revision: 38 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java Log: EMBJOPR-15 and EMBJOPR-20 refactored how we generate the base url for the app Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-11-07 23:57:19 UTC (rev 37) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-11-10 17:12:28 UTC (rev 38) @@ -113,14 +113,9 @@ FacesContext context = FacesContext.getCurrentInstance(); HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest(); - // Build the base URL - url.append(request.getProtocol().startsWith("HTTPS") ? "https://" : "http://"); - url.append(request.getServerName()); - url.append(request.getServerPort() == 80 ? null : ":" + request.getServerPort()); - url.append(request.getContextPath()); - url.append("/"); - - baseUrl = url.toString(); + int indexAfterContextRoot = request.getRequestURL().indexOf(request.getServletPath()); + baseUrl = request.getRequestURL().substring(0, indexAfterContextRoot) + "/"; + log.debug("Base URL: " + url); }