Skip to content

Commit

Permalink
LPS-27046
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikakoivisto @brianchandotcom
mikakoivisto authored and brianchandotcom committed May 3, 2012
1 parent c76e7cc commit d01cb14
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
8 changes: 7 additions & 1 deletion portal-impl/src/com/liferay/portlet/PortletRequestDispatcherImpl.java
View file
Expand Up @@ -281,7 +281,13 @@ protected void dispatch(
pathInfo = pathNoQueryString;
}

requestURI = portletRequest.getContextPath() + pathNoQueryString;
if (portletRequest.getContextPath().equals(StringPool.SLASH)) {
requestURI = pathNoQueryString;
}
else {
requestURI =
portletRequest.getContextPath() + pathNoQueryString;
}
}

PortletServletRequest portletServletRequest = new PortletServletRequest(
Expand Down
28 changes: 28 additions & 0 deletions portal-web/docroot/WEB-INF/liferay-web.xml
View file
Expand Up @@ -1095,57 +1095,85 @@
<filter-mapping>
<filter-name>Atom Servlet Filter</filter-name>
<url-pattern>/api/atom/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Axis Servlet Filter</filter-name>
<url-pattern>/api/axis/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>JSON Servlet Filter</filter-name>
<url-pattern>/api/json/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>JSON Web Service Servlet Filter</filter-name>
<url-pattern>/api/jsonws/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Remoting Servlet Filter</filter-name>
<url-pattern>/api/spring/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Tunnel Servlet Filter</filter-name>
<url-pattern>/api/liferay/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>WebDAV Servlet Filter</filter-name>
<url-pattern>/api/webdav/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure Atom Servlet Filter</filter-name>
<url-pattern>/api/secure/atom/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure Axis Servlet Filter</filter-name>
<url-pattern>/api/secure/axis/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure JSON Servlet Filter</filter-name>
<url-pattern>/api/secure/json/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure JSON Web Service Servlet Filter</filter-name>
<url-pattern>/api/secure/jsonws/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure Remoting Servlet Filter</filter-name>
<url-pattern>/api/secure/spring/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure Tunnel Servlet Filter</filter-name>
<url-pattern>/api/secure/liferay/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter-mapping>
<filter-name>Secure WebDAV Servlet Filter</filter-name>
<url-pattern>/api/secure/webdav/*</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
</web-app>

0 comments on commit d01cb14

Please sign in to comment.