[jboss-cvs] JBossAS SVN: r84928 - in branches/Branch_5_x/webservices: src/main/org/jboss/wsf/container/jboss50/transport and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2009-03-02 05:04:13 -0500 (Mon, 02 Mar 2009)
New Revision: 84928

Modified:
   branches/Branch_5_x/webservices/build.xml
   branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
Log:
[JBAS-6497] porting fix from Branch_5_0

Modified: branches/Branch_5_x/webservices/build.xml
===================================================================
--- branches/Branch_5_x/webservices/build.xml	2009-03-02 09:34:07 UTC (rev 84927)
+++ branches/Branch_5_x/webservices/build.xml	2009-03-02 10:04:13 UTC (rev 84928)
@@ -70,10 +70,12 @@
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.jboss.cl.classpath"/>
       <path refid="jboss.jboss.ejb3.core.classpath" />   
       <path refid="jboss.jboss.ejb3.ext.api.classpath" />   
       <path refid="jboss.jboss.ejb3.interceptors.classpath" />   
       <path refid="jboss.jboss.javaee.classpath"/>
+      <path refid="jboss.jboss.man.classpath"/>
       <path refid="jboss.jboss.security.spi.classpath"/>
       <path refid="jboss.jboss.vfs.classpath"/>
       <path refid="jboss.jbosssx.classpath"/>

Modified: branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java
===================================================================
--- branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java	2009-03-02 09:34:07 UTC (rev 84927)
+++ branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java	2009-03-02 10:04:13 UTC (rev 84928)
@@ -26,6 +26,8 @@
 
 import javax.xml.ws.WebServiceException;
 
+import org.jboss.classloading.spi.dependency.ClassLoading;
+import org.jboss.classloading.spi.dependency.Module;
 import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.client.spi.DeploymentFactory;
@@ -34,10 +36,10 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
 
 /**
  * Deploy the generated webapp to JBoss
@@ -85,6 +87,7 @@
          mutableAttachments.addAttachment("org.jboss.web.explicitDocBase", "/", String.class);
          mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory(epLoader));
          mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
+         mutableAttachments.addAttachment(Module.class, ClassLoading.getModuleForClassLoader(epLoader));
          mainDeployer.deploy(deployment);
          
          deployments.put(contextRoot, deployment);
@@ -113,6 +116,7 @@
    private AbstractDeployment createSimpleDeployment(String name)
    {
       AbstractDeployment unit = new AbstractDeployment(name);
+      // There is one top level deployment
       factory.addContext(unit, "");
       return unit;
    }