[jboss-cvs] JBossAS SVN: r57931 - trunk/server/src/main/org/jboss/metamodel/descriptor

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

Author: scott.stark at jboss.org
Date: 2006-10-30 21:28:30 -0500 (Mon, 30 Oct 2006)
New Revision: 57931

Modified:
   trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
Log:
Merge the JEE5_TCK branch changes

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2006-10-31 02:20:23 UTC (rev 57930)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2006-10-31 02:28:30 UTC (rev 57931)
@@ -35,7 +35,7 @@
 import org.jboss.metamodel.descriptor.MessageDestinationRef;
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
 import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.WebServiceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -53,7 +53,7 @@
    protected HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap<String, MessageDestinationRef>();
    /** An index of MessageDestinationRef keyed by message-destination-link values */
    protected HashMap<String, MessageDestinationRef> messageDestinationRefsByLink = new HashMap<String, MessageDestinationRef>();
-   protected HashMap<String, WebServiceRef> webServiceRefs = new HashMap<String, WebServiceRef>();
+   protected HashMap<String, ServiceRef> serviceRefs = new HashMap<String, ServiceRef>();
    protected HashMap<String, JndiRef> jndiRefs = new HashMap<String, JndiRef>();
    protected List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
    protected List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
@@ -134,14 +134,14 @@
       jndiRefs.put(ref.getJndiRefName(), ref);
    }
    
-   public Collection<WebServiceRef> getWebServiceRefs()
+   public Collection<ServiceRef> getServiceRefs()
    {
-      return webServiceRefs.values();
+      return serviceRefs.values();
    }
 
-   public void addWebServiceRef(WebServiceRef ref)
+   public void addServiceRef(ServiceRef ref)
    {
-      webServiceRefs.put(ref.getServiceRefName(), ref);
+      serviceRefs.put(ref.getEncName(), ref);
    }
    
    public void updateEjbRef(EjbRef updatedRef)