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

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

Author: remy.maucherat at jboss.com
Date: 2009-11-26 11:47:57 -0500 (Thu, 26 Nov 2009)
New Revision: 97041

Modified:
   trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
   trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
Log:
- As AnnotationMetaDataDeployer is overriden, the comment does not make much sense, so drop it.

Modified: trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java	2009-11-26 16:31:56 UTC (rev 97040)
+++ trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java	2009-11-26 16:47:57 UTC (rev 97041)
@@ -211,10 +211,9 @@
       if (classes.size() > 0)
       {
          AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
-         /* Note: Web related annotations scanning is done by WarAnnotationMetaDataDeployer at the moment
-          * if (webMetaData != null)
+         if (webMetaData != null)
             processJBossWebMetaData(unit, finder, classesPerJar);
-         else */if (clientMetaData != null || mainClassName != null)
+         else if (clientMetaData != null || mainClassName != null)
             processJBossClientMetaData(unit, finder, classes);
          else
             processJBossMetaData(unit, finder, classes);

Modified: trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-11-26 16:31:56 UTC (rev 97040)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-11-26 16:47:57 UTC (rev 97041)
@@ -100,39 +100,7 @@
       {
          return;
       }
-      /* Ignore any spec metadata complete deployments. This expects that a
-       deployment unit only represents one of the client, ejb or web
-       deployments and its metadata completeness applies to the unit in terms
-       of whether annotations should be scanned for.
-       */
-      
-      /*
-      boolean isComplete = this.isMetaDataCompleteIsDefault();
-      WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
-      if(webMetaData != null)
-      {
-         if (webMetaData instanceof org.jboss.metadata.web.spec.Web25MetaData)
-         {
-            isComplete |= ((Web25MetaData)webMetaData).isMetadataComplete();
-         }
-         else if (webMetaData instanceof org.jboss.metadata.web.spec.Web30MetaData)
-         {
-            isComplete |= ((Web30MetaData)webMetaData).isMetadataComplete();
-         }
-         else
-         {
-            // Any web.xml 2.4 or earlier deployment is metadata complete
-            isComplete = true;
-         }
-      }
-      if(isComplete)
-      {
-         log.debug("Deployment is metadata-complete, skipping annotation processing"
-               + ", jbossWebMetaData="+webMetaData
-               + ", metaDataCompleteIsDefault="+metaDataCompleteIsDefault
-               );
-         return;
-      }*/
+
       VirtualFile root = unit.getRoot();
       boolean isLeaf = true;
       try