craigmcc 2003/09/20 16:34:35
Modified: contrib/struts-faces/src/conf faces-config.xml
contrib/struts-faces/src/java/org/apache/struts/faces/renderer
BaseRenderer.java
Log:
Modify the rendered base URL to end with the "/" after the context path.
This means that all relative URLs will be resolved against the document
root directory for the web application.
Submitted by: Srikanth Shenoy <srikanth at srikanth.org>
Nithin Mallya <nithin at mallya.org>
Revision Changes Path
1.2 +0 -4 jakarta-struts/contrib/struts-faces/src/conf/faces-config.xml
Index: faces-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/src/conf/faces-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- faces-config.xml 4 Jun 2003 17:38:13 -0000 1.1
+++ faces-config.xml 20 Sep 2003 23:34:35 -0000 1.2
@@ -1,9 +1,5 @@
<?xml version="1.0"?>
-<!--
- Copyright 2003 Sun Microsystems, Inc. All rights reserved.
- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
--->
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
1.4 +5 -15
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseRenderer.java 27 Jul 2003 06:43:16 -0000 1.3
+++ BaseRenderer.java 20 Sep 2003 23:34:35 -0000 1.4
@@ -134,17 +134,7 @@
}
if (request.getContextPath() != null) {
writer.write(request.getContextPath());
- }
- 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("/");
}
writer.write("\"");
String target = (String) component.getAttribute("target");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
