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

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

Author: scott.stark at jboss.org
Date: 2007-10-27 02:53:02 -0400 (Sat, 27 Oct 2007)
New Revision: 66511

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
Log:
Correct the JBossServiceReferencesMetaData merge to produce a JBossServiceReferenceMetaData

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-27 05:33:30 UTC (rev 66510)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java	2007-10-27 06:53:02 UTC (rev 66511)
@@ -24,6 +24,8 @@
 import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlElement;
+
+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;
@@ -305,36 +307,37 @@
 
    public EJBReferenceMetaData getEjbReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, ejbReferences);
+      return AbstractMappedMetaData.getByName(name, getEjbReferences());
    }
 
    public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, environmentEntries);
+      return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
    }
 
    public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, messageDestinationReferences);
+      return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
    }
 
    public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, persistenceUnitRefs);
+      return AbstractMappedMetaData.getByName(name, getPersistenceUnitRefs());
    }
 
    public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, resourceEnvironmentReferences);
+      return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
    }
 
    public ResourceReferenceMetaData getResourceReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, resourceReferences);
+      return AbstractMappedMetaData.getByName(name, getResourceReferences());
    }
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
-      return AbstractMappedMetaData.getByName(name, serviceReferences);
+      ServiceReferencesMetaData srefs = this.getServiceReferences();
+      return AbstractMappedMetaData.getByName(name, srefs);
    }
 
    public void merge(RemoteEnvironmentRefsGroupMetaData jbossEnv, RemoteEnvironmentRefsGroupMetaData specEnv, boolean mustOverride)
@@ -380,7 +383,7 @@
       if (mergedEjbRefs != null)
          setEjbReferences(mergedEjbRefs);
       
-      ServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, "", "");
+      ServiceReferencesMetaData mergedServiceRefs = JBossServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, "", "");
       if (mergedServiceRefs != null)
          setServiceReferences(mergedServiceRefs);