Author: asoldano Date: 2015-01-22 11:10:08 -0500 (Thu, 22 Jan 2015) New Revision: 19417 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties Log: Fixed port properties Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22 16:10:08 UTC (rev 19417) @@ -151,7 +151,7 @@ <goal>start</goal> </goals> <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss} ${additionalJvmArgs}</jvmArgs> + <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-spring-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> <port>39990</port><!-- Keep in sync with the port-offset --> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22 16:10:08 UTC (rev 19417) @@ -6,12 +6,12 @@ <container qualifier="jboss" default="true"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> <property name="serverConfig">jbws-testsuite-spring-default.xml</property> <property name="allowConnectingToRunningServer">true</property> - <property name="managementPort">${add_int(port-offset.spring-tests.jboss,9990)}</property> + <property name="managementPort">${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property> <!-- AS7-4070 --> - <property name="waitForPorts">${add_int(port-offset.spring-tests.jboss,8787)} ${add_int(port-offset.spring-tests.jboss,9990)}</property> + <property name="waitForPorts">${add_int(port-offset.cxf-spring-tests.jboss,8787)} ${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property> <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417) @@ -5,4 +5,4 @@ port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@ port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@ port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@ -port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@ +port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@ Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -65,7 +65,7 @@ <wsdl:service name="HelloWorldService"> <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> - <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@</soapjms:jndiURL> + <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@</soapjms:jndiURL> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -65,12 +65,12 @@ <wsdl:service name="HelloWorldService"> <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> - <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@</soapjms:jndiURL> + <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,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.spring-tests.jboss,8080)@/jaxws-cxf-jms-http-deployment"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jms-http-deployment"/> </wsdl:port> </wsdl:service> <wsdl:service name="HelloWorldServiceLocal"> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -29,7 +29,7 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-webserviceref'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -61,7 +61,7 @@ <wsdl:service name="RMService"> <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc"/> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -42,7 +42,7 @@ </wsdl:binding> <wsdl:service name="RMService"> <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc"/> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -68,7 +68,7 @@ </wsdl:binding> <wsdl:service name="SimpleService"> <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9090)@/hello"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9090)@/hello"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -294,51 +294,51 @@ </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricPort" binding="tns:DoubleItKerberosSymmetricBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetric" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetric" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricSupportingPort" binding="tns:DoubleItKerberosSymmetricSupportingBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSupporting" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSupporting" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSupportingPort" binding="tns:DoubleItKerberosSupportingBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSupporting" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSupporting" /> </wsdl:port> <wsdl:port name="DoubleItKerberosAsymmetricPort" binding="tns:DoubleItKerberosAsymmetricBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetric" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetric" /> </wsdl:port> <wsdl:port name="DoubleItKerberosTransportEndorsingPort" binding="tns:DoubleItKerberosTransportEndorsingBinding"> - <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9009)@/DoubleItKerberosTransportEndorsing" /> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9009)@/DoubleItKerberosTransportEndorsing" /> </wsdl:port> <wsdl:port name="DoubleItKerberosAsymmetricEndorsingPort" binding="tns:DoubleItKerberosAsymmetricEndorsingBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricEndorsing" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricEndorsing" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricProtectionPort" binding="tns:DoubleItKerberosSymmetricProtectionBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricProtection" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricProtection" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricDerivedProtectionPort" binding="tns:DoubleItKerberosSymmetricDerivedProtectionBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricDerivedProtection" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricDerivedProtection" /> </wsdl:port> <wsdl:port name="DoubleItKerberosAsymmetricSignedEndorsingPort" binding="tns:DoubleItKerberosAsymmetricSignedEndorsingBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEndorsing" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEndorsing" /> </wsdl:port> <wsdl:port name="DoubleItKerberosAsymmetricSignedEncryptedPort" binding="tns:DoubleItKerberosAsymmetricSignedEncryptedBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEncrypted" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEncrypted" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricEndorsingEncryptedPort" binding="tns:DoubleItKerberosSymmetricEndorsingEncryptedBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricEndorsingEncrypted" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricEndorsingEncrypted" /> </wsdl:port> <wsdl:port name="DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" binding="tns:DoubleItKerberosSymmetricSignedEndorsingEncryptedBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSignedEndorsingEncrypted" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSignedEndorsingEncrypted" /> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -35,7 +35,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -54,10 +54,10 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config"/> </port> <port name="SecurityServicePort2" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/custom-config"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/custom-config"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -54,7 +54,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -41,7 +41,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417) @@ -41,7 +41,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417) @@ -5,5 +5,4 @@ port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@ port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@ port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@ -port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@ -port-offset.spring-tests.default-config-tests=(a)port-offset.spring-tests.default-config-tests@ \ No newline at end of file +port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@ Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 16:10:08 UTC (rev 19417) @@ -38,7 +38,7 @@ <port-offset.shared-tests.jboss>15000</port-offset.shared-tests.jboss> <port-offset.shared-tests.default-config-tests>20000</port-offset.shared-tests.default-config-tests> <port-offset.shared-tests.address-rewrite>25000</port-offset.shared-tests.address-rewrite> - <port-offset.spring-tests.jboss>30000</port-offset.spring-tests.jboss> + <port-offset.cxf-spring-tests.jboss>30000</port-offset.cxf-spring-tests.jboss> </properties> <!-- Modules --> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417) @@ -6,5 +6,4 @@ port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@ port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@ port-offset.shared-tests.address-rewrite=(a)port-offset.shared-tests.address-rewrite@ -port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@ -port-offset.spring-tests.default-config-tests=(a)port-offset.spring-tests.default-config-tests@ \ No newline at end of file +port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@