Author: darran.lofthouse(a)jboss.com Date: 2008-07-31 07:12:42 -0400 (Thu, 31 Jul 2008) New Revision: 7972 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties Log: [JBPAPP-982] Virtual host configuration for EJB endpoints. Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src ___________________________________________________________________ Name: svn:externals - test-framework https://svn.jboss.org/repos/jbossws/framework/tags/jbossws-framework-2.0.... + test-framework https://svn.jboss.org/repos/jbossws/framework/branches/jbossws-framework-... Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2008-07-31 11:12:42 UTC (rev 7972) @@ -146,12 +146,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/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2008-07-31 11:12:42 UTC (rev 7972) @@ -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 @@ -140,16 +138,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/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-07-31 11:12:42 UTC (rev 7972) @@ -28,6 +28,7 @@ import javax.management.ObjectName; import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; /** * @@ -36,6 +37,7 @@ */ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") +@WebContext(virtualHosts = { "localhost", "www.jboss.org" }) public class EJB3Bean implements EJB3RemoteInterface { @@ -45,7 +47,7 @@ { try { - MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer("jboss").get(0); + MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0); ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule...; mbeanServer.getMBeanInfo(on); } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2008-07-31 11:12:42 UTC (rev 7972) @@ -16,7 +16,6 @@ @WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(virtualHosts = { "localhost", "www.jboss.org" }) public interface EndpointInterface { String hello(String msg); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-07-31 11:12:42 UTC (rev 7972) @@ -50,7 +50,6 @@ protected void setUp() throws Exception { super.setUp(); - if (true) return; if (port == null) { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl"); @@ -63,10 +62,7 @@ public void testCall() throws Exception { - System.out.println("FIXME: [JBWS-981] Virtual host configuration for EJB endpoints"); - if (true) return; - - String message = "hello"; + String message = "Web service mapped to virtual host."; assertEquals("Web service mapped to virtual host.", port.hello(message)); } } \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-07-31 10:59:40 UTC (rev 7971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-07-31 11:12:42 UTC (rev 7972) @@ -24,11 +24,11 @@ wscommons-policy=1.0 # Dependend integration projects -jbossws-spi=1.0.0.GA -jbossws-common=1.0.0.GA_CP01 -jbossws-framework=2.0.1.GA +jbossws-spi=1.0.0.GA_CP-SNAPSHOT +jbossws-common=1.0.0.GA_CP-SNAPSHOT +jbossws-framework=2.0.1.GA_CP-SNAPSHOT jbossws-jboss40=2.0.1.GA -jbossws-jboss42=2.0.1.GA +jbossws-jboss42=2.0.1.GA_CP-SNAPSHOT # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR4