Author: darran.lofthouse(a)jboss.com Date: 2008-07-16 13:20:43 -0400 (Wed, 16 Jul 2008) New Revision: 7835 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/pom.xml Log: [JBWS-981] Virtual host configuration for EJB endpoints. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2008-07-16 17:20:43 UTC (rev 7835) @@ -165,12 +165,5 @@ // secure wsdl access sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess()); - - // virtual hosts - String[] virtualHosts = anWebContext.virtualHosts(); - if (virtualHosts != null & virtualHosts.length > 0) - { - sepMetaData.setVirtualHosts(virtualHosts); - } } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2008-07-16 17:20:43 UTC (rev 7835) @@ -64,8 +64,6 @@ private ObjectName sepID; // The HTTP context root private String contextRoot; - // The HTTP virtual hosts - private String[] virtualHosts; // The HTTP url parttern private String urlPattern; // The optional transport guarantee @@ -135,16 +133,6 @@ this.sepID = endpointID; } - public String[] getVirtualHosts() - { - return virtualHosts; - } - - public void setVirtualHosts(String[] virtualHosts) - { - this.virtualHosts = virtualHosts; - } - public String getContextRoot() { return contextRoot; Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-07-16 17:20:43 UTC (rev 7835) @@ -33,3 +33,6 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** + +# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-16 17:20:43 UTC (rev 7835) @@ -33,3 +33,6 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** + +# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-16 17:20:43 UTC (rev 7835) @@ -17,3 +17,6 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** + +# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-16 17:20:43 UTC (rev 7835) @@ -28,3 +28,6 @@ # [JBWS-2217] Fix BPEL samples before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* \ No newline at end of file Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-07-16 17:17:56 UTC (rev 7834) +++ stack/native/trunk/pom.xml 2008-07-16 17:20:43 UTC (rev 7835) @@ -53,7 +53,7 @@ <properties> <jbossws.common.version>1.0.5.GA</jbossws.common.version> <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version> - <jbossws.spi.version>1.0.4.GA</jbossws.spi.version> + <jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version> <jbossws.jboss421.version>3.0.2.GA</jbossws.jboss421.version> <jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>