diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java index 85ab42083c1..c4d327465a6 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java @@ -271,11 +271,11 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor } } - // TODO is this too soon? /* Set the webapp's classpath for Jasper */ context.setAttribute("org.apache.catalina.jsp_classpath", context.getClassPath()); + /* Set the system classpath for Jasper */ - holder.setInitParameter("com.sun.appserv.jsp.classpath", getSystemClassPath(context)); + holder.setInitParameter("com.sun.appserv.jsp.classpath", getSystemClassPath(context)); } //Set the servlet-class @@ -321,6 +321,8 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor { holder.setForcedPath(jsp_file); holder.setClassName(jspServletClass); + //set the system classpath explicitly for the holder that will represent the JspServlet instance + holder.setInitParameter("com.sun.appserv.jsp.classpath", getSystemClassPath(context)); } // handle load-on-startup diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 7cacb8acec7..693f6648ef3 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -95,12 +95,11 @@ - -