[jboss-cvs] JBossAS SVN: r95804 - 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-10-29 20:16:41 -0400 (Thu, 29 Oct 2009)
New Revision: 95804

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
   trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
Log:
- Update metadata-web and metadata-common.
- Use augment rather than AnnotationMergedView to merge annotation metadata into the fragment metadata,
  and comment out again the old metadata-complete flag.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-29 23:52:36 UTC (rev 95803)
+++ trunk/component-matrix/pom.xml	2009-10-30 00:16:41 UTC (rev 95804)
@@ -92,12 +92,12 @@
     <version.org.jboss.logmanager>1.1.0.CR6</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
-    <version.org.jboss.metadata.common>2.0.0.Alpha2</version.org.jboss.metadata.common>
+    <version.org.jboss.metadata.common>2.0.0.Alpha7</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.client>2.0.0.Alpha</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.ear>2.0.0.Alpha</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0.Alpha</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
-    <version.org.jboss.metadata.war>2.0.0.Alpha6</version.org.jboss.metadata.war>
+    <version.org.jboss.metadata.war>2.0.0.Alpha7</version.org.jboss.metadata.war>
     <version.org.jboss.microcontainer>2.0.9.GA</version.org.jboss.microcontainer>
     <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>

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-29 23:52:36 UTC (rev 95803)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-10-30 00:16:41 UTC (rev 95804)
@@ -346,14 +346,11 @@
             annotatedMetaData.setServlets(null);
             annotatedMetaData.setServletMappings(null);
          }
-         WebMetaData specMerged = new WebMetaData();
-         AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
-         specMetaData.augment(specMerged, null, true);
+         specMetaData.augment(annotatedMetaData, null, true);
       }
       for (String jar : order)
       {
          WebFragmentMetaData webFragmentMetaData = webFragments.get(jar);
-         WebCommonMetaData webJarMetaData = new WebCommonMetaData();
          if (webFragmentMetaData == null)
          {
             webFragmentMetaData = new WebFragmentMetaData();
@@ -371,17 +368,13 @@
          }
          if (annotatedMetaData != null)
          {
-            // Merge annotation corresponding to the JAR
-            AnnotationMergedView.merge(webJarMetaData, webFragmentMetaData, annotatedMetaData);
+            // Merge annotations corresponding to the JAR
+            webFragmentMetaData.augment(annotatedMetaData, null, true);
          }
-         else
-         {
-            webJarMetaData = webFragmentMetaData;
-         }
          // Merge fragment meta data according to the conflict rules
          try
          {
-            mergedFragmentMetaData.augment(webJarMetaData, specMetaData, false);
+            mergedFragmentMetaData.augment(webFragmentMetaData, specMetaData, false);
          }
          catch (Exception e)
          {

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 23:52:36 UTC (rev 95803)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2009-10-30 00:16:41 UTC (rev 95804)
@@ -38,8 +38,6 @@
 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;
 
 /**
@@ -108,16 +106,16 @@
        of whether annotations should be scanned for.
        */
       
-      // FIXME: comment out ...
+      /*
       boolean isComplete = this.isMetaDataCompleteIsDefault();
       WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
       if(webMetaData != null)
       {
-         if (webMetaData instanceof Web25MetaData)
+         if (webMetaData instanceof org.jboss.metadata.web.spec.Web25MetaData)
          {
             isComplete |= ((Web25MetaData)webMetaData).isMetadataComplete();
          }
-         else if (webMetaData instanceof Web30MetaData)
+         else if (webMetaData instanceof org.jboss.metadata.web.spec.Web30MetaData)
          {
             isComplete |= ((Web30MetaData)webMetaData).isMetadataComplete();
          }
@@ -134,7 +132,7 @@
                + ", metaDataCompleteIsDefault="+metaDataCompleteIsDefault
                );
          return;
-      }
+      }*/
       VirtualFile root = unit.getRoot();
       boolean isLeaf = true;
       try