[jboss-cvs] JBossAS SVN: r94420 - in trunk: tomcat/src/main/java/org/jboss/web/tomcat/service/deployers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-10-06 11:39:12 -0400 (Tue, 06 Oct 2009)
New Revision: 94420

Modified:
   trunk/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Update the todos with the design updates.

Modified: trunk/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java	2009-10-06 15:31:47 UTC (rev 94419)
+++ trunk/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java	2009-10-06 15:39:12 UTC (rev 94420)
@@ -52,7 +52,6 @@
    private ClassLoader loader;
    private int rootLength;
    private HashSet<String> childPaths = new HashSet<String>();
-   //private HashMap<VirtualFile, Class<?>> pathToClasses = new HashMap<VirtualFile, Class<?>>();
    private Map<ServletContainerInitializer, Set<Class<?>>> handlesTypes;
    private Class<?>[] typesArray;
    private Map<Class<?>, ServletContainerInitializer> typesMap;
@@ -105,6 +104,7 @@
       }
    }
 
+   @SuppressWarnings("unchecked")
    public boolean accepts(VirtualFile file)
    {
       boolean accepts = file.getPathName().endsWith(".class");

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-06 15:31:47 UTC (rev 94419)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-06 15:39:12 UTC (rev 94420)
@@ -404,9 +404,6 @@
       {
          for (JBossServletMetaData value : servlets)
          {
-            /* TODO: Next meta data web update
-             * if (value.isAnnotation())
-               continue;*/
             org.apache.catalina.Wrapper wrapper = context.createWrapper();
             wrapper.setName(value.getName());
             wrapper.setServletClass(value.getServletClass());
@@ -1045,16 +1042,27 @@
 
    protected void completeConfig() {
 
+      JBossWebMetaData metaData = metaDataLocal.get();
+      
       // Process Servlet API related annotations that were dependent on Servlet declarations
       if (ok && !context.getIgnoreAnnotations())
       {
-         // TODO: Process servlets meta data which are marked as annotations for multipart config, run as and constraints
+         // Resolve type specific annotations to their corresponding Servlet components
+         // TODO: metaData.resolveAnnotations();
+         // Same process for Catalina
+         // TODO: JBossAnnotationsMetaData annotations = metaData.getAnnotations();
       }
       
       if (ok)
       {
          validateSecurityRoles();
       }
+      
+      if (ok)
+      {
+         // Resolve run as
+         // TODO: metaData.resolveRunAs();
+      }
 
       // Configure an authenticator if we need one
       if (ok)