[jboss-cvs] JBossAS SVN: r68727 - branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42.

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

Author: thomas.diesler at jboss.com
Date: 2008-01-09 07:25:58 -0500 (Wed, 09 Jan 2008)
New Revision: 68727

Modified:
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
Log:
[JBWS-1911] Support the JMS transport with JAX-WS

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java	2008-01-09 10:37:47 UTC (rev 68726)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java	2008-01-09 12:25:58 UTC (rev 68727)
@@ -24,13 +24,16 @@
 // $Id: EJBArchiveMetaDataAdapterEJB3.java 4013 2007-07-27 04:37:52Z thomas.diesler at jboss.com $
 
 import java.util.ArrayList;
+import java.util.Map;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.mdb.MessagingContainer;
 import org.jboss.ejb3.stateless.StatelessContainer;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ActivationConfigPropertyMetaData;
 import org.jboss.mx.util.MBeanProxy;
 import org.jboss.mx.util.MBeanProxyCreationException;
 import org.jboss.mx.util.MBeanServerLocator;
@@ -38,6 +41,7 @@
 import org.jboss.wsf.spi.deployment.WSFDeploymentException;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
 
 /**
@@ -50,15 +54,15 @@
 {
    // logging support
    private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class);
-   
+
    public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object";
 
    public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep)
    {
       EJBArchiveMetaData appMetaData = null;
-      
+
       ObjectName oname = (ObjectName)dep.getProperty(DEPLOYED_OBJECT);
-      
+
       // jboss.j2ee:service=EJB3,module=some-ejb3.jar
       if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service")))
       {
@@ -70,11 +74,29 @@
             if (container instanceof StatelessContainer)
             {
                StatelessContainer slc = (StatelessContainer)container;
-               EJBMetaData usmd = new SLSBMetaData();
+               SLSBMetaData usmd = new SLSBMetaData();
                usmd.setEjbName(slc.getEjbName());
                usmd.setEjbClass(slc.getBeanClassName());
                beans.add(usmd);
             }
+            else if (container instanceof MessagingContainer)
+            {
+               MessagingContainer mdb = (MessagingContainer)container;
+               MDBMetaData umdb = new MDBMetaData();
+               umdb.setEjbName(mdb.getEjbName());
+               umdb.setEjbClass(mdb.getBeanClassName());
+               Map props = mdb.getActivationConfigProperties();
+               if (props != null)
+               {
+                  ActivationConfigPropertyMetaData destProp = (ActivationConfigPropertyMetaData)props.get("destination");
+                  if (destProp != null)
+                  {
+                     String destination = destProp.getValue();
+                     umdb.setDestinationJndiName(destination);
+                  }
+               }
+               beans.add(umdb);
+            }
          }
 
          appMetaData = new EJBArchiveMetaData();

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java	2008-01-09 10:37:47 UTC (rev 68726)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java	2008-01-09 12:25:58 UTC (rev 68727)
@@ -29,6 +29,7 @@
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.mdb.MessagingContainer;
 import org.jboss.ejb3.stateless.StatelessContainer;
 import org.jboss.wsf.common.URLLoaderAdapter;
 import org.jboss.wsf.spi.deployment.ArchiveDeployment;
@@ -110,7 +111,7 @@
    private boolean isWebServiceBean(EJBContainer container)
    {
       boolean isWebServiceBean = false;
-      if (container instanceof StatelessContainer)
+      if (container instanceof StatelessContainer || container instanceof MessagingContainer)
       {
          boolean isWebService = container.resolveAnnotation(WebService.class) != null;
          boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null;