Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-08-23 07:17:34 +0000
committerGreg Wilkins2013-08-23 07:17:34 +0000
commitd2ff4758345035299a3c39fa49aa99a4c0315e78 (patch)
tree8f99cf9e951d50a69d50cf8c623dced476490f8a /examples
parentc4583918a3febd3df66632545fce9fb0849be65d (diff)
parentb33b5f2f5d1d7d69b8fb3c3b0ef85c9fd94036a8 (diff)
downloadorg.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.tar.gz
org.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.tar.xz
org.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
Diffstat (limited to 'examples')
-rw-r--r--examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
index f7cc9e5517..99f83da366 100644
--- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java
@@ -43,6 +43,11 @@ public class DumpServlet extends HttpServlet
response.getWriter().println("servletPath=" + request.getServletPath());
response.getWriter().println("pathInfo=" + request.getPathInfo());
response.getWriter().println("session=" + request.getSession(true).getId());
+
+ String r=request.getParameter("resource");
+ if (r!=null)
+ response.getWriter().println("resource("+r+")=" + getServletContext().getResource(r));
+
response.getWriter().println("</pre>");
}
}

Back to the top