[jboss-cvs] JBossAS SVN: r66561 - in trunk/webservices/src: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.

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

Author: wolfc
Date: 2007-10-30 05:24:02 -0400 (Tue, 30 Oct 2007)
New Revision: 66561

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
   trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
Log:
EJBTHREE-1067: refactored EJB 3 onto the new metadata

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:09:52 UTC (rev 66560)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java	2007-10-30 09:24:02 UTC (rev 66561)
@@ -39,6 +39,7 @@
 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.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
@@ -122,20 +123,21 @@
             ubmd.setEjbName(container.getEjbName());
             ubmd.setEjbClass(container.getBeanClassName());
 
-            EnterpriseBean 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);
-            }
+            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");
          }
       }
       umd.setEnterpriseBeans(ubmdList);

Modified: trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	2007-10-30 09:09:52 UTC (rev 66560)
+++ trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	2007-10-30 09:24:02 UTC (rev 66561)
@@ -61,9 +61,9 @@
   -->
   <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
     <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
-    <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property>
+    <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property>
     <depends>EJB2xDeployer</depends>
-    <depends>EJBRegistrationDeployer</depends>
+    <depends>Ejb3Deployer</depends>
   </bean>
   
   <!--