Author: markt
Date: Sun Sep 16 19:16:21 2012
New Revision: 1385351
URL: http://svn.apache.org/viewvc?rev=1385351&view=rev
Log:
Sync with trunk
Modified:
tomcat/sandbox/trunk-resources/ (props changed)
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/Tomcat.java
Propchange: tomcat/sandbox/trunk-resources/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1385195-1385350
Modified:
tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/Tomcat.java?rev=1385351&r1=1385350&r2=1385351&view=diff
==============================================================================
--- tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/Tomcat.java
(original)
+++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/startup/Tomcat.java
Sun Sep 16 19:16:21 2012
@@ -716,12 +716,14 @@ public class Tomcat {
Wrapper servlet = addServlet(
ctx, "default", "org.apache.catalina.servlets.DefaultServlet");
servlet.setLoadOnStartup(1);
+ servlet.setOverridable(true);
// JSP servlet (by class name - to avoid loading all deps)
servlet = addServlet(
ctx, "jsp", "org.apache.jasper.servlet.JspServlet");
servlet.addInitParameter("fork", "false");
servlet.setLoadOnStartup(3);
+ servlet.setOverridable(true);
// Servlet mappings
ctx.addServletMapping("/", "default");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
