geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r531383 - in /geronimo/server/trunk/modules: geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/ geronimo-jetty6-builder/src...
Date Mon, 23 Apr 2007 08:53:45 GMT
Author: djencks
Date: Mon Apr 23 01:53:44 2007
New Revision: 531383

URL: http://svn.apache.org/viewvc?view=rev&rev=531383
Log:
GERONIMO-3081 use webApp directly, not through AnnotatedApp interface

Modified:
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
Mon Apr 23 01:53:44 2007
@@ -28,9 +28,7 @@
 import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
 
 /**
  * Many of the classes generated from the JEE schemas have methods with identical signatures
(see
@@ -132,10 +130,4 @@
 
     PersistenceUnitRefType[] getPersistenceUnitRefArray();
     PersistenceUnitRefType addNewPersistenceUnitRef();
-
-    SecurityRoleType[] getSecurityRoleArray();
-    SecurityRoleType addNewSecurityRole();
-
-    ServletType[] getServletArray();
-    ServletType addNewServlet();
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
Mon Apr 23 01:53:44 2007
@@ -32,9 +32,7 @@
 import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
 
 /**
  * Wrapper class to encapsulate the ApplicationClientType class with an interface that the
various
@@ -197,22 +195,6 @@
 
     public PersistenceUnitRefType addNewPersistenceUnitRef() {
         return applicationClient.addNewPersistenceUnitRef();
-    }
-
-    public SecurityRoleType[] getSecurityRoleArray() {
-        return null;                                            // Not supported by app clients
-    }
-
-    public SecurityRoleType addNewSecurityRole() {
-        return null;                                            // Not supported by app clients
-    }
-
-    public ServletType[] getServletArray() {
-        return null;                                            // Not supported by app clients
-    }
-
-    public ServletType addNewServlet() {
-        return null;                                            // Not supported by app clients
     }
 
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
Mon Apr 23 01:53:44 2007
@@ -33,9 +33,7 @@
 import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
 import org.apache.geronimo.xbeans.javaee.SessionBeanType;
 import org.apache.xmlbeans.XmlObject;
 
@@ -169,22 +167,6 @@
         return delegate.addNewPersistenceUnitRef();
     }
 
-    public SecurityRoleType[] getSecurityRoleArray() {
-        return null;                                            // Not supported by EJB Jar
types
-    }
-
-    public SecurityRoleType addNewSecurityRole() {
-        return null;                                            // Not supported by EJB Jar
types
-    }
-
-    public ServletType[] getServletArray() {
-        return null;                                            // Not supported by EJB Jar
types
-    }
-
-    public ServletType addNewServlet() {
-        return null;                                            // Not supported by EJB Jar
types
-    }
-
     /**
      * ejbJar getter
      *
@@ -341,23 +323,6 @@
         public PersistenceUnitRefType addNewPersistenceUnitRef() {
             return bean.addNewPersistenceUnitRef();
         }
-
-
-        public SecurityRoleType[] getSecurityRoleArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public SecurityRoleType addNewSecurityRole() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType[] getServletArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType addNewServlet() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
     }
 
     public static class MessageDriveBean implements AnnotatedApp {
@@ -486,23 +451,6 @@
         public PersistenceUnitRefType addNewPersistenceUnitRef() {
             return bean.addNewPersistenceUnitRef();
         }
-
-
-        public SecurityRoleType[] getSecurityRoleArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public SecurityRoleType addNewSecurityRole() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType[] getServletArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType addNewServlet() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
     }
 
     public static class SessionBean implements AnnotatedApp {
@@ -630,23 +578,6 @@
 
         public PersistenceUnitRefType addNewPersistenceUnitRef() {
             return bean.addNewPersistenceUnitRef();
-        }
-
-
-        public SecurityRoleType[] getSecurityRoleArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public SecurityRoleType addNewSecurityRole() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType[] getServletArray() {
-            return null;                                            // Not supported by EJB
Jar types
-        }
-
-        public ServletType addNewServlet() {
-            return null;                                            // Not supported by EJB
Jar types
         }
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
Mon Apr 23 01:53:44 2007
@@ -31,9 +31,7 @@
 import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
 import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
 import org.apache.geronimo.xbeans.javaee.WebAppType;
 
 /**
@@ -199,21 +197,4 @@
     public PersistenceUnitRefType addNewPersistenceUnitRef() {
         return webApp.addNewPersistenceUnitRef();
     }
-
-    public SecurityRoleType[] getSecurityRoleArray() {
-        return webApp.getSecurityRoleArray();
-    }
-
-    public SecurityRoleType addNewSecurityRole() {
-        return webApp.addNewSecurityRole();
-    }
-
-    public ServletType[] getServletArray() {
-        return webApp.getServletArray();
-    }
-
-    public ServletType addNewServlet() {
-        return webApp.addNewServlet();
-    }
-
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
Mon Apr 23 01:53:44 2007
@@ -32,6 +32,7 @@
 import org.apache.geronimo.xbeans.javaee.ServletType;
 import org.apache.geronimo.xbeans.javaee.ServletNameType;
 import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee.WebAppType;
 import org.apache.xbean.finder.ClassFinder;
 
 
@@ -69,17 +70,17 @@
     /**
      * Update the deployment descriptor from the DeclareRoles and RunAs annotations
      *
-     * @param annotatedApp Access to the spec dd
+     * @param webApp Access to the spec dd
      * @param classFinder  Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder)
throws DeploymentException {
-        if (annotatedApp != null) {
+    public static void processAnnotations(WebAppType webApp, ClassFinder classFinder) throws
DeploymentException {
+        if (webApp != null) {
             if (classFinder.isAnnotationPresent(DeclareRoles.class)) {
-                processDeclareRoles(annotatedApp, classFinder);
+                processDeclareRoles(webApp, classFinder);
             }
             if (classFinder.isAnnotationPresent(RunAs.class)) {
-                processRunAs(annotatedApp, classFinder);
+                processRunAs(webApp, classFinder);
             }
         }
     }
@@ -88,12 +89,12 @@
     /**
      * Process @DeclareRole annotations (for servlets only)
      *
-     * @param annotatedApp Access to the spec dd
+     * @param webApp Access to the spec dd
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processDeclareRoles(AnnotatedApp annotatedApp, ClassFinder classFinder)
throws DeploymentException {
-        log.debug("processDeclareRoles(): Entry: AnnotatedApp: " + annotatedApp.toString());
+    private static void processDeclareRoles(WebAppType webApp, ClassFinder classFinder) throws
DeploymentException {
+        log.debug("processDeclareRoles(): Entry: webApp: " + webApp.toString());
 
         List<Class> classesWithDeclareRoles = classFinder.findAnnotatedClasses(DeclareRoles.class);
 
@@ -101,26 +102,26 @@
         for (Class cls : classesWithDeclareRoles) {
             DeclareRoles declareRoles = (DeclareRoles) cls.getAnnotation(DeclareRoles.class);
             if (declareRoles != null && Servlet.class.isAssignableFrom(cls)) {
-                addDeclareRoles(annotatedApp, declareRoles, cls);
+                addDeclareRoles(webApp, declareRoles, cls);
             }
         }
 
         // Validate deployment descriptor to ensure it's still okay
-        validateDD(annotatedApp);
+        validateDD(new AnnotatedWebApp(webApp));
 
-        log.debug("processDeclareRoles(): Exit: AnnotatedApp: " + annotatedApp.toString());
+        log.debug("processDeclareRoles(): Exit: webApp: " + webApp.toString());
     }
 
 
     /**
      * Process @RunAs annotations (for servlets only)
      *
-     * @param annotatedApp Access to the spec dd
+     * @param webApp Access to the spec dd
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processRunAs(AnnotatedApp annotatedApp, ClassFinder classFinder)
throws DeploymentException {
-        log.debug("processRunAs(): Entry: AnnotatedApp: " + annotatedApp.toString());
+    private static void processRunAs(WebAppType webApp, ClassFinder classFinder) throws DeploymentException
{
+        log.debug("processRunAs(): Entry: webApp: " + webApp.toString());
 
         List<Class> classesWithRunAs = classFinder.findAnnotatedClasses(RunAs.class);
 
@@ -128,14 +129,14 @@
         for (Class cls : classesWithRunAs) {
             RunAs runAs = (RunAs) cls.getAnnotation(RunAs.class);
             if (runAs != null && Servlet.class.isAssignableFrom(cls)) {
-                addRunAs(annotatedApp, runAs, cls);
+                addRunAs(webApp, runAs, cls);
             }
         }
 
         // Validate deployment descriptor to ensure it's still okay
-        validateDD(annotatedApp);
+        validateDD(new AnnotatedWebApp(webApp));
 
-        log.debug("processRunAs(): Exit: AnnotatedApp: " + annotatedApp.toString());
+        log.debug("processRunAs(): Exit: webApp: " + webApp.toString());
     }
 
 
@@ -154,17 +155,17 @@
      *          existing elements in it are not overwritten by annoations
      * </ul>
      *
-     * @param annotatedApp  Access to the spec dd
+     * @param webApp  Access to the spec dd
      * @param annotation    @DeclareRoles annotation
      * @param cls           Class name with the @DeclareRoles annoation
      */
-    private static void addDeclareRoles(AnnotatedApp annotatedApp, DeclareRoles annotation,
Class cls) {
-        log.debug("addDeclareRoles( [annotatedApp] " + annotatedApp.toString() + "," + '\n'
+
+    private static void addDeclareRoles(WebAppType webApp, DeclareRoles annotation, Class
cls) {
+        log.debug("addDeclareRoles( [webApp] " + webApp.toString() + "," + '\n' +
                   "[annotation] " + annotation.toString() + "," + '\n' +
                   "[cls] " + (cls != null ? cls.getName() : null) + "): Entry");
 
         // Get all the <security-role> tags from the deployment descriptor
-        SecurityRoleType[] securityRoles = annotatedApp.getSecurityRoleArray();
+        SecurityRoleType[] securityRoles = webApp.getSecurityRoleArray();
 
         String[] annotationRoleNames = annotation.value();
         for (String annotationRoleName : annotationRoleNames) {
@@ -181,7 +182,7 @@
                 }
                 else {
                     log.debug("addDeclareRoles: <security-role> entry NOT found: "
+ annotationRoleName);
-                    SecurityRoleType securityRole = annotatedApp.addNewSecurityRole();
+                    SecurityRoleType securityRole = webApp.addNewSecurityRole();
                     RoleNameType roleName = securityRole.addNewRoleName();
                     roleName.setStringValue(annotationRoleName);
                 }
@@ -208,18 +209,18 @@
      *          existing elements in it are not overwritten by annoations
      * </ul>
      *
-     * @param annotatedApp Access to the spec dd
+     * @param webApp Access to the spec dd
      * @param annotation    @RunAs annotation
      * @param cls           Class name with the @RunAs annoation
      */
-    private static void addRunAs(AnnotatedApp annotatedApp, RunAs annotation, Class cls)
{
-        log.debug("addRunAs( [annotatedApp] " + annotatedApp.toString() + "," + '\n' +
+    private static void addRunAs(WebAppType webApp, RunAs annotation, Class cls) {
+        log.debug("addRunAs( [webApp] " + webApp.toString() + "," + '\n' +
                   "[annotation] " + annotation.toString() + "," + '\n' +
                   "[cls] " + (cls != null ? cls.getName() : null) + "): Entry");
 
         String annotationRunAs = annotation.value();
         if (!annotationRunAs.equals("")) {
-            ServletType[] servlets = annotatedApp.getServletArray();
+            ServletType[] servlets = webApp.getServletArray();
             boolean exists = false;
             for (ServletType servlet : servlets) {
                 if (servlet.getServletClass().getStringValue().trim().equals(cls.getName()))
{
@@ -233,7 +234,7 @@
                 }
             }
             if (!exists) {
-                log.warn("RunAs servlet not found in annotatedApp: " + cls.getName());
+                log.warn("RunAs servlet not found in webApp: " + cls.getName());
             }
         }
 

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
Mon Apr 23 01:53:44 2007
@@ -289,8 +289,7 @@
         XmlObject xmlObject = XmlObject.Factory.parse(srcXML, options);
         WebAppDocument webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
         WebAppType webApp = webAppDoc.getWebApp();
-        AnnotatedWebApp annotatedWebApp = new AnnotatedWebApp(webApp);
-        SecurityAnnotationHelper.processAnnotations(annotatedWebApp, classFinder);
+        SecurityAnnotationHelper.processAnnotations(webApp, classFinder);
         URL expectedXML = classLoader.getResource("annotation/security-expected.xml");
         XmlObject expected = XmlObject.Factory.parse(expectedXML);
         log.debug("[Security Source XML] " + '\n' + webApp.toString() + '\n');
@@ -303,8 +302,7 @@
         xmlObject = XmlObject.Factory.parse(srcXML, options);
         webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
         webApp = webAppDoc.getWebApp();
-        annotatedWebApp = new AnnotatedWebApp(webApp);
-        SecurityAnnotationHelper.processAnnotations(annotatedWebApp, classFinder);
+        SecurityAnnotationHelper.processAnnotations(webApp, classFinder);
         expectedXML = classLoader.getResource("annotation/security-expected-1.xml");
         expected = XmlObject.Factory.parse(expectedXML);
         log.debug("[Security Source XML] " + '\n' + webApp.toString() + '\n');

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=531383&r1=531382&r2=531383
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Mon Apr 23 01:53:44 2007
@@ -479,7 +479,7 @@
 
             if (servletTypes.length > 0) {
                 // Process security annotations for servlets only (before MBEs run)
-                SecurityAnnotationHelper.processAnnotations(webModule.getAnnotatedApp(),
webModule.getClassFinder());
+                SecurityAnnotationHelper.processAnnotations(webApp, webModule.getClassFinder());
             }
 
             //TODO this may definitely not be the best place for this!

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=531383&r1=531382&r2=531383
==============================================================================
--- 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
Mon Apr 23 01:53:44 2007
@@ -447,7 +447,7 @@
 
             if (servletTypes.length > 0) {
                 // Process security annotations for servlets only (before MBEs run)
-                SecurityAnnotationHelper.processAnnotations(webModule.getAnnotatedApp(),
webModule.getClassFinder());
+                SecurityAnnotationHelper.processAnnotations(webApp, webModule.getClassFinder());
             }
 
             //listeners added directly to the StandardContext will get loaded by the tomcat
classloader, not the app classloader!



Mime
View raw message