Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-7' into jetty-8

This commit is contained in:
Jan Bartel 2013-02-26 12:41:54 +11:00
parent 283cd58147 0e9f74ad29
commit 1627b6eaf7
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/JspPropertyGroupServlet.java
View File

@ -25,8 +25,8 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import org.eclipse.jetty.server.AbstractHttpConnection;
import org.eclipse.jetty.server.Dispatcher; import org.eclipse.jetty.server.Dispatcher;
import org.eclipse.jetty.server.AbstractHttpConnection;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
@ -62,10 +62,26 @@ public class JspPropertyGroupServlet extends GenericServlet
public void init() throws ServletException public void init() throws ServletException
{ {
String jsp_name = "jsp"; String jsp_name = "jsp";
ServletMapping servlet_mapping=_servletHandler.getServletMapping("*.jsp"); ServletMapping servlet_mapping =_servletHandler.getServletMapping("*.jsp");
if (servlet_mapping!=null) if (servlet_mapping!=null)
{ {
_starJspMapped=true; _starJspMapped=true;
//now find the jsp servlet, ignoring the mapping that is for ourself
ServletMapping[] mappings = _servletHandler.getServletMappings();
for (ServletMapping m:mappings)
{
String[] paths = m.getPathSpecs();
if (paths!=null)
{
for (String path:paths)
{
if ("*.jsp".equals(path) && !NAME.equals(m.getServletName()))
servlet_mapping = m;
}
}
}
jsp_name=servlet_mapping.getServletName(); jsp_name=servlet_mapping.getServletName();
} }
_jspServlet=_servletHandler.getServlet(jsp_name); _jspServlet=_servletHandler.getServlet(jsp_name);
@ -103,11 +119,16 @@ public class JspPropertyGroupServlet extends GenericServlet
String pathInContext=URIUtil.addPaths(servletPath,pathInfo); String pathInContext=URIUtil.addPaths(servletPath,pathInfo);
if (pathInContext.endsWith("/")) if (pathInContext.endsWith("/"))
{
_dftServlet.getServlet().service(req,res); _dftServlet.getServlet().service(req,res);
}
else if (_starJspMapped && pathInContext.toLowerCase().endsWith(".jsp")) else if (_starJspMapped && pathInContext.toLowerCase().endsWith(".jsp"))
{
_jspServlet.getServlet().service(req,res); _jspServlet.getServlet().service(req,res);
}
else else
{ {
Resource resource = _contextHandler.getResource(pathInContext); Resource resource = _contextHandler.getResource(pathInContext);
if (resource!=null && resource.isDirectory()) if (resource!=null && resource.isDirectory())
_dftServlet.getServlet().service(req,res); _dftServlet.getServlet().service(req,res);