diff options
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 10 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index c394e8ae6a..3eb0bba7c4 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -2225,12 +2225,18 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements /** * Returns the path info; note that this _can_ be different than - * request.getPathInfo() (e.g application runner). + * request.getPathInfo(). Examples where this might be useful: + * <ul> + * <li>An application runner servlet that runs different Vaadin applications + * based on an identifier.</li> + * <li>Providing a REST interface in the context root, while serving a + * Vaadin UI on a sub-URI using only one servlet (e.g. REST on + * http://example.com/foo, UI on http://example.com/foo/vaadin)</li> * * @param request * @return */ - String getRequestPathInfo(HttpServletRequest request) { + protected String getRequestPathInfo(HttpServletRequest request) { return request.getPathInfo(); } diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java index 10f0b94dda..ffc5d8cfc7 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java @@ -193,7 +193,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { } @Override - String getRequestPathInfo(HttpServletRequest request) { + protected String getRequestPathInfo(HttpServletRequest request) { String path = request.getPathInfo(); if (path == null) { return null; |