Author: richard.opalka(a)jboss.com Date: 2009-02-13 16:45:53 -0500 (Fri, 13 Feb 2009) New Revision: 9305 Modified: container/jboss50/branches/jboss501/pom.xml container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java Log: [JBAS-6496] sync with AS code base Modified: container/jboss50/branches/jboss501/pom.xml =================================================================== --- container/jboss50/branches/jboss501/pom.xml 2009-02-13 21:30:24 UTC (rev 9304) +++ container/jboss50/branches/jboss501/pom.xml 2009-02-13 21:45:53 UTC (rev 9305) @@ -33,13 +33,14 @@ --> <jboss.version>5.0.1-SNAPSHOT</jboss.version> <jboss.ejb3.version>1.0.0</jboss.ejb3.version> - <jboss.deployers.version>2.0.3.GA</jboss.deployers.version> + <jboss.deployers.version>2.2.0-SNAPSHOT</jboss.deployers.version> <jboss.jbossxb.version>2.0.0.GA</jboss.jbossxb.version> <jboss.metadata.version>1.0.0.CR16</jboss.metadata.version> - <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version> + <jboss.microcontainer.version>2.2.0-SNAPSHOT</jboss.microcontainer.version> <jboss.reflect.version>2.0.2.GA</jboss.reflect.version> - <jboss.security.version>2.0.2.SP3</jboss.security.version> - <jboss.vfs.version>2.0.0.GA</jboss.vfs.version> + <jboss.security.version>2.0.2.SP6</jboss.security.version> + <jboss.vfs.version>2.2.0-SNAPSHOT</jboss.vfs.version> + <jboss.cl.version>2.0.3-SNAPSHOT</jboss.cl.version> </properties> <!-- DependencyManagement --> @@ -56,6 +57,11 @@ <version>${jbossws.spi.version}</version> </dependency> <dependency> + <groupId>org.jboss.cl</groupId> + <artifactId>jboss-classloading</artifactId> + <version>${jboss.cl.version}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-reflect</artifactId> <version>${jboss.reflect.version}</version> @@ -181,6 +187,10 @@ <artifactId>jboss-vfs</artifactId> </dependency> <dependency> + <groupId>org.jboss.cl</groupId> + <artifactId>jboss-classloading</artifactId> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-reflect</artifactId> </dependency> Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java =================================================================== --- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-13 21:30:24 UTC (rev 9304) +++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/DynamicEndpointDeploymentAspect.java 2009-02-13 21:45:53 UTC (rev 9305) @@ -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; @@ -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);