[jbossws-commits] JBossWS SVN: r7834 - in container/jboss50/trunk: src/main/java/org/jboss/wsf/container/jboss50/transport and 1 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2008-07-16 13:17:56 -0400 (Wed, 16 Jul 2008) New Revision: 7834 Modified: container/jboss50/trunk/pom.xml container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml Log: [JBWS-981] Virtual host configuration for EJB endpoints. Modified: container/jboss50/trunk/pom.xml =================================================================== --- container/jboss50/trunk/pom.xml 2008-07-16 17:11:47 UTC (rev 7833) +++ container/jboss50/trunk/pom.xml 2008-07-16 17:17:56 UTC (rev 7834) @@ -25,7 +25,7 @@ <!-- Properties --> <properties> <jbossws.common.version>1.0.5.GA</jbossws.common.version> - <jbossws.spi.version>1.0.4.GA</jbossws.spi.version> + <jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version> <!-- JBoss component versions taken from Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-07-16 17:11:47 UTC (rev 7833) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-07-16 17:17:56 UTC (rev 7834) @@ -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: container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-07-16 17:11:47 UTC (rev 7833) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-07-16 17:17:56 UTC (rev 7834) @@ -137,6 +137,11 @@ <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> <property name="provides">EndpointAddress,WebMetaData</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"/>