[jboss-cvs] JBossAS SVN: r76186 - in trunk: webservices/src/main/org/jboss/wsf/container/jboss50/transport and 1 other directories.

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

Author: alessio.soldano at jboss.com
Date: 2008-07-24 10:43:31 -0400 (Thu, 24 Jul 2008)
New Revision: 76186

Modified:
   trunk/component-matrix/pom.xml
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java
   trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
Log:
[JBWS-2263] Sync container integration porting Darran's changes for JBWS-981


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-07-24 14:37:28 UTC (rev 76185)
+++ trunk/component-matrix/pom.xml	2008-07-24 14:43:31 UTC (rev 76186)
@@ -35,8 +35,8 @@
     <version.jboss.jaxr>1.2.0.SP2</version.jboss.jaxr>
     <version.jboss.jbossws>3.0.2.GA</version.jboss.jbossws>
     <version.jboss.jbossws-common>1.0.5.GA</version.jboss.jbossws-common>
-    <version.jboss.jbossws-framework>3.0.2.GA</version.jboss.jbossws-framework>
-    <version.jboss.jbossws-spi>1.0.4.GA</version.jboss.jbossws-spi>
+    <version.jboss.jbossws-framework>3.0.3-SNAPSHOT</version.jboss.jbossws-framework>
+    <version.jboss.jbossws-spi>1.0.5-SNAPSHOT</version.jboss.jbossws-spi>
     <version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
     <version.jboss.web>2.1.1.CR4</version.jboss.web>
     <version.org.jboss.aop>2.0.0.CR13</version.org.jboss.aop>

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java	2008-07-24 14:37:28 UTC (rev 76185)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java	2008-07-24 14:43:31 UTC (rev 76186)
@@ -275,5 +275,10 @@
          throw new WSFDeploymentException("Cannot obtain context root");
 
       jbwmd.setContextRoot(contextRoot);
+      String[] virtualHosts = dep.getService().getVirtualHosts();
+      if (virtualHosts != null && virtualHosts.length > 0)
+      {
+         jbwmd.setVirtualHosts(Arrays.asList(virtualHosts));
+      }
    }
 }

Modified: trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml	2008-07-24 14:37:28 UTC (rev 76185)
+++ trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml	2008-07-24 14:43:31 UTC (rev 76186)
@@ -136,6 +136,11 @@
       <property name="requires">ContainerMetaData</property>
       <property name="provides">ContextRoot</property>
    </bean>
+
+   <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
+      <property name="requires">ContainerMetaData</property>
+      <property name="provides">VirtualHosts</property>
+   </bean>
    
    <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.framework.deployment.HttpTransportDeploymentAspect">
       <property name="requires">URLPattern,ContextProperties</property>
@@ -225,6 +230,7 @@
          <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
             <inject bean="WSContainerMetaDataDeploymentAspect"/>
             <inject bean="WSContextRootDeploymentAspect"/>
+            <inject bean="WSVirtualHostDeploymentAspect"/>
             <inject bean="WSHttpTransportDeploymentAspect"/>
             <inject bean="WSEndpointHandlerDeploymentAspect"/>
             <inject bean="WSEndpointLifecycleDeploymentAspect"/>