[jbossws-commits] JBossWS SVN: r2802 - trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-04-11 12:44:27 -0400 (Wed, 11 Apr 2007)
New Revision: 2802

Modified:
   trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
Log:
Add support for <port-component> on generic ejb3

Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java	2007-04-11 16:31:45 UTC (rev 2801)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java	2007-04-11 16:44:27 UTC (rev 2802)
@@ -32,10 +32,9 @@
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
-import org.jboss.ejb3.metamodel.SessionEnterpriseBean;
-import org.jboss.ejb3.metamodel.Ejb3PortComponent;
 import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.metamodel.Ejb3PortComponent;
+import org.jboss.ejb3.metamodel.EnterpriseBean;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ApplicationMetaData;
 import org.jboss.metadata.BeanMetaData;
@@ -98,25 +97,21 @@
          ubmd.setEjbClass(container.getBeanClassName());
 
          EnterpriseBean dd = container.getXml();
-         if(dd!=null && (dd instanceof SessionEnterpriseBean))
+         
+         // TODO: How do we deal with this?
+         if (dd.getPortComponents().size() > 1)
+            throw new IllegalArgumentException("TODO: Cannot handle more than one port-component per bean");
+
+         for (Ejb3PortComponent portComp : dd.getPortComponents())
          {
-            SessionEnterpriseBean sessionDD = (SessionEnterpriseBean)dd;
+            UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
+            ejbPortComp.setPortComponentName(portComp.getPortComponentName());
+            ejbPortComp.setPortComponentURI(portComp.getPortComponentURI());
+            ejbPortComp.setAuthMethod(portComp.getAuthMethod());
+            ejbPortComp.setTransportGuarantee(portComp.getTransportGuarantee());
+            ejbPortComp.setSecureWSDLAccess(portComp.getSecureWSDLAccess());
 
-            // TODO: How do we deal with this?
-            if(sessionDD.getPortComponents().size()>1)
-               throw new IllegalArgumentException("TODO: Cannot handle more than one port-component per bean");
-
-            for(Ejb3PortComponent portComp : sessionDD.getPortComponents())
-            {
-               UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
-               ejbPortComp.setPortComponentName(portComp.getPortComponentName());
-               ejbPortComp.setPortComponentURI(portComp.getPortComponentURI());
-               ejbPortComp.setAuthMethod(portComp.getAuthMethod());
-               ejbPortComp.setTransportGuarantee(portComp.getTransportGuarantee());
-               ejbPortComp.setSecureWSDLAccess(portComp.getSecureWSDLAccess());
-
-               ubmd.setPortComponent(ejbPortComp);
-            }
+            ubmd.setPortComponent(ejbPortComp);
          }
       }
       return ubmd;
@@ -136,7 +131,8 @@
 
    private static PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
    {
-      return new PublishLocationAdapter() {
+      return new PublishLocationAdapter()
+      {
          public String getWsdlPublishLocationByName(String name)
          {
             return apmd.getWsdlPublishLocationByName(name);