From 2cdd3d65c696599c3798d738179448681ee2bf9d Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 7 Feb 2010 20:18:26 +0000
Subject: [PATCH] Restore the JSP mappings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907469 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/Context.java       | 13 +++++++++++++
 java/org/apache/catalina/deploy/WebXml.java | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
index f7dba3ee0..d2c3ce4e3 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -681,6 +681,19 @@ public interface Context extends Container {
 
 
     /**
+     * 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.
      * 
diff --git a/java/org/apache/catalina/deploy/WebXml.java b/java/org/apache/catalina/deploy/WebXml.java
index 7eb896559..8246ad31b 100644
--- a/java/org/apache/catalina/deploy/WebXml.java
+++ b/java/org/apache/catalina/deploy/WebXml.java
@@ -1300,7 +1300,20 @@ public class WebXml {
         }
 
         // 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);
+            }
+        }
     }
     
     /**
-- 
2.11.0