geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r529002 - /geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Sun, 15 Apr 2007 16:34:36 GMT
Author: djencks
Date: Sun Apr 15 09:34:34 2007
New Revision: 529002

URL: http://svn.apache.org/viewvc?view=rev&rev=529002
Log:
GERONIMO-3081 somehow tomcat builder got left out of previous commit

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=529002&r1=529001&r2=529002
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Sun Apr 15 09:34:34 2007
@@ -59,6 +59,7 @@
 import org.apache.geronimo.j2ee.deployment.WebModule;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
+import org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationHelper;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.Naming;
@@ -442,6 +443,11 @@
                 }
 
                 webModuleData.setAttribute("securityHolder", securityHolder);
+            }
+
+            if (servletTypes.length > 0) {
+                // Process security annotations for servlets only (before MBEs run)
+                SecurityAnnotationHelper.processAnnotations(webModule.getAnnotatedApp(),
webModule.getClassFinder());
             }
 
             //listeners added directly to the StandardContext will get loaded by the tomcat
classloader, not the app classloader!



Mime
View raw message