[JBWS-4403]:Remove resources-plugin-filters in jbossws-cxf testsuite

jbossws · Dec 6, 2023 · fb0232c · fb0232c
1 parent 79f3cf5
commit fb0232c
Show file tree

Hide file tree

Showing 85 changed files with 150 additions and 139 deletions.
diff --git a/modules/testsuite/cloud-tests/k8s/wsse/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cloud-tests/k8s/wsse/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl
@@ -58,7 +58,7 @@
   </binding>
   <service name="SecurityService">
     <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/>
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-username-jaas"/>
     </port>
   </service>
 

diff --git a/...stsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl b/...stsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl
@@ -44,7 +44,7 @@
   </binding>
   <service name="SecurityService">
     <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust/SecurityService"/>
+      <soap:address location="http://@jboss.bind.address@:@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@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
+										<wsaws:Address>http://@jboss.bind.address@:@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@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+										                wsdli:wsdlLocation="http://@jboss.bind.address@:@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>

diff --git a/...tsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl b/...tsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
@@ -181,7 +181,7 @@
 
   <wsdl:service name="SecurityTokenService">
       <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-         <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityTokenService/UT" />
+         <soap:address location="http://localhost:@cxf-tests.jboss_8080@/SecurityTokenService/UT" />
       </wsdl:port>
   </wsdl:service>
 

diff --git a/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml b/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
@@ -11,9 +11,9 @@
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
             <property name="jbossArguments">${jbossArguments}</property>
-            <property name="managementPort">${add_int(port-offset.cxf-tests.jboss,9990)}</property>
+            <property name="managementPort">${cxf-tests.jboss_9990}</property>
             <!-- AS7-4070 -->
-            <property name="waitForPorts">${add_int(port-offset.cxf-tests.jboss,8787)} ${add_int(port-offset.cxf-tests.jboss,9990)}</property>
+            <property name="waitForPorts">${cxf-tests.jboss_8787} ${cxf-tests.jboss_9990}</property>
             <property name="waitForPortsTimeoutInSeconds">8</property>
             <property name="startupTimeoutInSeconds">${startupTimeoutInSeconds:60}</property>
         </configuration>
@@ -26,9 +26,9 @@
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
             <property name="jbossArguments">${jbossArguments}</property>
-            <property name="managementPort">${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
+            <property name="managementPort">${cxf-tests.ssl-mutual-auth_9990}</property>
             <!-- AS7-4070 -->
-            <property name="waitForPorts">${add_int(port-offset.cxf-tests.ssl-mutual-auth,8787)} ${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
+            <property name="waitForPorts">${cxf-tests.ssl-mutual-auth_8787} ${cxf-tests.ssl-mutual-auth_9990}</property>
             <property name="waitForPortsTimeoutInSeconds">8</property>
             <property name="startupTimeoutInSeconds">${startupTimeoutInSeconds:60}</property>
         </configuration>
@@ -41,9 +41,9 @@
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
             <property name="jbossArguments">${jbossArguments}</property>
-            <property name="managementPort">${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
+            <property name="managementPort">${cxf-tests.default-config-tests_9990}</property>
             <!-- AS7-4070 -->
-            <property name="waitForPorts">${add_int(port-offset.cxf-tests.default-config-tests,8787)} ${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
+            <property name="waitForPorts">${cxf-tests.default-config-tests_8787} ${cxf-tests.default-config-tests_9990}</property>
             <property name="waitForPortsTimeoutInSeconds">8</property>
             <property name="startupTimeoutInSeconds">${startupTimeoutInSeconds:60}</property>
         </configuration>
@@ -56,9 +56,9 @@
             <property name="allowConnectingToRunningServer">true</property>
             <property name="managementAddress">${jboss.bind.address:localhost}</property>
             <property name="jbossArguments">${jbossArguments}</property>
-            <property name="managementPort">${add_int(port-offset.cxf-tests.jms,9990)}</property>
+            <property name="managementPort">${cxf-tests.jms_9990}</property>
             <!-- AS7-4070 -->
-            <property name="waitForPorts">${add_int(port-offset.cxf-tests.jms,8787)} ${add_int(port-offset.cxf-tests.jms,9990)}</property>
+            <property name="waitForPorts">${cxf-tests.jms_8787} ${cxf-tests.jms_9990}</property>
             <property name="waitForPortsTimeoutInSeconds">8</property>
             <property name="startupTimeoutInSeconds">${startupTimeoutInSeconds:60}</property>
         </configuration>

diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl
@@ -50,7 +50,7 @@
   </wsdl:binding>
   <wsdl:service name="EndpointService">
     <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/InvalidEndpoint" />
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-cxf-bus/EndpointService/InvalidEndpoint" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl
@@ -50,7 +50,7 @@
   </wsdl:binding>
   <wsdl:service name="EndpointService">
     <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" />
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-cxf-bus/EndpointService/Endpoint" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl
@@ -50,7 +50,7 @@
   </wsdl:binding>
   <wsdl:service name="EndpointService">
     <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" />
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-cxf-bus/EndpointService/Endpoint" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/...es/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl b/...es/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl
@@ -50,7 +50,7 @@
   </wsdl:binding>
   <wsdl:service name="EndpointService">
     <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" />
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-cxf-bus/EndpointService/Endpoint" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl
@@ -55,7 +55,7 @@
     </binding>
     <service name="HelloService">
         <port name="HelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-sec" />
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/jaxws-cxf-sec" />
         </port>
     </service>
 </definitions>
diff --git a/...uite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl b/...uite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl
@@ -55,7 +55,7 @@
     </binding>
     <service name="HelloService">
         <port name="HelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8443)@/jaxws-cxf-sec" />
+            <soap:address location="http://localhost:@cxf-tests.ssl-mutual-auth_8443@/jaxws-cxf-sec" />
         </port>
     </service>
 </definitions>
diff --git a/...s/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl b/...s/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl
@@ -82,7 +82,7 @@
 
 	<wsdl:service name="SOAPService">
 		<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
-			<soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/helloworld" />
+			<soap:address location="http://localhost:@cxf-tests.jboss_8080@/helloworld" />
 		</wsdl:port>
 	</wsdl:service>
 </definitions>
diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl
@@ -30,7 +30,7 @@
   </wsdl:binding>
   <wsdl:service name="ServiceOne">
     <wsdl:port binding="tns:ServiceOneSoapBinding" name="EndpointOnePort">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-jbws3628/ServiceOne"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/jaxws-cxf-jbws3628/ServiceOne"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl
@@ -44,7 +44,7 @@
 
   <wsdl:service name="HelloService">
     <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/HelloServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...e/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl b/...e/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl
@@ -4,6 +4,6 @@
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
 
   <wsdl:import namespace="http://test.jbws3792/"
-               location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-external-wsdl/import.wsdl"/>
+               location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jbws3792-external-wsdl/import.wsdl"/>
 
 </wsdl:definitions>
diff --git a/.../testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml b/.../testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
@@ -2,7 +2,7 @@
 <webservices xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://Hello.org" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" version="1.2">
   <webservice-description>
     <webservice-description-name>JBWS3792WSService</webservice-description-name>
-    <wsdl-file>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
+    <wsdl-file>http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
     <port-component>
       <service-impl-bean>
         <servlet-link>org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl</servlet-link>

diff --git a/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl b/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl
@@ -18,7 +18,7 @@
 
   <wsdl:service name="GreetingsService">
     <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/GreetingsServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...e/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl b/...e/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl
@@ -44,7 +44,7 @@
 
   <wsdl:service name="HelloService">
     <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/HelloServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/.../src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl b/.../src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl
@@ -18,7 +18,7 @@
 
   <wsdl:service name="GreetingsService">
     <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/GreetingsServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...te/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl b/...te/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl
@@ -44,7 +44,7 @@
 
   <wsdl:service name="HelloService">
     <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/HelloServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...f-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl b/...f-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl
@@ -44,7 +44,7 @@
 
     <wsdl:service name="HelloService">
         <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/>
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/HelloServicePort"/>
         </wsdl:port>
     </wsdl:service>
 

diff --git a/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl b/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl
@@ -17,7 +17,7 @@
 
   <wsdl:service name="GreetingsService">
     <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/GreetingsServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...c/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl b/...c/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl
@@ -6,7 +6,7 @@
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   >
   <wsdl:import namespace="http://hello/test"
-               location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-hello/HelloService?wsdl" />
+               location="http://@jboss.bind.address@:@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:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/GreetingsServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...f-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl b/...f-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl
@@ -44,7 +44,7 @@
 
   <wsdl:service name="HelloService">
     <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/HelloServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl b/...src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl
@@ -18,7 +18,7 @@
 
   <wsdl:service name="GreetingsService">
     <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsServicePort"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/GreetingsServicePort"/>
     </wsdl:port>
   </wsdl:service>
 

diff --git a/...testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl b/...testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl
@@ -65,7 +65,7 @@
   <wsdl:service name="HelloWorldService">
     <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
     <soapjms:jndiInitialContextFactory>@jboss.initial.context.factory@</soapjms:jndiInitialContextFactory>
-    <soapjms:jndiURL>@jboss.remoting.protocol@://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jms,8080)@</soapjms:jndiURL>
+    <soapjms:jndiURL>@jboss.remoting.protocol@://@jboss.bind.address@:@cxf-tests.jms_8080@</soapjms:jndiURL>
     <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
       <soap:address location="jms:queue:testQueue"/>
     </wsdl:port>

diff --git a/...suite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl b/...suite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
@@ -65,12 +65,12 @@
   <wsdl:service name="HelloWorldService">
     <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
     <soapjms:jndiInitialContextFactory>@jboss.initial.context.factory@</soapjms:jndiInitialContextFactory>
-    <soapjms:jndiURL>@jboss.remoting.protocol@://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jms,8080)@</soapjms:jndiURL>
+    <soapjms:jndiURL>@jboss.remoting.protocol@://@jboss.bind.address@:@cxf-tests.jms_8080@</soapjms:jndiURL>
     <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
       <soap:address location="jms:queue:testQueue"/>
     </wsdl:port>
     <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jms,8080)@/jaxws-cxf-jms-http-deployment"/>
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jms_8080@/jaxws-cxf-jms-http-deployment"/>
     </wsdl:port>
   </wsdl:service>
   <wsdl:service name="HelloWorldServiceLocal">

diff --git a/...s/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl b/...s/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl
@@ -48,7 +48,7 @@
   </wsdl:binding>
   <wsdl:service name="MtomService">
     <wsdl:port name="MtomServicePort" binding="tns:MtomServiceSoapBinding">
-      <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/MtomService"/>
+      <soap:address location="http://localhost:@cxf-tests.jboss_8080@/MtomService"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/...suite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl b/...suite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl
@@ -56,10 +56,10 @@
     </binding>
     <service name="HelloService">
         <port name="HelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" />
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/schemavalidation/hello" />
         </port>
         <port name="ValidatingHelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/validatingHello" />
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/schemavalidation/validatingHello" />
         </port>
     </service>
 </definitions>
diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl
@@ -49,7 +49,7 @@
     </binding>
     <service name="HelloService">
         <port name="HelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" />
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/schemavalidation/hello" />
         </port>
     </service>
 </definitions>
diff --git a/...stsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl b/...stsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl
@@ -56,7 +56,7 @@
     </binding>
     <service name="HelloService">
         <port name="HelloPort" binding="tns:HelloBinding">
-            <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalidation/hello" />
+            <soap:address location="http://localhost:@cxf-tests.jboss_8080@/schemavalidation/hello" />
         </port>
     </service>
 </definitions>
diff --git a/.../src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl b/.../src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl
@@ -40,7 +40,7 @@
   </binding>
   <service name="SecurityService">
     <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/>
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wssePolicy-sign-encrypt"/>
     </port>
   </service>
 

diff --git a/.../resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl b/.../resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
@@ -40,7 +40,7 @@
   </binding>
   <service name="SecurityService">
     <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-      <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/>
+      <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wssePolicy-sign-encrypt"/>
     </port>
   </service>