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

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

Author: wolfc
Date: 2007-10-24 07:18:18 -0400 (Wed, 24 Oct 2007)
New Revision: 66380

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
Log:
JBAS-4506: moved serviceReferences to RemoteEnvironmentRefsGroupMetaData and fixed merge

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java	2007-10-24 10:56:38 UTC (rev 66379)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java	2007-10-24 11:18:18 UTC (rev 66380)
@@ -25,12 +25,7 @@
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
-import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
-import org.jboss.metadata.javaee.jboss.JBossServiceReferencesMetaData;
 import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-import org.jboss.xb.annotations.JBossXmlCollection;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 
 /**
@@ -52,9 +47,6 @@
    /** The ejb local references */
    private EJBLocalReferencesMetaData ejbLocalReferences;
  
-   /** The service references */
-   private ServiceReferencesMetaData serviceReferences;
-   
    /** The persistence context reference */
    private PersistenceContextReferencesMetaData persistenceContextRefs;
 
@@ -114,31 +106,6 @@
       this.persistenceContextRefs = persistenceContextRefs;
    }
 
-   /**
-    * Get the serviceReferences.
-    * 
-    * @return the serviceReferences.
-    */
-   public IServiceReferencesMetaData getServiceReferences()
-   {
-      return serviceReferences;
-   }
-
-   /**
-    * Set the serviceReferences.
-    * 
-    * @param serviceReferences the serviceReferences.
-    * @throws IllegalArgumentException for a null serviceReferences
-    */
-   @JBossXmlCollection(type=ServiceReferencesMetaData.class, elementType=ServiceReferenceMetaData.class)
-   @XmlElement(name="service-ref")
-   public void setServiceReferences(IServiceReferencesMetaData serviceReferences)
-   {
-      if (serviceReferences == null)
-         throw new IllegalArgumentException("Null serviceReferences");
-      this.serviceReferences = (ServiceReferencesMetaData) serviceReferences;
-   }
-
    public EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name)
    {
       return AbstractMappedMetaData.getByName(name, ejbLocalReferences);
@@ -148,9 +115,4 @@
    {
       return AbstractMappedMetaData.getByName(name, persistenceContextRefs);
    }
-
-   public IServiceReferenceMetaData getServiceReferenceByName(String name)
-   {
-      return AbstractMappedMetaData.getByName(name, serviceReferences);
-   }
 }

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	2007-10-24 10:56:38 UTC (rev 66379)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	2007-10-24 11:18:18 UTC (rev 66380)
@@ -24,10 +24,10 @@
 import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlElement;
-
 import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
 import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
 import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.xb.annotations.JBossXmlCollection;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 
 /**
@@ -136,15 +136,24 @@
       this.ejbReferences = ejbReferences;
    }
 
+   /**
+    * Get the serviceReferences.
+    * 
+    * @return the serviceReferences.
+    */
    public IServiceReferencesMetaData getServiceReferences()
    {
       return serviceReferences;
    }
+   
+   /**
+    * Set the serviceReferences.
+    * 
+    * @param serviceReferences the serviceReferences.
+    * @throws IllegalArgumentException for a null serviceReferences
+    */
+   @JBossXmlCollection(type=ServiceReferencesMetaData.class, elementType=ServiceReferenceMetaData.class)
    @XmlElement(name="service-ref")
-   public void setServiceReferences(ServiceReferencesMetaData serviceReferences)
-   {
-      this.serviceReferences = serviceReferences;
-   }
    public void setServiceReferences(IServiceReferencesMetaData serviceReferences)
    {
       this.serviceReferences = (ServiceReferencesMetaData)serviceReferences;

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java	2007-10-24 10:56:38 UTC (rev 66379)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java	2007-10-24 11:18:18 UTC (rev 66380)
@@ -58,8 +58,16 @@
     */
    public static IServiceReferencesMetaData merge(IServiceReferencesMetaData override, IServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
    {
-      return null;
+      if (override == null && overriden == null)
+         return null;
+      
+      if (override == null)
+         return overriden;
+      
+      ServiceReferencesMetaData merged = new ServiceReferencesMetaData();
+      return JavaEEMetaDataUtil.merge(merged, overriden, override, "service-ref", overridenFile, overrideFile, true);
    }
+   
    public static ServiceReferencesMetaData merge(ServiceReferencesMetaData override, ServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
    {
       if (override == null && overriden == null)