[jboss-cvs] JBossAS SVN: r62292 - in trunk: ejb3/src/resources/schema and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2007-04-12 04:39:09 -0400 (Thu, 12 Apr 2007)
New Revision: 62292

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   trunk/ejb3/src/resources/schema/jboss_5_0.xsd
   trunk/server/src/resources/dtd/jboss_5_0.dtd
Log:
Remove support for multiple <port-component>

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-04-12 08:22:14 UTC (rev 62291)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-04-12 08:39:09 UTC (rev 62292)
@@ -94,7 +94,7 @@
 
    private PoolConfig poolConfig = null;
    
-   private List<Ejb3PortComponent> portComponents = new ArrayList<Ejb3PortComponent>();
+   private Ejb3PortComponent portComponent;
    
    /** The security-role-ref element(s) info */
    private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
@@ -387,11 +387,16 @@
       this.securityRoleReferences = securityRoleReferences;
    }
 
-   public List<Ejb3PortComponent> getPortComponents()
+   public Ejb3PortComponent getPortComponent()
    {
-      return portComponents;
+      return portComponent;
    }
 
+   public void setPortComponent(Ejb3PortComponent portComponent)
+   {
+      this.portComponent = portComponent;
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-04-12 08:22:14 UTC (rev 62291)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-04-12 08:39:09 UTC (rev 62292)
@@ -126,7 +126,7 @@
 
    public void addPortComponent(Ejb3PortComponent portComp)
    {
-      currentEjb.getPortComponents().add(portComp);
+      currentEjb.setPortComponent(portComp);
    }
 
    public void setMethodAttributes(MethodAttributes attributes)

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-04-12 08:22:14 UTC (rev 62291)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-04-12 08:39:09 UTC (rev 62292)
@@ -398,7 +398,7 @@
 
    public void addChild(SessionEnterpriseBean parent, Ejb3PortComponent portComp, UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      parent.getPortComponents().add(portComp);
+      parent.setPortComponent(portComp);
    }
 
    public void addChild(XmlAnnotation parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)

Modified: trunk/ejb3/src/resources/schema/jboss_5_0.xsd
===================================================================
(Binary files differ)

Modified: trunk/server/src/resources/dtd/jboss_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_5_0.dtd	2007-04-12 08:22:14 UTC (rev 62291)
+++ trunk/server/src/resources/dtd/jboss_5_0.dtd	2007-04-12 08:39:09 UTC (rev 62292)
@@ -520,7 +520,7 @@
  security-proxy? , ejb-ref* ,  ejb-local-ref* , service-ref*, security-identity? ,
  resource-ref* , resource-env-ref*, message-destination-ref* , clustered? ,
  cluster-config?, method-attributes?, depends*,
- ior-security-config?, port-component*,  ejb-timeout-identity?)>
+ ior-security-config?, port-component?,  ejb-timeout-identity?)>
 <!-- Allow the session to have a unique id -->
 <!ATTLIST session id ID #IMPLIED>