craigmcc 2003/09/20 17:41:56 Modified: contrib/struts-faces/src/java/org/apache/struts/faces/renderer BaseRenderer.java Log: Revert the previous change. Unfortunately, it would create an incompatibility with <html:base> that would make conversions of existing Struts-based apps harder. Revision Changes Path 1.5 +11 -1 jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/renderer/BaseRenderer.java Index: BaseRenderer.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/renderer/BaseRenderer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BaseRenderer.java 20 Sep 2003 23:34:35 -0000 1.4 +++ BaseRenderer.java 21 Sep 2003 00:41:56 -0000 1.5 @@ -134,7 +134,17 @@ } if (request.getContextPath() != null) { writer.write(request.getContextPath()); - writer.write("/"); + } + String servletPath = request.getServletPath(); + if (servletPath != null) { + if (servletPath.startsWith("/faces")) { + writer.write(servletPath.substring(6)); + } else { + writer.write(servletPath); + } + } + if (request.getPathInfo() != null) { + writer.write(request.getPathInfo()); } writer.write("\""); String target = (String) component.getAttribute("target");
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]