Author: rsearls Date: 2015-01-23 22:06:38 -0500 (Fri, 23 Jan 2015) New Revision: 19422 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml Log: mapped the port to the new address. Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -24,7 +24,7 @@ </bean> -<jaxws:endpoint implementor="org.jboss.test.ws.jaxws.cxf.configuration.EndpointImpl" address="http://@jboss.bind.address@:8080/jaxws-cxf-configuration"> +<jaxws:endpoint implementor="org.jboss.test.ws.jaxws.cxf.configuration.EndpointImpl" address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-configuration"> </jaxws:endpoint> </beans> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -4,7 +4,7 @@ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor' + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-descriptor' implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'> </jaxws:endpoint> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -4,7 +4,7 @@ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne' + <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jbws3497/ServiceOne/EndpointOne' implementor='org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOneImpl'> </jaxws:endpoint> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -11,7 +11,7 @@ http://cxf.apache.org/schemas/core.xsd'> <jaxws:endpoint id="helloWorldServiceEndpoint" - address="http://@jboss.bind.address@:8080/jaxws-cxf-jbws3670/helloworld" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jbws3670/helloworld" implementor="#helloWorldServiceBean"> </jaxws:endpoint> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -14,7 +14,7 @@ </wsrmp:RMAssertion> </wsp:Policy> - <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> + <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> <jaxws:features> <p:policies> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -14,7 +14,7 @@ </wsrmp:RMAssertion> </wsp:Policy> - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> <jaxws:features> <p:policies> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -15,7 +15,7 @@ </bean> <jaxws:endpoint id="DoubleItKerberosSupport" - address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport" implementor="org.jboss.test.ws.jaxws.samples.wsse.kerberos.DoubleItPortTypeImpl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.samples.wsse.kerberos.KeystorePasswordCallback"/> @@ -39,7 +39,7 @@ <jaxws:endpoint id="KerberosOverAsymmetric" - address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" xmlns:s="http://www.example.org/contract/DoubleIt" @@ -60,7 +60,7 @@ <jaxws:endpoint id="KerberosOverSymmetric" - address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" xmlns:s="http://www.example.org/contract/DoubleIt" @@ -77,7 +77,7 @@ <jaxws:endpoint id="KerberosOverSymmetricSupporting" - address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" xmlns:s="http://www.example.org/contract/DoubleIt" @@ -91,7 +91,7 @@ <jaxws:endpoint id="KerberosOverAsymmetricSignedEncrypted" - address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted" + address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" xmlns:s="http://www.example.org/contract/DoubleIt" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -42,7 +42,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt' implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> <jaxws:outInterceptors> <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -32,7 +32,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config' implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl' endpointName="ns:SecurityServicePort" serviceName="ns:SecurityService" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -36,7 +36,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest' implementor='org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl' endpointName="ns:SecurityServicePort" serviceName="ns:SecurityService" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -24,7 +24,7 @@ <jaxws:endpoint id='EjbEndpointImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint' implementor='org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpointImpl'> <jaxws:inInterceptors> <ref bean="SecurityContextIn"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -12,7 +12,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt' implementor='org.jboss.test.ws.jaxws.samples.wssePolicy.ServiceImpl'> <jaxws:properties> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422) @@ -12,7 +12,7 @@ <jaxws:endpoint id='ServiceImpl' - address='https://@jboss.bind.address@:8443/jaxws-samples-wssePolicy-username' + address='https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username' implementor='org.jboss.test.ws.jaxws.samples.wssePolicy.ServiceImpl'> <jaxws:properties>