From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 May 2006 14:02:01 +0000 (+0000)
Subject: - Pass the ignore annotation flag to Jasper.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=50df9e15c75668e5cb4944b8c91566a8c233d2a2;p=tomcat7.0

- 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 30f74d924..65fed7144 100644
--- 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
         oldCCL = bindThread();
 
+        // Set annotation processing parameter for Jasper (unfortunately, since
+        // this can be configured in many places and not just in /WEB-INF/web.xml,
+        // there are not many solutions)
+        if (ignoreAnnotations) {
+            Wrapper jspServlet = (Wrapper) findChild(Constants.JSP_SERVLET_NAME);
+            jspServlet.addInitParameter("org.apache.jasper.IGNORE_ANNOTATIONS", "true");
+        }
+        
         try {
             
             // Create context attributes that will be required