- Pass the ignore annotation flag to Jasper.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@405436 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 30f74d9..65fed71 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4235,6 +4235,14 @@ public class StandardContext
         // Binding thread\r
         oldCCL = bindThread();\r
 \r
+        // Set annotation processing parameter for Jasper (unfortunately, since\r
+        // this can be configured in many places and not just in /WEB-INF/web.xml,\r
+        // there are not many solutions)\r
+        if (ignoreAnnotations) {\r
+            Wrapper jspServlet = (Wrapper) findChild(Constants.JSP_SERVLET_NAME);\r
+            jspServlet.addInitParameter("org.apache.jasper.IGNORE_ANNOTATIONS", "true");\r
+        }\r
+        \r
         try {\r
             \r
             // Create context attributes that will be required\r