[jboss-cvs] JBossAS SVN: r70998 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: web/spec and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-03-19 09:00:07 -0400 (Wed, 19 Mar 2008)
New Revision: 70998

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java
Log:
JBMETA-7: annotation merge

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	2008-03-19 12:59:01 UTC (rev 70997)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	2008-03-19 13:00:07 UTC (rev 70998)
@@ -361,6 +361,7 @@
    public void merge(RemoteEnvironment jbossEnv, RemoteEnvironment specEnv,
          String overrideFile, String overridenFile, boolean mustOverride)
    {
+      AnnotatedEJBReferencesMetaData annotatedEjbRefs = null;
       EJBReferencesMetaData ejbRefs = null;
       EJBReferencesMetaData jbossEjbRefs = null;
       ServiceReferencesMetaData serviceRefs = null;
@@ -377,6 +378,7 @@
       
       if (specEnv != null)
       {
+         annotatedEjbRefs = specEnv.getAnnotatedEjbReferences();
          ejbRefs = specEnv.getEjbReferences();
          serviceRefs = specEnv.getServiceReferences();
          resRefs = specEnv.getResourceReferences();
@@ -388,7 +390,7 @@
       }
       
       if (jbossEnv != null)
-      {
+      { 
          jbossEjbRefs = jbossEnv.getEjbReferences();
          jbossServiceRefs = jbossEnv.getServiceReferences();
          jbossResRefs = jbossEnv.getResourceReferences();
@@ -459,5 +461,8 @@
       
       if (preDestroys != null)
          setPreDestroys(preDestroys);
+      
+      if(annotatedEjbRefs != null)
+         this.setAnnotatedEjbReferences(annotatedEjbRefs);
    }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java	2008-03-19 12:59:01 UTC (rev 70997)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/AnnotationMergedView.java	2008-03-19 13:00:07 UTC (rev 70998)
@@ -61,8 +61,10 @@
       messageDestinations.merge(xml.getMessageDestinations(), annotation.getMessageDestinations());
       merged.setMessageDestinations(messageDestinations);
       
+      //merge annotation
+      mergeIn(merged,annotation);
       //merge xml override
-      mergeXMLOverrides(merged,xml);
+      mergeIn(merged,xml);
    }
    
    private static void merge(ServletsMetaData merged, ServletsMetaData xml,
@@ -153,7 +155,7 @@
       merged.merge(xml, annotation); 
    }
    
-   private static void mergeXMLOverrides(WebMetaData merged, WebMetaData xml)
+   private static void mergeIn(WebMetaData merged, WebMetaData xml)
    {
       merged.setDTD("", xml.getDtdPublicId(), xml.getDtdSystemId());