[jboss-cvs] JBossAS SVN: r95701 - 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-28 14:34:23 -0400 (Wed, 28 Oct 2009)
New Revision: 95701

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
   trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
Log:
- Add some order debug logging.
- metadata-complete change.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-10-28 18:14:06 UTC (rev 95700)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-10-28 18:34:23 UTC (rev 95701)
@@ -310,6 +310,18 @@
          order.addAll(jarsSet);
       }
 
+      if (log.isDebugEnabled())
+      {
+         StringBuilder builder = new StringBuilder();
+         builder.append("Resolved order: [ ");
+         for (String jar : order)
+         {
+            builder.append(jar).append(' ');
+         }
+         builder.append(']');
+         log.debug(builder.toString());
+      }
+      
       unit.addAttachment(WEB_ORDER_ATTACHMENT_NAME, order);
       unit.addAttachment(WEB_OVERLAYS_ATTACHMENT_NAME, overlays);
       

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-28 18:14:06 UTC (rev 95700)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-10-28 18:34:23 UTC (rev 95701)
@@ -37,8 +37,6 @@
 import org.jboss.metadata.annotation.creator.web.Web30MetaDataCreator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
-import org.jboss.metadata.web.spec.Web25MetaData;
-import org.jboss.metadata.web.spec.Web30MetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.virtual.VirtualFile;
 
@@ -107,6 +105,7 @@
        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)
@@ -132,7 +131,7 @@
                + ", metaDataCompleteIsDefault="+metaDataCompleteIsDefault
                );
          return;
-      }
+      }*/
       VirtualFile root = unit.getRoot();
       boolean isLeaf = true;
       try
@@ -154,7 +153,7 @@
 
       try
       {
-         processMetaData(unit, webMetaData, classpath);
+         processMetaData(unit, classpath);
       }
       catch (Exception e)
       {
@@ -166,12 +165,10 @@
     * Process metadata.
     *
     * @param unit the deployment unit
-    * @param webMetaData the web metadata
-    * @param clientMetaData the client metadata
     * @param classpath the classpath
-    * @throws DeploymentException for any error
+    * @throws Exception for any error
     */
-   protected void processMetaData(VFSDeploymentUnit unit, WebMetaData webMetaData, List<VirtualFile> classpath) throws Exception
+   protected void processMetaData(VFSDeploymentUnit unit, List<VirtualFile> classpath) throws Exception
    {
       Map<VirtualFile, Collection<Class<?>>> classesPerJar = new HashMap<VirtualFile, Collection<Class<?>>>();
       boolean foundAnnotations = false;