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

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 17:48:56 -0400 (Tue, 30 Oct 2007)
New Revision: 66582

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java
Log:
Push info about annotated element to service-ref meta data

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-30 21:17:32 UTC (rev 66581)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java	2007-10-30 21:48:56 UTC (rev 66582)
@@ -21,9 +21,11 @@
 */
 package org.jboss.metadata.javaee.spec;
 
+import java.lang.reflect.AnnotatedElement;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
@@ -68,6 +70,11 @@
    /** The handler chains */
    private ServiceReferenceHandlerChainsMetaData handlerChains;
 
+   // The JAXWS annotated element.
+   private transient AnnotatedElement anElement;
+   // A flag that should be set when this service-ref has been bound.
+   private transient boolean processed;
+   
    /**
     * Create a new ServiceReferenceMetaData.
     */
@@ -329,4 +336,26 @@
          throw new IllegalArgumentException("Null handlerChains");
       this.handlerChains = handlerChains;
    }
+
+   @XmlTransient
+   public AnnotatedElement getAnnotatedElement()
+   {
+      return anElement;
+   }
+
+   public void setAnnotatedElement(AnnotatedElement anElement)
+   {
+      this.anElement = anElement;
+   }
+
+   @XmlTransient
+   public boolean isProcessed()
+   {
+      return processed;
+   }
+
+   public void setProcessed(boolean processed)
+   {
+      this.processed = processed;
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java	2007-10-30 21:17:32 UTC (rev 66581)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java	2007-10-30 21:48:56 UTC (rev 66582)
@@ -84,8 +84,12 @@
    {
       if (delegate != null)
       {
-         ServiceRefMetaData spiRef = getUnifiedServiceRefMetaData(vfsRoot, sref);
-         delegate.bindServiceRef(encCtx, encName, vfsRoot, loader, spiRef);
+         if (sref.isProcessed() == false)
+         {
+            ServiceRefMetaData spiRef = getUnifiedServiceRefMetaData(vfsRoot, sref);
+            delegate.bindServiceRef(encCtx, encName, vfsRoot, loader, spiRef);
+            sref.setProcessed(true);
+         }
       }
    }
 
@@ -98,6 +102,8 @@
       result.setWsdlFile(sref.getWsdlFile());
       result.setMappingFile(sref.getJaxrpcMappingFile());
       result.setServiceQName(sref.getServiceQname());
+      result.setAnnotatedElement(sref.getAnnotatedElement());
+      result.setProcessed(sref.isProcessed());
 
       List<? extends PortComponentRef> pcRefs = sref.getPortComponentRef();
       if (pcRefs != null)