Author: asoldano Date: 2015-01-14 10:36:15 -0500 (Wed, 14 Jan 2015) New Revision: 19375 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl Log: Use maven-resources-plugin filter to avoid hardcoding port numbers including offsets Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -150,7 +150,7 @@ protected static String getEndpointURL(String host) { - return "http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint"; + return "http://" + host + "/jaxws-cxf-bus/EndpointService/Endpoint"; } protected static void performSOAPCall(String endpointAddress) throws SOAPException, MalformedURLException Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -218,8 +218,8 @@ deployer.deploy(SERVLET_CLIENT_DEP); try { - final String host = baseURL.getHost(); - final String clientAddress = baseURL.getProtocol() + "://" + host + ":" + baseURL.getPort() + "/jaxws-cxf-bus-servlet-client"; + final String host = baseURL.getHost() + ":" + baseURL.getPort(); + final String clientAddress = baseURL.getProtocol() + "://" + host + "/jaxws-cxf-bus-servlet-client"; URL url = new URL(clientAddress + "?method=testBusCreation"); assertEquals("OK testBusCreation", IOUtils.readAndCloseStream(url.openStream())); @@ -247,7 +247,7 @@ InitialContext iniCtx = null; try { - String host = getServerHost(); + String host = getServerHost() + ":" + getServerPort(); iniCtx = getServerInitialContext(); Object obj = iniCtx.lookup("jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; @@ -272,7 +272,7 @@ public void testClient() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testClient("Foo", getServerHost())); + assertEquals("Foo", port.testClient("Foo", getServerHost() + ":" + getServerPort())); } @Test @@ -281,7 +281,7 @@ public void testCachedPort() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testCachedPort("Foo", getServerHost())); + assertEquals("Foo", port.testCachedPort("Foo", getServerHost() + ":" + getServerPort())); } @Test @@ -290,7 +290,7 @@ public void testCachedService() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testCachedService("Foo", getServerHost())); + assertEquals("Foo", port.testCachedService("Foo", getServerHost() + ":" + getServerPort())); } private ClientEndpoint getPort() throws Exception { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -68,7 +68,7 @@ private static URL getWsdlURL(String host) throws Exception { - return new URL("http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint?wsdl"); + return new URL("http://" + host + "/jaxws-cxf-bus/EndpointService/Endpoint?wsdl"); } private static Endpoint getPort(URL wsdlURL) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -151,7 +151,7 @@ private String runTestInContainer(String test) throws Exception { URL url = new URL("http://" + getServerHost() - + ":28080/jaxws-cxf-clientConfig-inContainer-def-client?path=/jaxws-cxf-clientConfig-def/EndpointImpl&method=" + test + + ":" + getServerPort(CXF_TESTS_GROUP_QUALIFIER, DEFAULT_CONFIG_TESTS_SERVER) + "/jaxws-cxf-clientConfig-inContainer-def-client?path=/jaxws-cxf-clientConfig-def/EndpointImpl&method=" + test + "&helper=" + Helper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -221,7 +221,7 @@ @Override public InetSocketAddress getChainedProxyAddress() { - return new InetSocketAddress(getServerHost(), 8080); + return new InetSocketAddress(getServerHost(), getServerPort()); } }); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -79,13 +79,15 @@ AddressingProperties addrProperties = new AddressingProperties(); EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); - epr.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/faultTo"); + String serverHost = getServerHost(); + int serverPort = getServerPort(); + epr.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/faultTo"); faultTo.setAddress(epr); addrProperties.setFaultTo(faultTo); EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); - replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/replyTo"); + replyToURI.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/replyTo"); replyTo.setAddress(replyToURI); addrProperties.setReplyTo(replyTo); @@ -111,13 +113,15 @@ EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); - epr.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/faultTo"); + String serverHost = getServerHost(); + int serverPort = getServerPort(); + epr.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/faultTo"); faultTo.setAddress(epr); addrProperties.setFaultTo(faultTo); EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); - replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/replyTo"); + replyToURI.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/replyTo"); replyTo.setAddress(replyToURI); addrProperties.setReplyTo(replyTo); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -86,7 +86,7 @@ @RunAsClient public void testServerSide() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-udp-api"); + URL url = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-cxf-udp-api"); assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -65,12 +65,11 @@ { SessionEndpoint proxy = this.createPort(); SessionEndpoint proxy2 = this.createPort(); + String addr = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-session/session"; ((BindingProvider) proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); - ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://localhost:8080/jaxws-samples-session/session"); + ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr); ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); - ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://localhost:8080/jaxws-samples-session/session"); + ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr); proxy.setNumber(10); assertEquals("Number is 10", proxy.getNumber()); proxy2.setNumber(20); @@ -81,7 +80,7 @@ public SessionEndpoint createPort() throws Exception { QName serviceName = new QName("http://jboss.org/jaxws-samples-session";, "SessionService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-session/session?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-session/session?wsdl"); Service service = Service.create(wsdlURL, serviceName); SessionEndpoint proxy = (SessionEndpoint) service.getPort(SessionEndpoint.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -104,9 +104,11 @@ } final QName typeName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsdd";, "ServiceIface"); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd/WSDDService", typeName); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/WSDDService", typeName); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/AnotherWSDDService", typeName); + final String serverHost = getServerHost(); + final int serverPort = getServerPort(); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd/WSDDService", typeName); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd2/WSDDService", typeName); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd2/AnotherWSDDService", typeName); client.close(); } finally { bus.shutdown(true); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -127,8 +127,8 @@ // public void testServerSide() throws Exception // { -// URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" + -// "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName()); +// URL url = new URL(baseURL + +// "?path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName()); // BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); // assertEquals("1", br.readLine()); // } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -65,14 +65,10 @@ private static final String SSL_MUTUAL_AUTH_SERVER = "ssl-mutual-auth"; private final String NS = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples"; - //TODO use a proper mechanism for figuring out host/port - private final String serviceURL = "http://" + getServerHost() + ":18080/jaxws-samples-wsse-policy-oasis-23x/"; - private final String serviceURLHttps = "https://" + getServerHost() + ":18443/jaxws-samples-wsse-policy-oasis-23x/"; + private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort(CXF_TESTS_GROUP_QUALIFIER, SSL_MUTUAL_AUTH_SERVER) + "/jaxws-samples-wsse-policy-oasis-23x/"; + private final String serviceURLHttps = "https://" + getServerHost() + ":" + (getServerPort(CXF_TESTS_GROUP_QUALIFIER, SSL_MUTUAL_AUTH_SERVER) + 363) + "/jaxws-samples-wsse-policy-oasis-23x/"; private final QName serviceName = new QName(NS, "SecurityService"); -// @ArquillianResource -// private URL baseURL; - @ArquillianResource private Deployer deployer; Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl =================================================================== (Binary files differ) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -50,7 +50,7 @@ </wsdl:binding> <wsdl:service name="EndpointService"> <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl =================================================================== (Binary files differ) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -50,7 +50,7 @@ </wsdl:binding> <wsdl:service name="EndpointService"> <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -55,7 +55,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-cxf-sec" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-sec" /> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -82,7 +82,7 @@ <wsdl:service name="SOAPService"> <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding"> - <soap:address location="http://localhost:8080/helloworld" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/helloworld" /> </wsdl:port> </wsdl:service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -30,7 +30,7 @@ </wsdl:binding> <wsdl:service name="ServiceOne"> <wsdl:port binding="tns:ServiceOneSoapBinding" name="EndpointOnePort"> - <soap:address location="http://localhost:8080/jaxws-cxf-jbws3628/ServiceOne"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-jbws3628/ServiceOne"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -4,6 +4,6 @@ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <wsdl:import namespace="http://test.jbws3792/" - location="http://localhost:8080/jbws3792-external-wsdl/import.wsdl"/> + location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-external-wsdl/import.wsdl"/> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -17,7 +17,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -6,7 +6,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" <wsdl:import namespace="http://hello/test" - location="http://localhost:8080/jbws3792-hello/HelloService?wsdl" /> + location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-hello/HelloService?wsdl" /> <wsdl:portType name="GreetingsService"> </wsdl:portType> @@ -17,7 +17,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -48,7 +48,7 @@ </wsdl:binding> <wsdl:service name="MtomService"> <wsdl:port name="MtomServicePort" binding="tns:MtomServiceSoapBinding"> - <soap:address location="http://localhost:8080/MtomService"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/MtomService"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -56,10 +56,10 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" /> </port> <port name="ValidatingHelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/validatingHello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/validatingHello" /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -49,7 +49,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -56,7 +56,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-sign"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-sign"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -38,7 +38,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-unsecure-transport"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-unsecure-transport"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-digest"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-digest"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-ejb"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-ejb"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-ejb"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-ejb"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -89,16 +89,16 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService221Port" binding="tns:SecurityService221PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService221"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService221"/> </wsdl:port> <wsdl:port name="SecurityService222Port" binding="tns:SecurityService222PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService222"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService222"/> </wsdl:port> <wsdl:port name="SecurityService223Port" binding="tns:SecurityService223PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService223"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService223"/> </wsdl:port> <wsdl:port name="SecurityService224Port" binding="tns:SecurityService224PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService224"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService224"/> </wsdl:port> </wsdl:service> <!-- 2.2.1 (WSS1.0) X.509 Certificates, Sign, Encrypt --> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -111,22 +111,22 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService2111Port" binding="tns:SecurityService2111PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2111"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2111"/> </wsdl:port> <wsdl:port name="SecurityService2112Port" binding="tns:SecurityService2112PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2112"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2112"/> </wsdl:port> <wsdl:port name="SecurityService2113Port" binding="tns:SecurityService2113PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2113"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2113"/> </wsdl:port> <wsdl:port name="SecurityService2121Port" binding="tns:SecurityService2121PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2121"/> </wsdl:port> <wsdl:port name="SecurityService213Port" binding="tns:SecurityService213PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService213"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService213"/> </wsdl:port> <wsdl:port name="SecurityService214Port" binding="tns:SecurityService214PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService214"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService214"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -152,7 +152,7 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService2311Port" binding="tns:SecurityService2311PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> </wsdl:port> <wsdl:port name="SecurityService2312Port" binding="tns:SecurityService2312PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2312"/> @@ -161,13 +161,13 @@ <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2313"/> </wsdl:port> <wsdl:port name="SecurityService2314Port" binding="tns:SecurityService2314PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> </wsdl:port> <wsdl:port name="SecurityService2315Port" binding="tns:SecurityService2315PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> </wsdl:port> <wsdl:port name="SecurityService2321Port" binding="tns:SecurityService2321PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> </wsdl:port> <wsdl:port name="SecurityService2322Port" binding="tns:SecurityService2322PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2322"/> @@ -176,7 +176,7 @@ <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2323"/> </wsdl:port> <wsdl:port name="SecurityService2324Port" binding="tns:SecurityService2324PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> </wsdl:port> </wsdl:service> <!-- 2.3.1.1 (WSS1.0) SAML1.1 Assertion (Bearer) --> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-secconv"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-secconv"/> </wsdl:port> </wsdl:service> <!-- 2.4.1 (WSS 1.0) Secure Conversation bootstrapped by Mutual --> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </binding> <service name="ActAsService"> <port name="ActAsServicePort" binding="tns:ActAsServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-actas/ActAsService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-actas/ActAsService"/> </port> </service> @@ -69,9 +69,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -96,10 +96,10 @@ </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -96,10 +96,10 @@ </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </binding> <service name="OnBehalfOfService"> <port name="OnBehalfOfServicePort" binding="tns:OnBehalfOfServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/> </port> </service> @@ -69,9 +69,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -66,7 +66,7 @@ </wsdl:binding> <wsdl:service name="PicketLinkSTS"> <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding"> - <soap12:address location="http://@jboss.bind.address@:8080/picketlink-sts/PicketLinkSTS"/> + <soap12:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/picketlink-sts/PicketLinkSTS"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust/SecurityService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust/SecurityService"/> </port> </service> @@ -68,9 +68,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -210,7 +210,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityTokenService/UT"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -210,7 +210,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityTokenService/UT"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -181,7 +181,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityTokenService/UT" /> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -46,7 +46,7 @@ <wsdl:service name="SaajService"> <wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding"> - <soap:address location="http://localhost:8080/SaajService"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SaajService"/> </wsdl:port> </wsdl:service>