[jboss-cvs] JBossAS SVN: r93568 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.

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

Author: remy.maucherat at jboss.com
Date: 2009-09-15 19:15:53 -0400 (Tue, 15 Sep 2009)
New Revision: 93568

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java
Log:
- Metadata complete is also useful on a fragment.
- Adjust the types.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java	2009-09-15 22:42:32 UTC (rev 93567)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java	2009-09-15 23:15:53 UTC (rev 93568)
@@ -37,34 +37,38 @@
  */
 public class AnnotationMergedView
 {
-   public static void merge(WebMetaData merged, WebMetaData xml, WebMetaData annotation)
+   public static void merge(WebCommonMetaData merged, WebCommonMetaData xml, WebMetaData annotation)
    {
-      //Merge the servlets meta data
+      // Merge the servlets meta data
       ServletsMetaData servletsMetaData = new ServletsMetaData();
-      merge(servletsMetaData,xml.getServlets(), annotation.getServlets());
+      merge(servletsMetaData, xml.getServlets(), annotation.getServlets());
       merged.setServlets(servletsMetaData);
       
-      //Security Roles
+      // TODO: Merge the filters meta data
+      
+      // TODO: Add the listeners meta data
+      
+      // Security Roles
       SecurityRolesMetaData securityRolesMetaData = new SecurityRolesMetaData();
       merge(securityRolesMetaData, xml.getSecurityRoles(), annotation.getSecurityRoles());
       merged.setSecurityRoles(securityRolesMetaData);
       
-      //Env
+      // Env
       EnvironmentRefsGroupMetaData environmentRefsGroup = new EnvironmentRefsGroupMetaData();
       Environment xmlEnv = xml != null ? xml.getJndiEnvironmentRefsGroup() : null;
       Environment annEnv = annotation != null ? annotation.getJndiEnvironmentRefsGroup() : null;
       environmentRefsGroup.merge(xmlEnv,annEnv, "", "", false);
       merged.setJndiEnvironmentRefsGroup(environmentRefsGroup);
       
-      //Message Destinations
+      // Message Destinations
       MessageDestinationsMetaData messageDestinations = new MessageDestinationsMetaData();
       messageDestinations.merge(xml.getMessageDestinations(), annotation.getMessageDestinations());
       merged.setMessageDestinations(messageDestinations);
       
-      //merge annotation
-      mergeIn(merged,annotation);
+      // merge annotation
+      mergeIn(merged, annotation);
       //merge xml override
-      mergeIn(merged,xml);
+      mergeIn(merged, xml);
    }
    
    private static void merge(ServletsMetaData merged, ServletsMetaData xml,
@@ -155,7 +159,7 @@
       merged.merge(xml, annotation); 
    }
    
-   private static void mergeIn(WebMetaData merged, WebMetaData xml)
+   private static void mergeIn(WebCommonMetaData merged, WebCommonMetaData xml)
    {
       merged.setDTD("", xml.getDtdPublicId(), xml.getDtdSystemId());
       

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2009-09-15 22:42:32 UTC (rev 93567)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2009-09-15 23:15:53 UTC (rev 93568)
@@ -506,7 +506,7 @@
     *        then as all conflict will be resolved in favor of this object, webMetaData
     *        will not be used and can be null
     */
-   public void augment(WebFragmentMetaData webFragmentMetaData, WebMetaData webMetaData, boolean resolveConflicts)
+   public void augment(WebCommonMetaData webFragmentMetaData, WebMetaData webMetaData, boolean resolveConflicts)
    {
 
       // Distributable

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java	2009-09-15 22:42:32 UTC (rev 93567)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java	2009-09-15 23:15:53 UTC (rev 93568)
@@ -21,8 +21,10 @@
  */
 package org.jboss.metadata.web.spec;
 
+import javax.xml.bind.annotation.XmlAttribute;
 
 
+
 /**
  * The web-fragment spec metadata
  * @author Remy Maucherat
@@ -31,8 +33,9 @@
 public class WebFragmentMetaData extends WebCommonMetaData
 {
    private static final long serialVersionUID = 1;
-   
+
    private OrderingMetaData ordering;
+   private boolean metadataComplete;
 
    public OrderingMetaData getOrdering()
    {
@@ -42,4 +45,14 @@
    {
       this.ordering = ordering;
    }
+   
+   public boolean isMetadataComplete()
+   {
+      return metadataComplete;
+   }
+   @XmlAttribute(name="metadata-complete")
+   public void setMetadataComplete(boolean metadataComplete)
+   {
+      this.metadataComplete = metadataComplete;
+   }
 }