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

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 05:39:16 -0400 (Tue, 30 Oct 2007)
New Revision: 66562

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
Log:
Fix buildEnterpriseBeansMetaData after ejb3 changes

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java	2007-10-30 09:24:02 UTC (rev 66561)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java	2007-10-30 09:39:16 UTC (rev 66562)
@@ -32,17 +32,16 @@
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.metamodel.Ejb3PortComponent;
 import org.jboss.ejb3.metamodel.EjbJarDD;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
 import org.jboss.ejb3.metamodel.WebserviceDescription;
 import org.jboss.ejb3.metamodel.Webservices;
 import org.jboss.ejb3.session.SessionContainer;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
@@ -99,48 +98,46 @@
       }
    }
 
-   private void buildEnterpriseBeansMetaData(EJBArchiveMetaData umd, Ejb3Deployment ejb3Deployment)
+   private void buildEnterpriseBeansMetaData(EJBArchiveMetaData jarMetaData, Ejb3Deployment ejb3Deployment)
    {
-      List<EJBMetaData> ubmdList = new ArrayList<EJBMetaData>();
+      List<EJBMetaData> ejbMetaDataList = new ArrayList<EJBMetaData>();
       Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
       while (it.hasNext())
       {
          EJBContainer container = (EJBContainer)it.next();
-         EJBMetaData ubmd = null;
+         EJBMetaData ejbMetaData = null;
          if (container instanceof SessionContainer)
          {
-            ubmd = new SLSBMetaData();
+            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);
+            }
          }
          else if (container instanceof MessagingContainer)
          {
-            ubmd = new MDBMetaData();
+            ejbMetaData = new MDBMetaData();
             log.warn("No implemented: initialize MDB destination");
             //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
          }
 
-         if (ubmd != null)
+         if (ejbMetaData != null)
          {
-            ubmd.setEjbName(container.getEjbName());
-            ubmd.setEjbClass(container.getBeanClassName());
+            ejbMetaData.setEjbName(container.getEjbName());
+            ejbMetaData.setEjbClass(container.getBeanClassName());
 
-            JBossEnterpriseBeanMetaData bean = container.getXml();
-//            Ejb3PortComponent pcmd = (bean != null ? bean.getPortComponent() : null);
-//            if (pcmd != null)
-//            {
-//               ubmd.setPortComponentName(pcmd.getPortComponentName());
-//               ubmd.setPortComponentURI(pcmd.getPortComponentURI());
-//               EJBSecurityMetaData smd = new EJBSecurityMetaData();
-//               smd.setAuthMethod(pcmd.getAuthMethod());
-//               smd.setTransportGuarantee(pcmd.getTransportGuarantee());
-//               smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
-//               ubmd.setSecurityMetaData(smd);
-//            }
-
-            ubmdList.add(ubmd);
-            throw new RuntimeException("NYI");
+            ejbMetaDataList.add(ejbMetaData);
          }
       }
-      umd.setEnterpriseBeans(ubmdList);
+      jarMetaData.setEnterpriseBeans(ejbMetaDataList);
    }
 
    private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)