Author: markt
Date: Sun Feb 7 20:18:26 2010
New Revision: 907469
URL: http://svn.apache.org/viewvc?rev=907469&view=rev
Log:
Restore the JSP mappings
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=907469&r1=907468&r2=907469&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Sun Feb 7 20:18:26 2010
@@ -681,6 +681,19 @@
/**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
+ * @param pattern URL pattern to be mapped
+ * @param name Name of the corresponding servlet to execute
+ * @param jspWildCard true if name identifies the JspServlet
+ * and pattern contains a wildcard; false otherwise
+ */
+ public void addServletMapping(String pattern, String name,
+ boolean jspWildcard);
+
+
+ /**
* Add a resource which will be watched for reloading by the host auto
* deployer. Note: this will not be used in embedded mode.
*
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=907469&r1=907468&r2=907469&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Feb 7
20:18:26 2010
@@ -1300,7 +1300,20 @@
}
// Do this last as it depends on servlets
- // TODO
+ for (JspPropertyGroup jspPropertyGroup : jspPropertyGroups) {
+ String jspServletName = context.findServletMapping("*.jsp");
+ if (jspServletName == null) {
+ jspServletName = "jsp";
+ }
+ if (context.findChild(jspServletName) != null) {
+ context.addServletMapping(jspPropertyGroup.getUrlPattern(),
+ jspServletName, true);
+ } else {
+ if(log.isDebugEnabled())
+ log.debug("Skiping " + jspPropertyGroup.getUrlPattern() +
+ " , no servlet " + jspServletName);
+ }
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
