Update of
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
In directory
james.mmbase.org:/tmp/cvs-serv13698/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
Modified Files:
PortalErrorServlet.java
Added Files:
InternalDispatchNavigationRequest.java
Log Message:
CMSC-942 Several issues with the Alias module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl
See also: http://www.mmbase.org/jira/browse/CMSC-942
Index: PortalErrorServlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- PortalErrorServlet.java 2 Jun 2008 21:56:34 -0000 1.16
+++ PortalErrorServlet.java 26 Jun 2008 08:20:10 -0000 1.17
@@ -104,7 +104,7 @@
}
// The incoming request has a servletPath of /PortalError. The
mapped url to this servlet.
// Pretend it is the uri which has the error in it
- HttpServletRequest errorUriRequest = new
ErrorHttpServletRequest(request, errorUri);
+ HttpServletRequest errorUriRequest = new
InternalDispatchNavigationRequest(request, errorUri);
PortalEnvironment env = new PortalEnvironment(errorUriRequest,
response);
PortalURL currentURL = env.getRequestedPortalURL();
@@ -130,7 +130,7 @@
}
logError(request);
if (errorPageSite != null) {
- HttpServletRequest errorRequest = new
ErrorHttpServletRequest(request, errorPageSite.getUrlfragment(),
String.valueOf(statusCode));
+ HttpServletRequest errorRequest = new
InternalDispatchNavigationRequest(request, errorPageSite.getUrlfragment(),
String.valueOf(statusCode));
PortalEnvironment errorEnv = new
PortalEnvironment(errorRequest, response);
String errorPagePath = errorPageSite.getUrlfragment() +
PATH_SP + statusCode;
@@ -209,39 +209,4 @@
}
}
- class ErrorHttpServletRequest extends HttpServletRequestWrapper {
-
- private String errorPagePath;
- private String serverName;
-
-
- public ErrorHttpServletRequest(HttpServletRequest request, String
errorServletPath) {
- super(request);
- this.errorPagePath = errorServletPath;
- }
-
- public ErrorHttpServletRequest(HttpServletRequest request, String
errorSitePath, String errorServletPath) {
- super(request);
- if (ServerUtil.useServerName()) {
- serverName = errorSitePath;
- errorPagePath = errorServletPath;
- }
- else {
- this.errorPagePath = errorSitePath + PATH_SP + errorServletPath;
- }
- }
-
- @Override
- public String getServletPath() {
- return errorPagePath;
- }
-
- @Override
- public String getServerName() {
- if (serverName != null) {
- return serverName;
- }
- return super.getServerName();
- }
- }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
