Author: asoldano Date: 2015-01-14 08:43:26 -0500 (Wed, 14 Jan 2015) New Revision: 19373 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl Log: Use maven-resources-plugin filter to avoid hardcoding port numbers including offsets Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-14 13:43:26 UTC (rev 19373) @@ -158,7 +158,6 @@ // send an HTTP request to the endpoint out.write(("POST /jaxws-jbws1582/TestService HTTP/1.0" + CRNL).getBytes()); - //out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes()); out.write(("Host: " + getServerHost() + ":" + getServerPort() + CRNL).getBytes()); out.write(("Content-Type: text/xml" + CRNL).getBytes()); out.write(("Content-Length: " + content.length() + CRNL).getBytes()); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2015-01-14 13:43:26 UTC (rev 19373) @@ -56,8 +56,6 @@ @RunWith(Arquillian.class) public class JBWS1807TestCase extends JBossWSTest { - //public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1807"; - @ArquillianResource private URL baseURL; Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-14 13:43:26 UTC (rev 19373) @@ -71,7 +71,7 @@ public void setUp() throws Exception { super.setUp(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2978" + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2978" + "?wsdl"); QName serviceName = new QName("http://ws.jboss.org", "AddNumbers"); service = Service.create(wsdlURL, serviceName); } @@ -81,7 +81,7 @@ public void testCall() throws Exception { setUp(); - String text = "http://" + getServerHost() + ":8080/jaxws-jbws2978"; + String text = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2978"; String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Head... xmlns='http://www.w3.org/2005/08/addressing'>" + text + "</To><Action xmlns='http://www.w3.org/2005/08/addressing'>inputAction</A... Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -193,7 +193,7 @@ </binding> <service name='HolderService'> <port binding='tns:HolderBinding' name='HolderPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-holder/HolderService'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-holder/HolderService'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -27,7 +27,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBeanBinding' name='EndpointBeanPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1581-pojo'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws1581-pojo'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -33,7 +33,7 @@ <service name='EndpointService'> <port binding='tns:EndpointInterfaceBinding' name='EJB3BeanPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1841/EndpointService/EJB3Bean'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws1841/EndpointService/EJB3Bean'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -38,7 +38,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://127.0.0.1:38080/jaxws-jbws1969'/> + <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws1969'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -45,7 +45,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://127.0.0.1:38080/jaxws-jbws2412'/> + <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2412'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -32,7 +32,7 @@ </binding> <service name="SOAP12EndpointBeanService"> <port name="SOAP12EndpointPort" binding="tns:SOAP12EndpointBinding"> - <soap12:address location="http://127.0.0.1:38080/jaxws-jbws2419/soap12"/> + <soap12:address location="http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2419/soap12"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -48,7 +48,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://127.0.0.1:38080/jaxws-jbws2449'/> + <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2449'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -31,7 +31,7 @@ </binding> <service name="MarshallTestService"> <port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding"> - <soap:address location="http://@jboss.bind.address@:38080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/W2JDLMarshallTest/jaxws/NewSchemaTest" /> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -25,7 +25,7 @@ </binding> <service name="Service"> <port binding="tns:HelloIfaceBinding" name="HelloImplPort"> - <soap:address location="http://@jboss.bind.address@:38080/foo/bar"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/foo/bar"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -29,7 +29,7 @@ </binding> <service name="EndpointService"> <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws3223"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws3223"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -45,7 +45,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://127.0.0.1:38080/jaxws-jbws3401'/> + <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws3401'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -56,7 +56,7 @@ </binding> <service name='TestService'> <port binding='tns:StatefulEndpointBinding' name='StatefulEndpointPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-wsaddressing/TestService'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-wsaddressing/TestService'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -41,7 +41,7 @@ </binding> <service name="CCVerificationService"> <port binding="tns:CCVerificationBinding" name="CCVerificationPort"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/CCVerificationBean"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/CCVerificationBean"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -59,7 +59,7 @@ </binding> <service name="OrderMgmtService"> <port binding="tns:OrderMgmtBinding" name="OrderMgmtPort"> - <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -52,7 +52,7 @@ </binding> <service name='ProfileMgmtService'> <port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -38,7 +38,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://tdvaio:38080/jaxws-samples-asynchronous/Endpoint'/> + <soap:address location='http://tdvaio:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-asynchronous/Endpoint'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -26,7 +26,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-serviceref'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -89,7 +89,7 @@ <service name='PingServiceService'> <port binding='tns:PingServiceBinding' name='PingServicePort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webparam'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webparam'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -47,7 +47,7 @@ <service name='CustomerServiceService'> <port binding='tns:CustomerServiceBinding' name='CustomerServicePort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webresult'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webresult'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -32,7 +32,7 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -45,10 +45,10 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/> </port> <port binding='tns:EndpointBinding2' name='EndpointPort2'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373) @@ -29,7 +29,7 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webservicerefsec'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webservicerefsec'/> </port> </service>