[jboss-cvs] JBossAS SVN: r95767 - trunk/server/src/main/java/org/jboss/web/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-29 12:39:24 -0400 (Thu, 29 Oct 2009)
New Revision: 95767

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
Log:
- Cannot remove this yet, probably because the metadata merge was having problems.
- Will revisit when the new metadata builds are integrated.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-10-29 16:06:54 UTC (rev 95766)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-10-29 16:39:24 UTC (rev 95767)
@@ -38,6 +38,8 @@
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.metadata.web.spec.Web25MetaData;
+import org.jboss.metadata.web.spec.Web30MetaData;
 import org.jboss.virtual.VirtualFile;
 
 /**
@@ -105,7 +107,8 @@
        deployments and its metadata completeness applies to the unit in terms
        of whether annotations should be scanned for.
        */
-      /*
+      
+      // FIXME: comment out ...
       boolean isComplete = this.isMetaDataCompleteIsDefault();
       WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
       if(webMetaData != null)
@@ -131,7 +134,7 @@
                + ", metaDataCompleteIsDefault="+metaDataCompleteIsDefault
                );
          return;
-      }*/
+      }
       VirtualFile root = unit.getRoot();
       boolean isLeaf = true;
       try