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

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

Author: alex.loubyansky at jboss.com
Date: 2007-11-01 07:58:34 -0400 (Thu, 01 Nov 2007)
New Revision: 66646

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
Log:
avoid overriding JBoss-specific metadata with the spec metadata (QName conflict)

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-11-01 09:50:01 UTC (rev 66645)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-11-01 11:58:34 UTC (rev 66646)
@@ -969,6 +969,7 @@
       return AbstractMappedMetaData.getByName(name, getServiceReferences());
    }
 
+   @XmlTransient
    public ServiceReferencesMetaData getServiceReferences()
    {
       return jndiEnvironmentRefsGroup.getServiceReferences();

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java	2007-11-01 09:50:01 UTC (rev 66645)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java	2007-11-01 11:58:34 UTC (rev 66646)
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.metadata.javaee.spec.PortComponentRef;
@@ -149,6 +150,12 @@
       this.jbossPortComponentRef = (List<JBossPortComponentRef>)portComponentRef;
    }
 
+   @XmlTransient
+   public void setPortComponentRef(List<? extends PortComponentRef> portComponentRef)
+   {
+      super.setPortComponentRef(portComponentRef);
+   }
+   
    public String getWsdlOverride()
    {
       return wsdlOverride;