From fb0232c3a0e5df1926086d61e7cb5d184f4b7313 Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Wed, 6 Dec 2023 11:36:45 +0800 Subject: [PATCH] [JBWS-4403]:Remove resources-plugin-filters in jbossws-cxf testsuite --- .../webapp/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../webapp/WEB-INF/wsdl/SecurityService.wsdl | 6 ++-- .../WEB-INF/wsdl/ws-trust-1.4-service.wsdl | 2 +- .../cxf-tests/src/test/etc/arquillian.xml | 16 ++++----- .../jaxws/cxf/bus/InvalidAddressEndpoint.wsdl | 2 +- .../jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl | 2 +- .../jaxws/cxf/bus/ValidAddressEndpoint.wsdl | 2 +- .../cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl | 2 +- .../cxf/httpauth/WEB-INF/wsdl/hello.wsdl | 2 +- .../WEB-INF/wsdl/helloMutualSSLport.wsdl | 2 +- .../jbws3516/WEB-INF/wsdl/hello_world.wsdl | 2 +- .../cxf/jbws3628/WEB-INF/wsdl/service.wsdl | 2 +- .../cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl | 2 +- .../externalWsdl/WEB-INF/wsdl/jbws3792.wsdl | 2 +- .../jbws3792/wsImpl/WEB-INF/webservices.xml | 2 +- .../WEB-INF/wsdl/Greeting_Simplest.wsdl | 2 +- .../wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl | 2 +- .../WEB-INF/wsdl/Greeting_Simplest.wsdl | 2 +- .../wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl | 2 +- .../WEB-INF/wsdl/A/b/Hello.wsdl | 2 +- .../WEB-INF/wsdl/Greeting_Simplest.wsdl | 2 +- .../WEB-INF/wsdl/Greeting_Simplest.wsdl | 4 +-- .../WEB-INF/wsdl/A/b/Hello.wsdl | 2 +- .../WEB-INF/wsdl/Greeting_Simplest.wsdl | 2 +- .../jms/META-INF/wsdl/HelloWorldService.wsdl | 2 +- .../WEB-INF/wsdl/HelloWorldService.wsdl | 4 +-- .../mtom/WEB-INF/wsdl/MtomService.wsdl | 2 +- .../schemavalidation/WEB-INF/wsdl/hello.wsdl | 4 +-- .../samples/schemavalidation/client.wsdl | 2 +- .../schemavalidation/validatingClient.wsdl | 2 +- .../gcm/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../META-INF-server/wsdl/SecurityService.wsdl | 2 +- .../sign/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../auth/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../digest/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../META-INF/wsdl/SecurityService.wsdl | 2 +- .../ejb/META-INF/wsdl/SecurityService.wsdl | 2 +- .../oasis/WEB-INF/wsdl/SecurityService.wsdl | 8 ++--- .../WEB-INF/wsdl/SecurityService21x.wsdl | 12 +++---- .../WEB-INF/wsdl/SecurityService23x.wsdl | 18 +++++----- .../secconv/WEB-INF/wsdl/SecurityService.wsdl | 2 +- .../trust/WEB-INF/wsdl/ActAsService.wsdl | 6 ++-- .../trust/WEB-INF/wsdl/BearerService.wsdl | 6 ++-- .../WEB-INF/wsdl/HolderOfKeyService.wsdl | 6 ++-- .../trust/WEB-INF/wsdl/OnBehalfOfService.wsdl | 6 ++-- .../trust/WEB-INF/wsdl/PicketLinkSTS.wsdl | 2 +- .../trust/WEB-INF/wsdl/SecurityService.wsdl | 6 ++-- .../wsdl/bearer-ws-trust-1.4-service.wsdl | 2 +- .../holderofkey-ws-trust-1.4-service.wsdl | 2 +- .../WEB-INF/wsdl/ws-trust-1.4-service.wsdl | 2 +- .../jbws3084/WEB-INF/wsdl/SaajService.wsdl | 2 +- modules/testsuite/pom.xml | 33 ++++++++++++------- .../shared-tests/src/test/etc/arquillian.xml | 12 +++---- .../META-INF/wsdl/RegistrationService.wsdl | 2 +- .../holder/META-INF/wsdl/HolderService.wsdl | 2 +- .../jbws1581/META-INF/wsdl/TestService.wsdl | 2 +- .../jbws1841/META-INF/wsdl/TestService.wsdl | 2 +- .../META-INF/wsdl/echo/TestService.wsdl | 2 +- .../WEB-INF-client/wsdl/HelloService.wsdl | 2 +- .../WEB-INF-service/wsdl/HelloService.wsdl | 2 +- .../jbws2412/WEB-INF/wsdl/TestService.wsdl | 2 +- .../jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl | 2 +- .../jaxws/jbws2449/META-INF/wsdl/test.wsdl | 2 +- .../WEB-INF-client/wsdl/HelloService.wsdl | 2 +- .../WEB-INF-service/wsdl/HelloService.wsdl | 2 +- .../jbws2591/wsdl/JBWS2591TestService.wsdl | 2 +- .../jbws2957/WEB-INF/wsdl/HelloService.wsdl | 2 +- .../jaxws/jbws3140/wsdl/TestEndpoint.wsdl | 2 +- .../jbws3223/WEB-INF/wsdl/TestService.wsdl | 2 +- .../jbws3401/WEB-INF/wsdl/TestService.wsdl | 2 +- .../addressing/META-INF/wsdl/TestService.wsdl | 2 +- .../META-INF/wsdl/CCVerificationService.wsdl | 2 +- .../META-INF/wsdl/OrderMgmtService.wsdl | 2 +- .../META-INF/wsdl/ProfileMgmtService.wsdl | 2 +- .../WEB-INF/wsdl/TestService.wsdl | 2 +- .../serviceref/META-INF/wsdl/Endpoint.wsdl | 2 +- .../webparam/META-INF/wsdl/PingService.wsdl | 2 +- .../META-INF/wsdl/CustomerService.wsdl | 2 +- .../webserviceref/META-INF/wsdl/Endpoint.wsdl | 2 +- .../META-INF/wsdl/MultipleEndpoint.wsdl | 4 +-- .../WEB-INF/wsdl/Endpoint.wsdl | 2 +- .../jbws3084/WEB-INF/wsdl/SaajService.wsdl | 2 +- 85 files changed, 150 insertions(+), 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 index 035f11536..491c875ce 100644 --- 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 @@ - + diff --git a/modules/testsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl index e3f76e7c8..54ca7d9fe 100644 --- a/modules/testsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cloud-tests/k8s/wstrust/service/src/main/webapp/WEB-INF/wsdl/SecurityService.wsdl @@ -44,7 +44,7 @@ - + @@ -68,9 +68,9 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> stsns:SecurityTokenService diff --git a/modules/testsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl b/modules/testsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl index 393c16bfe..fa3d6a528 100644 --- a/modules/testsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl +++ b/modules/testsuite/cloud-tests/k8s/wstrust/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl @@ -181,7 +181,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml b/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml index 2b01feecc..35d9087c8 100644 --- a/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml +++ b/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml @@ -11,9 +11,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.cxf-tests.jboss,9990)} + ${cxf-tests.jboss_9990} - ${add_int(port-offset.cxf-tests.jboss,8787)} ${add_int(port-offset.cxf-tests.jboss,9990)} + ${cxf-tests.jboss_8787} ${cxf-tests.jboss_9990} 8 ${startupTimeoutInSeconds:60} @@ -26,9 +26,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)} + ${cxf-tests.ssl-mutual-auth_9990} - ${add_int(port-offset.cxf-tests.ssl-mutual-auth,8787)} ${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)} + ${cxf-tests.ssl-mutual-auth_8787} ${cxf-tests.ssl-mutual-auth_9990} 8 ${startupTimeoutInSeconds:60} @@ -41,9 +41,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.cxf-tests.default-config-tests,9990)} + ${cxf-tests.default-config-tests_9990} - ${add_int(port-offset.cxf-tests.default-config-tests,8787)} ${add_int(port-offset.cxf-tests.default-config-tests,9990)} + ${cxf-tests.default-config-tests_8787} ${cxf-tests.default-config-tests_9990} 8 ${startupTimeoutInSeconds:60} @@ -56,9 +56,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.cxf-tests.jms,9990)} + ${cxf-tests.jms_9990} - ${add_int(port-offset.cxf-tests.jms,8787)} ${add_int(port-offset.cxf-tests.jms,9990)} + ${cxf-tests.jms_8787} ${cxf-tests.jms_9990} 8 ${startupTimeoutInSeconds:60} 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 index 73db24c2e..5caf4048b 100644 --- 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 @@ - + \ No newline at end of file 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 index 25ad40d92..8c56c622e 100644 --- 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 @@ - + \ No newline at end of file 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 index 25ad40d92..8c56c622e 100644 --- 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 @@ - + \ No newline at end of file diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl index 25ad40d92..8c56c622e 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl @@ -50,7 +50,7 @@ - + \ No newline at end of file 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 index db0fbc364..117fe1403 100644 --- 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 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl index 2b42cc2c9..7cd367744 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/helloMutualSSLport.wsdl @@ -55,7 +55,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl index f413a291f..78b0d0ba6 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl @@ -82,7 +82,7 @@ - + \ No newline at end of file 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 index 8a0f338e0..821f0f5fc 100644 --- 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 @@ - + 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 index 26f664c73..98e770c8d 100644 --- 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 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl index 34738158f..17ffb904c 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl +++ b/modules/testsuite/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/"> + location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jbws3792-external-wsdl/import.wsdl"/> diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml index a483bbefd..979a22e15 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml @@ -2,7 +2,7 @@ JBWS3792WSService - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-external-wsdl/jbws3792.wsdl + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jbws3792-external-wsdl/jbws3792.wsdl org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl index d0f56c605..cfd948a2a 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl @@ -18,7 +18,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl index 26f664c73..98e770c8d 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl @@ -44,7 +44,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl index 545290bbd..e88478341 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl @@ -18,7 +18,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl index 6c1d38313..ead455646 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl @@ -44,7 +44,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl index 87135123b..8bb06e938 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl @@ -44,7 +44,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl index 7763ac2d6..528c575fe 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl @@ -17,7 +17,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl index 14743934c..17cf46822 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl @@ -6,7 +6,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" > + location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jbws3792-hello/HelloService?wsdl" /> @@ -17,7 +17,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl index 26f664c73..98e770c8d 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl @@ -44,7 +44,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl index aedb2d8b7..a3f7cb784 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl @@ -18,7 +18,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl index 1788c4e52..be0ee2c08 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl @@ -65,7 +65,7 @@ java:jms/RemoteConnectionFactory @jboss.initial.context.factory@ - @jboss.remoting.protocol@://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jms,8080)@ + @jboss.remoting.protocol@://@jboss.bind.address@:@cxf-tests.jms_8080@ diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl index cb785d485..c350e0c7f 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl @@ -65,12 +65,12 @@ java:jms/RemoteConnectionFactory @jboss.initial.context.factory@ - @jboss.remoting.protocol@://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jms,8080)@ + @jboss.remoting.protocol@://@jboss.bind.address@:@cxf-tests.jms_8080@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl index d7d4d055f..7ad32d151 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl @@ -48,7 +48,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl index 0c3dbe820..44db316b7 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl @@ -56,10 +56,10 @@ - + - + \ No newline at end of file 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 index 01877513d..4d8450291 100644 --- 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 @@ - + \ No newline at end of file diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl index c5567eb19..a2570041a 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl @@ -56,7 +56,7 @@ - + \ No newline at end of file diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl index e599c0f46..f7184a482 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl @@ -40,7 +40,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl index 069b7b07a..367528590 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl @@ -40,7 +40,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl index 447087187..5748b330d 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl @@ -40,7 +40,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl index 447087187..5748b330d 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl @@ -40,7 +40,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl index b44327d62..5b39221f8 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl @@ -38,7 +38,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl index f12119997..d28a034f7 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl @@ -40,7 +40,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl index 035f11536..491c875ce 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl @@ -58,7 +58,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl index 6b157c7c3..0633c0564 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl @@ -58,7 +58,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl index 70027f7ab..790565361 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl @@ -58,7 +58,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl index ef333e16c..811282c12 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl @@ -58,7 +58,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl index cb51602ee..4aaa11062 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl @@ -89,16 +89,16 @@ - + - + - + - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl index a9cd498aa..b55d55eb1 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl @@ -111,22 +111,22 @@ - + - + - + - + - + - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl index 3c0ee2a5f..14dcac83c 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl @@ -152,31 +152,31 @@ - + - + - + - + - + - + - + - + - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl index 37fc8bc3d..657b69863 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl @@ -45,7 +45,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl index 5b93106a7..dc6f840b9 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl @@ -45,7 +45,7 @@ - + @@ -69,9 +69,9 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> stsns:SecurityTokenService diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl index b398fbb48..cac64250b 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl @@ -46,7 +46,7 @@ - + @@ -96,10 +96,10 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> - + @@ -96,10 +96,10 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl"> - + @@ -69,9 +69,9 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> stsns:SecurityTokenService diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl index 348e685d8..8068a8c1b 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl @@ -66,7 +66,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl index e3f76e7c8..54ca7d9fe 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl @@ -44,7 +44,7 @@ - + @@ -68,9 +68,9 @@ - http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService + wsdli:wsdlLocation="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> stsns:SecurityTokenService diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl index 5a19492bf..1cbd38cbd 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl @@ -210,7 +210,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl index 5a19492bf..1cbd38cbd 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl @@ -210,7 +210,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl index 393c16bfe..fa3d6a528 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl @@ -181,7 +181,7 @@ - + diff --git a/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl index c2de74012..ab7a23633 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl @@ -46,7 +46,7 @@ - + diff --git a/modules/testsuite/pom.xml b/modules/testsuite/pom.xml index 2e0c3e61f..c03411d14 100644 --- a/modules/testsuite/pom.xml +++ b/modules/testsuite/pom.xml @@ -24,7 +24,6 @@ ${project.build.directory}/test-resources ${project.build.directory}/wsdl-publish ${project.build.directory}/appclient-logs - 1.1.0.Final 3.1.0 0 5000 @@ -34,6 +33,28 @@ 20000 25000 30000 + + + 8080 + 8443 + 9990 + 8787 + 13080 + 13443 + 14990 + 13787 + 19990 + 18787 + 43080 + 44990 + 43787 + 23080 + 24990 + 23787 + 29990 + 28787 + 34990 + 33787 --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED @@ -203,17 +224,7 @@ maven-resources-plugin UTF-8 - - custom - - - - org.jboss.ws.plugins - resources-plugin-filters - ${resources-plugin-filters.version} - - maven-antrun-plugin diff --git a/modules/testsuite/shared-tests/src/test/etc/arquillian.xml b/modules/testsuite/shared-tests/src/test/etc/arquillian.xml index 1332ae6de..9624130c6 100644 --- a/modules/testsuite/shared-tests/src/test/etc/arquillian.xml +++ b/modules/testsuite/shared-tests/src/test/etc/arquillian.xml @@ -11,9 +11,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.shared-tests.jboss,9990)} + ${shared-tests.jboss_9990} - ${add_int(port-offset.shared-tests.jboss,8787)} ${add_int(port-offset.shared-tests.jboss,9990)} + ${shared-tests.jboss_8787} ${shared-tests.jboss_9990} 8 ${startupTimeoutInSeconds:60} @@ -26,9 +26,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.shared-tests.default-config-tests,9990)} + ${shared-tests.default-config-tests_9990} - ${add_int(port-offset.shared-tests.default-config-tests,8787)} ${add_int(port-offset.shared-tests.default-config-tests,9990)} + ${shared-tests.default-config-tests_8787} ${shared-tests.default-config-tests_9990} 8 ${startupTimeoutInSeconds:60} @@ -41,9 +41,9 @@ true ${jboss.bind.address:localhost} ${jbossArguments} - ${add_int(port-offset.shared-tests.address-rewrite,9990)} + ${shared-tests.address-rewrite_9990} - ${add_int(port-offset.shared-tests.address-rewrite,8787)} ${add_int(port-offset.shared-tests.address-rewrite,9990)} + ${shared-tests.address-rewrite_8787} ${shared-tests.address-rewrite_9990} 8 ${startupTimeoutInSeconds:60} diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl index 9c46cf4e9..fac435642 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl @@ -7,7 +7,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl index a3e6df538..524cd6c76 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl @@ -193,7 +193,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl index ef9a9d825..0a91149cd 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl @@ -27,7 +27,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl index 1830ef42a..4a3ab9057 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl @@ -33,7 +33,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl index 308f2a8fc..f0eab02d5 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl @@ -38,7 +38,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl index 393d959d3..f86d1d8fb 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl @@ -71,4 +71,4 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl index 393d959d3..f86d1d8fb 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl @@ -71,4 +71,4 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl index 245f4172e..e91464784 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl @@ -45,7 +45,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl index 04bc87966..aa0488a90 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl @@ -32,7 +32,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl index edf63072d..9cd919a0d 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl @@ -48,7 +48,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl index 7bba31e96..c7e15f4fd 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl @@ -71,4 +71,4 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl index 7bba31e96..c7e15f4fd 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl @@ -71,4 +71,4 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl index 2fcaf2a47..1c240dc46 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl @@ -31,7 +31,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl index aae3cbf6a..636ad2d91 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl @@ -25,7 +25,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl index e08cd4b05..9fc1d5ac7 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl @@ -63,7 +63,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl index d3b08b749..00a78678f 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl @@ -29,7 +29,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl index c3df87eb0..d6758d1d0 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl @@ -45,7 +45,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl index 85b2c02ec..568cab0c3 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl @@ -56,7 +56,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl index 19f943945..48a4d4109 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl @@ -41,7 +41,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl index f77c64f75..9adbfa21b 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl @@ -59,7 +59,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl index 7e714b089..d21e8406d 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl @@ -52,7 +52,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl index 904f5023e..cece9bb0f 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl @@ -38,7 +38,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl index ee2546788..7b0e55268 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl index 87a98aaec..479cf06f1 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl @@ -89,7 +89,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl index bccc52971..7c389308b 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl @@ -47,7 +47,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl index 9edd0c9b7..463bdaa99 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl @@ -32,7 +32,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl index 9ef9a5a00..e661366d0 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl @@ -45,10 +45,10 @@ - + - + diff --git a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl index 45aea90ea..22fc383d3 100644 --- a/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl @@ -29,7 +29,7 @@ - + diff --git a/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl b/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl index 3a622b7dd..1808cf7cf 100644 --- a/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl +++ b/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl @@ -48,7 +48,7 @@ - +