[jboss-cvs] JBossAS SVN: r65892 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/spec and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-10-05 13:11:34 -0400 (Fri, 05 Oct 2007)
New Revision: 65892

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
Log:
Fix the service-ref metadata

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -764,10 +764,7 @@
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
-      //return AbstractMappedMetaData.getByName(name, getServiceReferences());
-      ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
-      ref.setName(name);
-      return ref;
+      return AbstractMappedMetaData.getByName(name, getServiceReferences());
    }
 
    public ServiceReferencesMetaData getServiceReferences()

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java	2007-10-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -426,10 +426,7 @@
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
-      //return AbstractMappedMetaData.getByName(name, getServiceReferences());
-      ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
-      ref.setName(name);
-      return ref;
+      return AbstractMappedMetaData.getByName(name, getServiceReferences());
    }
 
    public ServiceReferencesMetaData getServiceReferences()

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java	2007-10-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -307,10 +307,7 @@
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
-      //return AbstractMappedMetaData.getByName(name, getServiceReferences());
-      ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
-      ref.setName(name);
-      return ref;
+      return AbstractMappedMetaData.getByName(name, getServiceReferences());
    }
 
    public ServiceReferencesMetaData getServiceReferences()

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-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -125,13 +125,14 @@
     * @param serviceReferences the serviceReferences.
     * @throws IllegalArgumentException for a null serviceReferences
     */
+   @XmlElement(name="service-ref")
    public void setServiceReferences(ServiceReferencesMetaData serviceReferences)
    {
       if (serviceReferences == null)
          throw new IllegalArgumentException("Null serviceReferences");
       this.serviceReferences = serviceReferences;
    }
-   
+
    public EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name)
    {
       return AbstractMappedMetaData.getByName(name, ejbLocalReferences);
@@ -144,9 +145,6 @@
 
    public ServiceReferenceMetaData getServiceReferenceByName(String name)
    {
-      //return AbstractMappedMetaData.getByName(name, serviceReferences);
-      ServiceReferenceMetaData ref = new ServiceReferenceMetaData();
-      ref.setName(name);
-      return ref;
+      return AbstractMappedMetaData.getByName(name, serviceReferences);
    }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java	2007-10-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -59,7 +59,10 @@
    
    /** The handler chains */
    private ServiceReferenceHandlerChainsMetaData handlerChains;
-   
+
+   /** The port-component-ref */
+   private PortComponentRef portComponentRef;
+
    /**
     * Create a new ServiceReferenceMetaData.
     */
@@ -254,4 +257,14 @@
          throw new IllegalArgumentException("Null handlerChains");
       this.handlerChains = handlerChains;
    }
+
+   public PortComponentRef getPortComponentRef()
+   {
+      return portComponentRef;
+   }
+
+   public void setPortComponentRef(PortComponentRef portComponentRef)
+   {
+      this.portComponentRef = portComponentRef;
+   }
 }

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-05 16:36:04 UTC (rev 65891)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java	2007-10-05 17:11:34 UTC (rev 65892)
@@ -21,40 +21,26 @@
 */
 package org.jboss.metadata.javaee.spec;
 
-import java.util.List;
-
 import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
-import org.w3c.dom.Element;
 
 /**
- * ServiceReferencesMetaData.
+ * The service-refGroup type
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
 //@SchemaGroup(name="service-refGroup")
 public class ServiceReferencesMetaData
-   // extends AbstractMappedMetaData<ServiceReferenceMetaData>
-   extends IdMetaDataImpl
+   extends AbstractMappedMetaData<ServiceReferenceMetaData>
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -2667900705228419782L;
-   private List<Element> refs;
 
    /**
     * Create a new ServiceReferencesMetaData.
     */
    public ServiceReferencesMetaData()
    {
+      super("service ref name for service ref");
    }
-   public List<Element> getServiceRef()
-   {
-      return refs;
-   }
-   public void setServiceRef(List<Element> refs)
-   {
-      this.refs = refs;
-   }
 }