[jboss-cvs] JBossAS SVN: r67256 - trunk/webservices/src/main/org/jboss/wsf/container/jboss50.

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

Author: thomas.diesler at jboss.com
Date: 2007-11-19 12:02:14 -0500 (Mon, 19 Nov 2007)
New Revision: 67256

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
Log:
Fix <port-component> on generic ejb

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java	2007-11-19 16:36:22 UTC (rev 67255)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java	2007-11-19 17:02:14 UTC (rev 67256)
@@ -36,6 +36,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
@@ -107,23 +109,20 @@
       while (it.hasNext())
       {
          EJBContainer container = (EJBContainer)it.next();
+         JBossEnterpriseBeanMetaData beanMetaData = container.getXml();
+         
          EJBMetaData ejbMetaData = null;
-         if (container instanceof SessionContainer)
+         PortComponent pcMetaData = null;
+         if (beanMetaData instanceof JBossSessionBeanMetaData)
          {
             ejbMetaData = new SLSBMetaData();
-            JBossSessionBeanMetaData bean = (JBossSessionBeanMetaData)container.getXml();
-            PortComponent pcmd = (bean != null ? bean.getPortComponent() : null);
-            if (pcmd != null)
-            {
-               ejbMetaData.setPortComponentName(pcmd.getPortComponentName());
-               ejbMetaData.setPortComponentURI(pcmd.getPortComponentURI());
-               EJBSecurityMetaData smd = new EJBSecurityMetaData();
-               smd.setAuthMethod(pcmd.getAuthMethod());
-               smd.setTransportGuarantee(pcmd.getTransportGuarantee());
-               smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
-               ejbMetaData.setSecurityMetaData(smd);
-            }
+            pcMetaData = ((JBossSessionBeanMetaData)beanMetaData).getPortComponent();
          }
+         else if (beanMetaData instanceof JBossGenericBeanMetaData)
+         {
+            ejbMetaData = new SLSBMetaData();
+            pcMetaData = ((JBossGenericBeanMetaData)beanMetaData).getPortComponent();
+         }
          else if (container instanceof MessagingContainer)
          {
             ejbMetaData = new MDBMetaData();
@@ -136,9 +135,21 @@
             ejbMetaData.setEjbName(container.getEjbName());
             ejbMetaData.setEjbClass(container.getBeanClassName());
 
+            if (pcMetaData != null)
+            {
+               ejbMetaData.setPortComponentName(pcMetaData.getPortComponentName());
+               ejbMetaData.setPortComponentURI(pcMetaData.getPortComponentURI());
+               EJBSecurityMetaData smd = new EJBSecurityMetaData();
+               smd.setAuthMethod(pcMetaData.getAuthMethod());
+               smd.setTransportGuarantee(pcMetaData.getTransportGuarantee());
+               smd.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess());
+               ejbMetaData.setSecurityMetaData(smd);
+            }
+            
             ejbMetaDataList.add(ejbMetaData);
          }
       }
+      
       jarMetaData.setEnterpriseBeans(ejbMetaDataList);
    }