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

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

Author: alex.loubyansky at jboss.com
Date: 2007-11-19 10:31:59 -0500 (Mon, 19 Nov 2007)
New Revision: 67251

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbPortComponent.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBAS-4989

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java	2007-11-19 15:27:13 UTC (rev 67250)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java	2007-11-19 15:31:59 UTC (rev 67251)
@@ -24,6 +24,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
 
 /**
  * Allow for the specification of an unknown bean type in the deployment
@@ -37,6 +38,9 @@
 {
    private static final long serialVersionUID = 1L;
 
+   /** The webservices port-component */
+   private PortComponent portComponent;
+
    /* (non-Javadoc)
     * @see org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData#getDefaultConfigurationName()
     */
@@ -77,4 +81,14 @@
    {
       super.setMappedName(jndiName);
    }
+
+   public PortComponent getPortComponent()
+   {
+      return portComponent;
+   }
+
+   public void setPortComponent(PortComponent portComponent)
+   {
+      this.portComponent = portComponent;
+   }
 }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-11-19 15:27:13 UTC (rev 67250)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-11-19 15:31:59 UTC (rev 67251)
@@ -54,9 +54,6 @@
 import org.jboss.metadata.ejb.jboss.RemoteBindingMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertiesMetaData;
-import org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
@@ -72,6 +69,7 @@
 import org.jboss.metadata.javaee.spec.EJBReferenceType;
 import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.metadata.javaee.spec.ResourceAuthorityType;
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
@@ -539,7 +537,7 @@
             InvokerProxyBindingMetaData ipbmd = bindings.get(invoker.getName());
             assertNotNull(invoker.getName(), ipbmd);
          }
-   }
+      }
 
       // Test the legacy wrapper view
       ApplicationMetaData appMetaData = new ApplicationMetaData(wrapper);
@@ -721,6 +719,13 @@
       JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
       xbdelegate.setValidateSchema(true);
       JBossMetaData jbossXmlMetaData = unmarshal();
+      JBossEnterpriseBeansMetaData enterpriseBeans = jbossXmlMetaData.getEnterpriseBeans();
+      assertNotNull(enterpriseBeans);
+      assertEquals(2, enterpriseBeans.size());
+      for(JBossEnterpriseBeanMetaData bean : enterpriseBeans)
+      {
+         assertEquals("servlet_annotation_" + bean.getEjbName(), ((JBossGenericBeanMetaData)bean).getJndiName());
+      }
    }
 
    public void testMDBActivationConfigMerge()
@@ -846,7 +851,20 @@
       expected.put("principal3", toSet("test3"));
       assertEquals(expected, principalVersusRolesMap);
    }
-   
+
+   public void testEjbPortComponent() throws Exception
+   {
+      JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+      xbdelegate.setValidateSchema(true);
+      JBossMetaData jboss = unmarshal();
+      JBossGenericBeanMetaData ejb = (JBossGenericBeanMetaData) jboss.getEnterpriseBean("EjbName");
+      assertNotNull(ejb);
+      PortComponent portComponent = ejb.getPortComponent();
+      assertNotNull(portComponent);
+      assertEquals("port.component.name", portComponent.getPortComponentName());
+      assertEquals("port/component/uri", portComponent.getPortComponentURI());
+   }
+
    private <T> Set<T> toSet(T ... obj)
    {
       Set<T> set = new HashSet<T>();

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbPortComponent.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbPortComponent.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbPortComponent.xml	2007-11-19 15:31:59 UTC (rev 67251)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+    version="3.0">
+    <enterprise-beans>
+        <ejb>
+            <ejb-name>EjbName</ejb-name>
+            <port-component>
+               <port-component-name>port.component.name</port-component-name>
+               <port-component-uri>port/component/uri</port-component-uri>
+            </port-component> 
+        </ejb>
+    </enterprise-beans>
+</jboss>