You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/01/11 13:50:40 UTC
[cxf] branch master updated (f781f77 -> 82080f2)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from f781f77 [CXF-7907] exclude jaxb-core
new 505563a Refactored Spring bean files to make the header more readable
new 82080f2 CXF-7940 - FileUtils.delete dramatically slowdown WildFly server shutdown
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/etc/https-cfg-client.xml | 13 +++++++++++--
.../src/main/resources/etc/https-cfg-service.xml | 13 +++++++++++--
.../src/main/resources/etc/policy-asym.xml | 11 +++++++++--
.../src/main/resources/etc/policy-sym.xml | 11 +++++++++--
.../src/main/resources/etc/policy-symsc.xml | 11 +++++++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
core/src/main/java/org/apache/cxf/helpers/FileUtils.java | 9 ---------
core/src/main/resources/META-INF/cxf/cxf.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/bus.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/customerBus.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/customerBus2.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/init.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/lazyInitBus.xml | 7 +++++--
.../org/apache/cxf/bus/spring/resources/bus-overwrite.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/test.xml | 6 ++++--
.../src/test/java/org/apache/cxf/bus/spring/testjsr250.xml | 6 ++++--
.../org/apache/cxf/configuration/spring/test-beans.xml | 6 ++++--
.../apache/cxf/configuration/spring/test-jaxb-beans.xml | 7 +++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/release/samples/in_jvm_transport/coloc.xml | 9 +++++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 7 +++++--
.../jax_rs/basic_https/src/main/resources/ClientConfig.xml | 9 +++++++--
.../jax_rs/basic_https/src/main/resources/ServerConfig.xml | 9 +++++++--
.../spring_security/src/main/webapp/WEB-INF/beans.xml | 9 +++++++--
.../jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml | 7 +++++--
.../src/main/resources/cxf.xml | 9 +++++++--
.../js_browser_client_simple/src/main/resources/cxf.xml | 9 +++++++--
.../client/src/main/webapp/WEB-INF/spring-servlet.xml | 8 ++++++--
.../oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml | 11 +++++++++--
.../server/src/main/webapp/WEB-INF/spring-servlet.xml | 8 ++++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../samples/sts/src/main/resources/wssec-client-stax.xml | 10 ++++++++--
.../samples/sts/src/main/resources/wssec-client.xml | 10 ++++++++--
.../samples/sts/src/main/resources/wssec-server-stax.xml | 11 +++++++++--
.../samples/sts/src/main/resources/wssec-server.xml | 11 +++++++++--
.../samples/sts/src/main/resources/wssec-sts-stax.xml | 10 ++++++++--
.../release/samples/sts/src/main/resources/wssec-sts.xml | 10 ++++++++--
.../samples/ws_addressing/src/main/resources/client.xml | 9 +++++++--
.../samples/ws_addressing/src/main/resources/server.xml | 8 ++++++--
.../samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml | 8 ++++++--
.../samples/ws_policy/src/main/resources/client.xml | 9 +++++++--
.../samples/ws_policy/src/main/resources/server.xml | 8 ++++++--
.../release/samples/ws_rm/src/main/resources/client.xml | 11 +++++++++--
.../release/samples/ws_rm/src/main/resources/server.xml | 11 +++++++++--
.../sign_enc/src/main/java/demo/wssec/client/wssec.xml | 11 +++++++++--
.../sign_enc/src/main/java/demo/wssec/server/wssec.xml | 11 +++++++++--
.../sign_enc_policy/src/main/resources/ClientConfig.xml | 10 ++++++++--
.../src/main/resources/ClientConfigStax.xml | 10 ++++++++--
.../sign_enc_policy/src/main/resources/ServiceConfig.xml | 11 +++++++++--
.../src/main/resources/ServiceConfigStax.xml | 11 +++++++++--
.../samples/ws_security/ut/src/main/resources/wssec.xml | 11 +++++++++--
.../ut_policy/src/main/resources/ClientConfig.xml | 10 ++++++++--
.../ut_policy/src/main/resources/ClientConfigStax.xml | 10 ++++++++--
.../ut_policy/src/main/resources/ServiceConfig.xml | 11 +++++++++--
.../ut_policy/src/main/resources/ServiceConfigStax.xml | 11 +++++++++--
.../src/main/resources/client-applicationContext.xml | 9 +++++++--
.../release/samples/wsdl_first/src/main/resources/cxf.xml | 8 ++++++--
.../src/main/resources/server-applicationContext.xml | 8 +++++---
.../wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/resources/server-beans.xml | 7 +++++--
.../wsdl_first_https/src/main/resources/InsecureClient.xml | 7 +++++--
.../wsdl_first_https/src/main/resources/SecureClient.xml | 8 ++++++--
.../wsdl_first_https/src/main/resources/ServerConfig.xml | 9 +++++++--
.../archetype-resources/src/main/webapp/WEB-INF/beans.xml | 8 ++++++--
.../aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml | 6 ++++--
.../org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml | 8 ++++++--
.../jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml | 6 ++++--
.../src/test/java/org/apache/cxf/jaxrs/spring/servers.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml | 7 +++++--
.../main/resources/META-INF/cxf/cxf-extension-jaxws.xml | 7 +++++--
.../java/org/apache/cxf/jaxws/configured-endpoints.xml | 8 ++++++--
.../java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/schemaFirst.xml | 8 ++++++--
.../jaxws/schemavalidationtype-configured-endpoints.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/soapServiceConfig.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/child.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/clients.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints2.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints3.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/servers.xml | 8 ++++++--
.../jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/frontend/spring/clients.xml | 8 ++++++--
.../test/java/org/apache/cxf/frontend/spring/rountrip.xml | 8 ++++++--
.../test/java/org/apache/cxf/frontend/spring/servers.xml | 8 ++++++--
.../javascript-tests/src/test/resources/AegisBeans.xml | 8 ++++++--
.../javascript-tests/src/test/resources/AnyBeans.xml | 7 +++++--
.../src/test/resources/DocLitBareClientTestBeans.xml | 7 +++++--
.../src/test/resources/DocLitWrappedClientTestBeans.xml | 8 ++++++--
.../src/test/resources/GreeterClientTestBeans.xml | 7 +++++--
.../src/test/resources/HelloWorldDocLitBeans.xml | 7 +++++--
.../src/test/resources/HelloWorldGreeterBeans.xml | 7 +++++--
.../javascript-tests/src/test/resources/MtoMBeans.xml | 7 +++++--
.../src/test/resources/RPCClientTestBeans.xml | 7 +++++--
.../src/test/resources/XMLHttpRequestTestBeans.xml | 10 ++++++++--
.../src/test/resources/attributeTestBeans.xml | 8 ++++++--
.../src/test/resources/serializationTestBeans.xml | 8 ++++++--
.../src/test/resources/managed-spring-twobuses.xml | 8 ++++++--
.../src/test/resources/managed-spring-twobuses2.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring2.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring3.xml | 8 ++++++--
rt/management/src/test/resources/no-connector-spring.xml | 7 +++++--
.../java/org/apache/cxf/jaxrs/client/spring/clients.xml | 8 ++++++--
.../java/org/apache/cxf/jaxrs/provider/atom/servers.xml | 7 +++++--
.../apache/cxf/transport/http_jetty/invalid-engines.xml | 10 ++++++++--
.../http_jetty/server-engine-factory-jetty9-connector.xml | 9 +++++++--
.../cxf/transport/http_jetty/server-engine-factory.xml | 9 +++++++--
.../apache/cxf/transport/http_jetty/spring/beans-props.xml | 10 ++++++++--
.../org/apache/cxf/transport/http_jetty/spring/beans.xml | 10 ++++++++--
.../cxf/transport/http_jetty/spring/invalid-beans.xml | 8 ++++++--
.../http/netty/client/integration/ServerConfig.xml | 9 +++++++--
.../http/netty/server/integration/ApplicationContext.xml | 11 +++++++++--
.../http/netty/server/integration/ServerConfig.xml | 9 +++++++--
.../cxf/transport/http/netty/server/spring/beans-props.xml | 10 ++++++++--
.../cxf/transport/http/netty/server/spring/beans.xml | 10 ++++++++--
.../transport/http/netty/server/spring/invalid-beans.xml | 8 ++++++--
.../apache/cxf/transport/http_undertow/invalid-engines.xml | 10 ++++++++--
.../cxf/transport/http_undertow/server-engine-factory.xml | 9 +++++++--
.../cxf/transport/http_undertow/spring/beans-props.xml | 10 ++++++++--
.../apache/cxf/transport/http_undertow/spring/beans.xml | 10 ++++++++--
.../cxf/transport/http_undertow/spring/invalid-beans.xml | 8 ++++++--
.../http/src/main/resources/META-INF/cxf/cxf-servlet.xml | 7 +++++--
.../org/apache/cxf/transport/http/spring/conduit-bean.xml | 9 +++++++--
.../cxf/transport/http/spring/conduit-tlsrefs-bean.xml | 9 +++++++--
.../java/org/apache/cxf/ws/policy/disable-policy-bus.xml | 8 ++++++--
.../java/org/apache/cxf/ws/policy/ignorable-policy.xml | 10 ++++++++--
.../java/org/apache/cxf/ws/policy/ignorable-policy2.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/ws/policy/policy-bus.xml | 9 +++++++--
.../test/java/org/apache/cxf/ws/policy/spring/beans.xml | 10 ++++++++--
.../test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml | 9 +++++++--
.../rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml | 9 +++++++--
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml | 9 +++++++--
.../java/org/apache/cxf/ws/rm/managed-manager-bean.xml | 9 +++++++--
.../rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml | 9 +++++++--
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml | 6 ++++--
.../apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 10 ++++++++--
.../cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml | 10 ++++++++--
.../apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/basic_auth/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/basic_auth/cxf-service.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/batch/cxf-client-unit.xml | 10 ++++++++--
.../resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml | 10 ++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-service.xml | 11 +++++++++--
.../systest/sts/binarysecuritytoken/stax-cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/caching/cxf-caching-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/caching/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/caching/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-bad-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/claims/stax-cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/cross_domain/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-sts-common.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-sts.xml | 13 +++++++++++--
.../cxf/systest/sts/custom_onbehalfof/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml | 10 ++++++++--
.../cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-sts-common.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/distributed_caching/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/distributed_caching/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 13 +++++++++++--
.../cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 13 +++++++++++--
.../org/apache/cxf/systest/sts/jwt/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 12 ++++++++++--
.../cxf/systest/sts/kerberos/cxf-intermediary-client.xml | 10 ++++++++--
.../systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/kerberos/cxf-intermediary.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/kerberos/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-client-unit.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/soap12/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/soap12/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/sts_sender_vouches/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/sts_sender_vouches/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 10 ++++++++--
.../cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml | 10 ++++++++--
.../apache/cxf/systest/sts/transformation/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/transformation/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/usernametoken/cxf-bad-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/usernametoken/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/usernametoken/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/usernametoken/stax-cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/asymmetric/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/asymmetric/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/delegation/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/delegation/cxf-sts-transport.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-transport.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-ut.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-x509.xml | 10 ++++++++--
.../cxf/systest/sts/deployment/stax-cxf-transport.xml | 12 ++++++++++--
.../cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml | 10 ++++++++--
.../apache/cxf/systest/sts/deployment/stax-cxf-x509.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/sts/realms.xml | 12 ++++++++++--
.../sts/intermediary_transformation/cxf-bad-client.xml | 10 ++++++++--
.../systest/sts/intermediary_transformation/cxf-client.xml | 10 ++++++++--
.../cxf-intermediary-caching.xml | 11 +++++++++--
.../sts/intermediary_transformation/cxf-intermediary.xml | 11 +++++++++--
.../sts/intermediary_transformation/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/issuer/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/issuer/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/issueunit/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-service2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/rest/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 13 +++++++++++--
.../apache/cxf/systest/sts/sendervouches/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/sendervouches/cxf-intermediary.xml | 11 +++++++++--
.../apache/cxf/systest/sts/sendervouches/cxf-service.xml | 11 +++++++++--
.../systest/sts/sendervouches/cxf-stax-intermediary.xml | 11 +++++++++--
.../cxf/systest/sts/sendervouches/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/stsclient/cxf-client-name.xml | 10 ++++++++--
.../cxf/systest/sts/stsclient/cxf-default-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/stsclient/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/symmetric/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/symmetric/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/symmetric/cxf-stax-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/template/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/template/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/template/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/transport/cxf-bad-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/transport/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/transport/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/transport/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-service2.xml | 11 +++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-service2.xml | 11 +++++++++--
.../apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-stax-service.xml | 11 +++++++++--
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 5 +++--
.../xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml | 10 ++++++++--
.../xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml | 10 ++++++++--
.../xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml | 10 ++++++++--
src/site/site.xml | 2 +-
.../webapp/src/main/webapp/WEB-INF/beans.xml | 7 +++++--
.../src/test/java/org/apache/cxf/systest/source/cxf.xml | 8 ++++++--
.../databinding/src/test/resources/aegisJaxWsBeans.xml | 9 +++++++--
.../src/test/resources/aegisSportsServiceBeans.xml | 9 +++++++--
.../databinding/src/test/resources/aegisWSDLNSBeans.xml | 9 +++++++--
systests/databinding/src/test/resources/extrajaxbclass.xml | 8 ++++++--
systests/databinding/src/test/resources/mtomTestBeans.xml | 9 +++++++--
.../src/test/resources/webapp/WEB-INF/beans.xml | 6 +++++-
.../cxf/systest/http/resources/BethalClientBeans.xml | 10 ++++++++--
.../apache/cxf/systest/http/resources/SessionServer.xml | 9 +++++++--
.../cxf/systest/http/resources/SessionServer_Windows.xml | 9 +++++++--
.../apache/cxf/systest/http/resources/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/http/resources/jaxws-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/http/resources/pkcs12.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec-url.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec.xml | 10 ++++++++--
.../org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client1.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client2.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client3.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client4.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client5.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client_old.xml | 4 ++--
.../cxf/systest/jaxrs/security/jaxrs-https-server.xml | 9 +++++++--
systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml | 7 ++++---
.../jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml | 10 +++++++---
.../jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml | 8 ++++++--
.../src/test/resources/jaxrs_databinding/WEB-INF/beans.xml | 11 ++++++++---
.../src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml | 11 ++++++++---
.../test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml | 11 ++++++++---
.../test/resources/jaxrs_jaas_security/WEB-INF/beans.xml | 8 ++++++--
.../resources/jaxrs_many_destinations/WEB-INF/beans.xml | 11 ++++++++---
.../jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml | 10 +++++++---
.../src/test/resources/jaxrs_security/WEB-INF/beans.xml | 9 +++++----
.../src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml | 10 ++++++++--
.../src/test/resources/jaxrs_spring/WEB-INF/beans.xml | 7 +++++--
.../resources/jaxrs_spring_providers/WEB-INF/beans.xml | 7 +++++--
.../src/test/resources/servlet_as_filter/WEB-INF/beans.xml | 7 +++++--
.../java/org/apache/cxf/systest/dispatch/client-config.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/handlers/beans.xml | 8 ++++++--
.../cxf/systest/handlers/beans_autoRewriteSoapAddress.xml | 8 ++++++--
.../systest/handlers/beans_no_autoRewriteSoapAddress.xml | 8 ++++++--
.../org/apache/cxf/systest/handlers/soap_fault_beans.xml | 8 ++++++--
.../org/apache/cxf/systest/jaxws/fault-stack-trace.xml | 6 ++++--
.../org/apache/cxf/systest/jaxws/springWebService.xml | 8 ++++++--
.../cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml | 9 +++++++--
.../apache/cxf/systest/kerberos/wssec/kerberos/client.xml | 11 +++++++++--
.../apache/cxf/systest/kerberos/wssec/kerberos/server.xml | 14 ++++++++++++--
.../cxf/systest/kerberos/wssec/kerberos/stax-server.xml | 13 +++++++++++--
.../cxf/systest/kerberos/wssec/kerberos/sts-client.xml | 10 ++++++++--
.../apache/cxf/systest/kerberos/wssec/spnego/client.xml | 11 +++++++++--
.../apache/cxf/systest/kerberos/wssec/spnego/server.xml | 13 +++++++++++--
.../cxf/systest/kerberos/wssec/spnego/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 12 ++++++++++--
systests/ldap/src/test/resources/ldap-jaxrs.xml | 7 +++++--
systests/ldap/src/test/resources/ldap.xml | 7 +++++--
.../cxf/systest/http/resources/BethalClientBeans.xml | 10 ++++++++--
.../apache/cxf/systest/http/resources/SessionServer.xml | 9 +++++++--
.../cxf/systest/http/resources/SessionServer_Windows.xml | 9 +++++++--
.../apache/cxf/systest/http/resources/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/http/resources/jaxws-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/http/resources/pkcs12.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec-url.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec.xml | 10 ++++++++--
.../cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml | 7 +++++--
.../org/apache/cxf/systest/jaxrs/security/jcs/client.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml | 11 +++++++++--
.../jaxrs/security/jose/jwejws/algorithms-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/jose/jwejws/client.xml | 11 +++++++++--
.../jaxrs/security/jose/jwejws/reference-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/jose/jwejws/server.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverJweJson.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverJwsJson.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverMultipart.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/algorithms-server.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/authn-authz-server.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/jose/jwt/client.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/properties-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/filters/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/grants/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/tls/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/tls/client2.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/oidc/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oidc/filters/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/saml/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/saml/secureServer.xml | 12 ++++++++++--
.../org/apache/cxf/systest/jaxrs/security/saml/server.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/samlsso/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/samlsso/metadata-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/jaxrs/security/xml/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/xml/server.xml | 12 ++++++++++--
.../apache/cxf/systest/jaxrs/security/xml/stax-server.xml | 12 ++++++++++--
.../test/java/org/apache/cxf/systest/jms/JMSClients.xml | 7 +++++--
.../cxf/systest/jms/continuations/jms_test_config.xml | 9 +++++++--
.../src/test/java/org/apache/cxf/systest/jms/gzipBus.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/jms/soap12Bus.xml | 8 ++++++--
.../org/apache/cxf/systest/http_undertow/SessionServer.xml | 10 ++++++++--
.../apache/cxf/systest/http_undertow/continuations/cxf.xml | 8 ++++++--
.../cxf/systest/http_undertow/continuations/cxf_https.xml | 9 +++++++--
.../systest/http_undertow/continuations/jaxws-server.xml | 9 +++++++--
.../resources/org/apache/cxf/systest/http_undertow/cxf.xml | 7 +++++--
.../cxf/systest/http_undertow/server-lifecycle-beans.xml | 9 +++++++--
.../org/apache/cxf/systest/http_undertow/server.xml | 7 +++++--
.../apache/cxf/systest/http_undertow/undertow-engine.xml | 9 +++++++--
.../cxf/systest/http_undertow/undertowBasicAuthServer.xml | 7 +++++--
.../cxf/systest/http_undertow/undertowDigestServer.xml | 7 +++++--
.../org/apache/cxf/https/ssl3/sslv3-client-allow.xml | 11 +++++++++--
.../resources/org/apache/cxf/https/ssl3/sslv3-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/https/ssl3/sslv3-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/http/SessionServer.xml | 10 ++++++++--
.../apache/cxf/systest/http_jetty/continuations/cxf.xml | 8 ++++++--
.../cxf/systest/http_jetty/continuations/cxf_https.xml | 9 +++++++--
.../cxf/systest/http_jetty/continuations/jaxws-server.xml | 9 +++++++--
.../cxf/systest/http_jetty/continuations/jetty-engine.xml | 7 +++++--
.../resources/org/apache/cxf/systest/http_jetty/cxf.xml | 7 +++++--
.../org/apache/cxf/systest/http_jetty/jetty-engine.xml | 9 +++++++--
.../apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml | 7 +++++--
.../apache/cxf/systest/http_jetty/jettyDigestServer.xml | 7 +++++--
.../cxf/systest/http_jetty/server-lifecycle-beans.xml | 9 +++++++--
.../resources/org/apache/cxf/systest/http_jetty/server.xml | 7 +++++--
.../ciphersuites/ciphersuites-client-expired-cert.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-noconfig.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-tlsv12.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-tlsv13.xml | 11 +++++++++--
.../cxf/systest/https/ciphersuites/ciphersuites-client.xml | 11 +++++++++--
.../systest/https/ciphersuites/ciphersuites-dhe-client.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-explicit-client.xml | 11 +++++++++--
.../cxf/systest/https/ciphersuites/ciphersuites-server.xml | 12 ++++++++++--
.../cxf/systest/https/clientauth/client-auth-chain.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-invalid.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-invalid2.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-server.xml | 12 ++++++++++--
.../apache/cxf/systest/https/clientauth/client-auth.xml | 11 +++++++++--
.../apache/cxf/systest/https/clientauth/client-no-auth.xml | 11 +++++++++--
.../apache/cxf/systest/https/conduit/BethalClientBeans.xml | 10 ++++++++--
.../cxf/systest/https/conduit/jaxws-publish-callback.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/jaxws-server.xml | 10 ++++++++--
.../cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/pkcs12.xml | 10 ++++++++--
.../cxf/systest/https/conduit/resource-key-spec-url.xml | 11 +++++++++--
.../apache/cxf/systest/https/conduit/resource-key-spec.xml | 10 ++++++++--
.../systest/https/constraints/jaxws-server-constraints.xml | 10 ++++++++--
.../systest/https/hostname/hostname-client-disablecn.xml | 11 +++++++++--
.../systest/https/hostname/hostname-client-usedefault.xml | 11 +++++++++--
.../apache/cxf/systest/https/hostname/hostname-client.xml | 11 +++++++++--
.../systest/https/hostname/hostname-server-deprecated.xml | 12 ++++++++++--
.../apache/cxf/systest/https/hostname/hostname-server.xml | 12 ++++++++++--
.../apache/cxf/systest/https/trust/client-trust-config.xml | 11 +++++++++--
.../cxf/systest/https/trust/client-trust-empty-config.xml | 11 +++++++++--
.../org/apache/cxf/systest/https/trust/client-trust.xml | 11 +++++++++--
.../org/apache/cxf/systest/https/trust/trust-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/servlet/cxf-jaxrs.xml | 8 ++++++--
.../org/apache/cxf/systest/servlet/cxf-servlet.xml | 7 +++++--
.../org/apache/cxf/systest/servlet/spring-auto-launch.xml | 7 +++++--
.../org/apache/cxf/systest/servlet/spring-error.xml | 7 +++++--
.../resources/org/apache/cxf/systest/servlet/spring-js.xml | 6 ++++--
.../resources/org/apache/cxf/systest/servlet/spring.xml | 7 +++++--
.../src/test/resources/resolver/WEB-INF/beans.xml | 2 +-
.../src/test/java/org/apache/cxf/cxf1226/beans.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/cxf1332/beans.xml | 8 ++++++--
.../apache/cxf/systest/beanincreationexception/beans.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/bus/basic.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/bus/servlet.xml | 7 +++++--
.../cxf/systest/clustering/circuit_breaker_failover.xml | 8 ++++++--
.../java/org/apache/cxf/systest/clustering/failover.xml | 9 +++++++--
.../cxf/systest/clustering/failover_address_override.xml | 10 ++++++++--
.../org/apache/cxf/systest/clustering/load_distributor.xml | 9 +++++++--
.../clustering/load_distributor_address_override.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/clustering/targets.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/systest/coloc/cxf.xml | 2 +-
.../cxf/systest/corba/corba_binding_factory_configurer.xml | 9 +++++++--
.../org/apache/cxf/systest/corba/hello_world_client.xml | 8 ++++++--
.../org/apache/cxf/systest/corba/hello_world_server.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/cxf6319/handler.xml | 2 +-
.../java/org/apache/cxf/systest/factory_pattern/cxf.xml | 6 ++++--
.../apache/cxf/systest/factory_pattern/cxf_multiplex.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/interceptor/addr.xml | 7 +++++--
.../java/org/apache/cxf/systest/interceptor/no-addr.xml | 7 +++++--
.../src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml | 8 ++++++--
.../org/apache/cxf/systest/management/counter-spring.xml | 6 ++++--
.../java/org/apache/cxf/systest/management/managed-bus.xml | 6 ++++--
.../org/apache/cxf/systest/management/managed-spring.xml | 6 ++++--
.../org/apache/cxf/systest/management/persistent-id.xml | 6 ++++--
.../java/org/apache/cxf/systest/outofband/header/cxf.xml | 8 ++++++--
.../java/org/apache/cxf/systest/soapfault/handlers.xml | 5 +++--
.../systest/type_test/databinding-schema-validation.xml | 6 ++++--
.../uncategorized/src/test/resources/crossSchemaBeans.xml | 8 ++++++--
.../test/resources/org/apache/cxf/systest/soap/client.xml | 11 +++++++++--
.../test/resources/org/apache/cxf/systest/soap/server.xml | 2 +-
.../org/apache/cxf/systest/soap/transform-server.xml | 2 +-
.../resources/org/apache/cxf/systest/soap/xslt-server.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/atleastonce-inorder.xml | 9 ++++++---
.../test/java/org/apache/cxf/systest/ws/rm/atleastonce.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/rm/atmostonce-inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/decoupled.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/deferred.xml | 8 ++++++--
.../cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/rm/exactlyonce-inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/expire-fast-seq.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/inactivity-timeout.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/ws/rm/inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/limit-seqs.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/managed-client.xml | 11 +++++++++--
.../java/org/apache/cxf/systest/ws/rm/managed-server.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/message-loss-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/ws/rm/message-loss.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/rm/no-offer.xml | 8 ++++++--
.../cxf/systest/ws/rm/persistent-message-loss-server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/systest/ws/rm/persistent.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/rm/rminterceptors.xml | 7 +++++--
.../apache/cxf/systest/ws/rm/rminterceptors_provider.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/ws/rm/simple.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/rm/suppressed.xml | 8 ++++++--
.../cxf/systest/ws/rm/sync-ack-atmostonce-server.xml | 11 +++++++++--
.../cxf/systest/ws/rm/sync-ack-persistent-server.xml | 11 +++++++++--
.../java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml | 8 ++++++--
.../apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml | 6 ++++--
.../org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml | 9 +++++++--
.../org/apache/cxf/systest/wssec/examples/saml/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/saml/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/saml/stax-server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/secconv/client.xml | 11 +++++++++--
.../apache/cxf/systest/wssec/examples/secconv/server.xml | 12 ++++++++++--
.../cxf/systest/wssec/examples/secconv/stax-server.xml | 12 ++++++++++--
.../cxf/systest/wssec/examples/sts/cxf-symmetric.xml | 10 ++++++++--
.../org/apache/cxf/systest/wssec/examples/ut/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/ut/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/ut/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/wssec/examples/x509/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/x509/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/x509/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/action/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/action/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/action/signature-server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/action/signature-stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/algsuite/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/algsuite/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/algsuite/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/basicauth/client.xml | 11 +++++++++--
.../cxf/systest/ws/basicauth/server-continuation.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/basicauth/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/bindings/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/bindings/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/bindings/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/cache/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/cache/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/coverage_checker/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/coverage_checker/server.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/coverage_checker/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/fault/client-untrusted.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/fault/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/fault/modified-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/fault/server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/httpget/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/httpget/server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/https/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/https/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/https/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/mtom/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/mtom/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/mtom/stax-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/parts/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/parts/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/parts/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/client-bus.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/policy/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/javafirstclient.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/javafirstserver.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/policy/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/sslcertclient.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/sslnocertclient.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/saml/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/saml/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/saml/subjectconf/client-auth.xml | 11 +++++++++--
.../cxf/systest/ws/saml/subjectconf/client-noauth.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/saml/subjectconf/server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/saml/subjectconf/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/security/client.xml | 7 +++++--
.../org/apache/cxf/systest/ws/security/handler/client.xml | 14 ++++++++++++--
.../org/apache/cxf/systest/ws/security/handler/server.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/security/https_config.xml | 10 ++++++++--
.../apache/cxf/systest/ws/security/https_config_client.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/security/server.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/security/stax-server.xml | 10 ++++++++--
.../resources/org/apache/cxf/systest/ws/swa/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/swa/policy-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/swa/policy-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/swa/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/swa/stax-policy-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/tokens/bst-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/tokens/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/endorsing-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/endorsing-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/tokens/server.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/tokens/stax-endorsing-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/client-derived.xml | 11 +++++++++--
.../test/resources/org/apache/cxf/systest/ws/ut/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/ut/policy-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/server-derived.xml | 12 ++++++++++--
.../test/resources/org/apache/cxf/systest/ws/ut/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/stax-policy-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/ut/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/wssc/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssc/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/wssec10/client.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec10/client_restricted.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec10/client_unauthorized.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssec10/server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_authorized.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_authorized_2.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_restricted.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/wssec10/stax-server.xml | 13 +++++++++++--
.../cxf/systest/ws/wssec10/stax-server_restricted.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/wssec11/client.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec11/client_restricted.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssec11/server.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/x509/client.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/x509/intermediary-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/x509/intermediary.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/x509/jaxws-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/x509/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/xkms/client.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/xkms/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml | 13 +++++++++++--
.../java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/addressing/cxf.xml | 7 +++++--
.../org/apache/cxf/systest/ws/addressing/jms_decoupled.xml | 7 +++++--
.../java/org/apache/cxf/systest/ws/addressing/server.xml | 6 ++++--
.../org/apache/cxf/systest/ws/addressing/spring/spring.xml | 9 +++++++--
.../apache/cxf/systest/ws/addressing/wsa_interceptors.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/addr-anon-client.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/addr-anon-server.xml | 9 +++++++--
.../cxf/systest/ws/policy/addr-inline-policy-old.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/policy/addr-inline-policy.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/addr-optional.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/policy/addr.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/policy/addr0705.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/http-addr-server.xml | 7 +++++--
.../java/org/apache/cxf/systest/ws/policy/http-server.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/policy/http.xml | 7 +++++--
.../cxf/systest/ws/policy/http_client_policy_feature.xml | 12 ++++++++++--
.../src/test/java/org/apache/cxf/systest/ws/policy/rm.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml | 7 +++++--
.../wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml | 7 +++++--
659 files changed, 5140 insertions(+), 1328 deletions(-)
[cxf] 01/02: Refactored Spring bean files to make the header more
readable
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 505563aa79f06d0c77babf8a98d43d62ed50e278
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 11 13:05:36 2019 +0000
Refactored Spring bean files to make the header more readable
---
.../src/main/resources/etc/https-cfg-client.xml | 13 +++++++++++--
.../src/main/resources/etc/https-cfg-service.xml | 13 +++++++++++--
.../src/main/resources/etc/policy-asym.xml | 11 +++++++++--
.../src/main/resources/etc/policy-sym.xml | 11 +++++++++--
.../src/main/resources/etc/policy-symsc.xml | 11 +++++++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
core/src/main/resources/META-INF/cxf/cxf.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/bus.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/customerBus.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/customerBus2.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/init.xml | 7 +++++--
.../test/java/org/apache/cxf/bus/spring/lazyInitBus.xml | 7 +++++--
.../org/apache/cxf/bus/spring/resources/bus-overwrite.xml | 7 +++++--
core/src/test/java/org/apache/cxf/bus/spring/test.xml | 6 ++++--
.../src/test/java/org/apache/cxf/bus/spring/testjsr250.xml | 6 ++++--
.../org/apache/cxf/configuration/spring/test-beans.xml | 6 ++++--
.../apache/cxf/configuration/spring/test-jaxb-beans.xml | 7 +++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/release/samples/in_jvm_transport/coloc.xml | 9 +++++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 7 +++++--
.../jax_rs/basic_https/src/main/resources/ClientConfig.xml | 9 +++++++--
.../jax_rs/basic_https/src/main/resources/ServerConfig.xml | 9 +++++++--
.../spring_security/src/main/webapp/WEB-INF/beans.xml | 9 +++++++--
.../jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml | 7 +++++--
.../src/main/resources/cxf.xml | 9 +++++++--
.../js_browser_client_simple/src/main/resources/cxf.xml | 9 +++++++--
.../client/src/main/webapp/WEB-INF/spring-servlet.xml | 8 ++++++--
.../oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml | 11 +++++++++--
.../server/src/main/webapp/WEB-INF/spring-servlet.xml | 8 ++++++--
.../src/main/resources/client-beans.xml | 7 +++++--
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../samples/sts/src/main/resources/wssec-client-stax.xml | 10 ++++++++--
.../samples/sts/src/main/resources/wssec-client.xml | 10 ++++++++--
.../samples/sts/src/main/resources/wssec-server-stax.xml | 11 +++++++++--
.../samples/sts/src/main/resources/wssec-server.xml | 11 +++++++++--
.../samples/sts/src/main/resources/wssec-sts-stax.xml | 10 ++++++++--
.../release/samples/sts/src/main/resources/wssec-sts.xml | 10 ++++++++--
.../samples/ws_addressing/src/main/resources/client.xml | 9 +++++++--
.../samples/ws_addressing/src/main/resources/server.xml | 8 ++++++--
.../samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml | 8 ++++++--
.../samples/ws_policy/src/main/resources/client.xml | 9 +++++++--
.../samples/ws_policy/src/main/resources/server.xml | 8 ++++++--
.../release/samples/ws_rm/src/main/resources/client.xml | 11 +++++++++--
.../release/samples/ws_rm/src/main/resources/server.xml | 11 +++++++++--
.../sign_enc/src/main/java/demo/wssec/client/wssec.xml | 11 +++++++++--
.../sign_enc/src/main/java/demo/wssec/server/wssec.xml | 11 +++++++++--
.../sign_enc_policy/src/main/resources/ClientConfig.xml | 10 ++++++++--
.../src/main/resources/ClientConfigStax.xml | 10 ++++++++--
.../sign_enc_policy/src/main/resources/ServiceConfig.xml | 11 +++++++++--
.../src/main/resources/ServiceConfigStax.xml | 11 +++++++++--
.../samples/ws_security/ut/src/main/resources/wssec.xml | 11 +++++++++--
.../ut_policy/src/main/resources/ClientConfig.xml | 10 ++++++++--
.../ut_policy/src/main/resources/ClientConfigStax.xml | 10 ++++++++--
.../ut_policy/src/main/resources/ServiceConfig.xml | 11 +++++++++--
.../ut_policy/src/main/resources/ServiceConfigStax.xml | 11 +++++++++--
.../src/main/resources/client-applicationContext.xml | 9 +++++++--
.../release/samples/wsdl_first/src/main/resources/cxf.xml | 8 ++++++--
.../src/main/resources/server-applicationContext.xml | 8 +++++---
.../wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml | 8 ++++++--
.../src/main/resources/server-beans.xml | 7 +++++--
.../wsdl_first_https/src/main/resources/InsecureClient.xml | 7 +++++--
.../wsdl_first_https/src/main/resources/SecureClient.xml | 8 ++++++--
.../wsdl_first_https/src/main/resources/ServerConfig.xml | 9 +++++++--
.../archetype-resources/src/main/webapp/WEB-INF/beans.xml | 8 ++++++--
.../aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml | 6 ++++--
.../org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml | 8 ++++++--
.../jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml | 6 ++++--
.../src/test/java/org/apache/cxf/jaxrs/spring/servers.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml | 7 +++++--
.../main/resources/META-INF/cxf/cxf-extension-jaxws.xml | 7 +++++--
.../java/org/apache/cxf/jaxws/configured-endpoints.xml | 8 ++++++--
.../java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/schemaFirst.xml | 8 ++++++--
.../jaxws/schemavalidationtype-configured-endpoints.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/soapServiceConfig.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/child.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/clients.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml | 7 +++++--
.../src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints2.xml | 8 ++++++--
.../test/java/org/apache/cxf/jaxws/spring/endpoints3.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/jaxws/spring/servers.xml | 8 ++++++--
.../jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/frontend/spring/clients.xml | 8 ++++++--
.../test/java/org/apache/cxf/frontend/spring/rountrip.xml | 8 ++++++--
.../test/java/org/apache/cxf/frontend/spring/servers.xml | 8 ++++++--
.../javascript-tests/src/test/resources/AegisBeans.xml | 8 ++++++--
.../javascript-tests/src/test/resources/AnyBeans.xml | 7 +++++--
.../src/test/resources/DocLitBareClientTestBeans.xml | 7 +++++--
.../src/test/resources/DocLitWrappedClientTestBeans.xml | 8 ++++++--
.../src/test/resources/GreeterClientTestBeans.xml | 7 +++++--
.../src/test/resources/HelloWorldDocLitBeans.xml | 7 +++++--
.../src/test/resources/HelloWorldGreeterBeans.xml | 7 +++++--
.../javascript-tests/src/test/resources/MtoMBeans.xml | 7 +++++--
.../src/test/resources/RPCClientTestBeans.xml | 7 +++++--
.../src/test/resources/XMLHttpRequestTestBeans.xml | 10 ++++++++--
.../src/test/resources/attributeTestBeans.xml | 8 ++++++--
.../src/test/resources/serializationTestBeans.xml | 8 ++++++--
.../src/test/resources/managed-spring-twobuses.xml | 8 ++++++--
.../src/test/resources/managed-spring-twobuses2.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring2.xml | 8 ++++++--
rt/management/src/test/resources/managed-spring3.xml | 8 ++++++--
rt/management/src/test/resources/no-connector-spring.xml | 7 +++++--
.../java/org/apache/cxf/jaxrs/client/spring/clients.xml | 8 ++++++--
.../java/org/apache/cxf/jaxrs/provider/atom/servers.xml | 7 +++++--
.../apache/cxf/transport/http_jetty/invalid-engines.xml | 10 ++++++++--
.../http_jetty/server-engine-factory-jetty9-connector.xml | 9 +++++++--
.../cxf/transport/http_jetty/server-engine-factory.xml | 9 +++++++--
.../apache/cxf/transport/http_jetty/spring/beans-props.xml | 10 ++++++++--
.../org/apache/cxf/transport/http_jetty/spring/beans.xml | 10 ++++++++--
.../cxf/transport/http_jetty/spring/invalid-beans.xml | 8 ++++++--
.../http/netty/client/integration/ServerConfig.xml | 9 +++++++--
.../http/netty/server/integration/ApplicationContext.xml | 11 +++++++++--
.../http/netty/server/integration/ServerConfig.xml | 9 +++++++--
.../cxf/transport/http/netty/server/spring/beans-props.xml | 10 ++++++++--
.../cxf/transport/http/netty/server/spring/beans.xml | 10 ++++++++--
.../transport/http/netty/server/spring/invalid-beans.xml | 8 ++++++--
.../apache/cxf/transport/http_undertow/invalid-engines.xml | 10 ++++++++--
.../cxf/transport/http_undertow/server-engine-factory.xml | 9 +++++++--
.../cxf/transport/http_undertow/spring/beans-props.xml | 10 ++++++++--
.../apache/cxf/transport/http_undertow/spring/beans.xml | 10 ++++++++--
.../cxf/transport/http_undertow/spring/invalid-beans.xml | 8 ++++++--
.../http/src/main/resources/META-INF/cxf/cxf-servlet.xml | 7 +++++--
.../org/apache/cxf/transport/http/spring/conduit-bean.xml | 9 +++++++--
.../cxf/transport/http/spring/conduit-tlsrefs-bean.xml | 9 +++++++--
.../java/org/apache/cxf/ws/policy/disable-policy-bus.xml | 8 ++++++--
.../java/org/apache/cxf/ws/policy/ignorable-policy.xml | 10 ++++++++--
.../java/org/apache/cxf/ws/policy/ignorable-policy2.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/ws/policy/policy-bus.xml | 9 +++++++--
.../test/java/org/apache/cxf/ws/policy/spring/beans.xml | 10 ++++++++--
.../test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml | 9 +++++++--
.../rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml | 9 +++++++--
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml | 9 +++++++--
.../java/org/apache/cxf/ws/rm/managed-manager-bean.xml | 9 +++++++--
.../rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml | 9 +++++++--
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml | 6 ++++--
.../apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 10 ++++++++--
.../cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml | 10 ++++++++--
.../apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/basic_auth/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/basic_auth/cxf-service.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/batch/cxf-client-unit.xml | 10 ++++++++--
.../resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml | 10 ++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/binarysecuritytoken/cxf-service.xml | 11 +++++++++--
.../systest/sts/binarysecuritytoken/stax-cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/caching/cxf-caching-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/caching/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/caching/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-bad-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/claims/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/claims/stax-cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/cross_domain/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-sts-common.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/custom/cxf-sts.xml | 13 +++++++++++--
.../cxf/systest/sts/custom_onbehalfof/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml | 10 ++++++++--
.../cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-sts-common.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml | 12 ++++++++++--
.../cxf/systest/sts/distributed_caching/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/distributed_caching/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 13 +++++++++++--
.../cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 13 +++++++++++--
.../org/apache/cxf/systest/sts/jwt/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 12 ++++++++++--
.../cxf/systest/sts/kerberos/cxf-intermediary-client.xml | 10 ++++++++--
.../systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/kerberos/cxf-intermediary.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/kerberos/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-client-unit.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/soap12/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/soap12/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/sts_sender_vouches/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/sts_sender_vouches/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 10 ++++++++--
.../cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml | 10 ++++++++--
.../apache/cxf/systest/sts/transformation/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/transformation/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/usernametoken/cxf-bad-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/usernametoken/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/usernametoken/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/usernametoken/stax-cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/asymmetric/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/asymmetric/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/delegation/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/delegation/cxf-sts-transport.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-transport.xml | 12 ++++++++++--
.../apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-ut.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/cxf-x509.xml | 10 ++++++++--
.../cxf/systest/sts/deployment/stax-cxf-transport.xml | 12 ++++++++++--
.../cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml | 10 ++++++++--
.../apache/cxf/systest/sts/deployment/stax-cxf-x509.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/deployment/sts/realms.xml | 12 ++++++++++--
.../sts/intermediary_transformation/cxf-bad-client.xml | 10 ++++++++--
.../systest/sts/intermediary_transformation/cxf-client.xml | 10 ++++++++--
.../cxf-intermediary-caching.xml | 11 +++++++++--
.../sts/intermediary_transformation/cxf-intermediary.xml | 11 +++++++++--
.../sts/intermediary_transformation/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/issuer/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/issuer/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/issueunit/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-service2.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml | 12 ++++++++++--
.../org/apache/cxf/systest/sts/rest/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 13 +++++++++++--
.../apache/cxf/systest/sts/sendervouches/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/sendervouches/cxf-intermediary.xml | 11 +++++++++--
.../apache/cxf/systest/sts/sendervouches/cxf-service.xml | 11 +++++++++--
.../systest/sts/sendervouches/cxf-stax-intermediary.xml | 11 +++++++++--
.../cxf/systest/sts/sendervouches/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/stsclient/cxf-client-name.xml | 10 ++++++++--
.../cxf/systest/sts/stsclient/cxf-default-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/stsclient/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/symmetric/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/symmetric/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/symmetric/cxf-stax-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/template/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/template/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/template/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/transport/cxf-bad-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/transport/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/transport/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/transport/cxf-stax-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-client.xml | 10 ++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-service.xml | 11 +++++++++--
.../apache/cxf/systest/sts/username_actas/cxf-service2.xml | 11 +++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-client.xml | 10 ++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-service.xml | 11 +++++++++--
.../cxf/systest/sts/username_onbehalfof/cxf-service2.xml | 11 +++++++++--
.../apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-client.xml | 10 ++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-service.xml | 11 +++++++++--
.../org/apache/cxf/systest/sts/x509/cxf-stax-service.xml | 11 +++++++++--
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 5 +++--
.../xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml | 10 ++++++++--
.../xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml | 10 ++++++++--
.../xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml | 10 ++++++++--
src/site/site.xml | 2 +-
.../webapp/src/main/webapp/WEB-INF/beans.xml | 7 +++++--
.../src/test/java/org/apache/cxf/systest/source/cxf.xml | 8 ++++++--
.../databinding/src/test/resources/aegisJaxWsBeans.xml | 9 +++++++--
.../src/test/resources/aegisSportsServiceBeans.xml | 9 +++++++--
.../databinding/src/test/resources/aegisWSDLNSBeans.xml | 9 +++++++--
systests/databinding/src/test/resources/extrajaxbclass.xml | 8 ++++++--
systests/databinding/src/test/resources/mtomTestBeans.xml | 9 +++++++--
.../src/test/resources/webapp/WEB-INF/beans.xml | 6 +++++-
.../cxf/systest/http/resources/BethalClientBeans.xml | 10 ++++++++--
.../apache/cxf/systest/http/resources/SessionServer.xml | 9 +++++++--
.../cxf/systest/http/resources/SessionServer_Windows.xml | 9 +++++++--
.../apache/cxf/systest/http/resources/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/http/resources/jaxws-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/http/resources/pkcs12.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec-url.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec.xml | 10 ++++++++--
.../org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client1.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client2.xml | 9 +++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client3.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client4.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client5.xml | 10 ++++++++--
.../cxf/systest/jaxrs/security/jaxrs-https-client_old.xml | 4 ++--
.../cxf/systest/jaxrs/security/jaxrs-https-server.xml | 9 +++++++--
systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml | 7 ++++---
.../jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml | 10 +++++++---
.../jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml | 8 ++++++--
.../src/test/resources/jaxrs_databinding/WEB-INF/beans.xml | 11 ++++++++---
.../src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml | 11 ++++++++---
.../test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml | 11 ++++++++---
.../test/resources/jaxrs_jaas_security/WEB-INF/beans.xml | 8 ++++++--
.../resources/jaxrs_many_destinations/WEB-INF/beans.xml | 11 ++++++++---
.../jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml | 10 +++++++---
.../src/test/resources/jaxrs_security/WEB-INF/beans.xml | 9 +++++----
.../src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml | 10 ++++++++--
.../src/test/resources/jaxrs_spring/WEB-INF/beans.xml | 7 +++++--
.../resources/jaxrs_spring_providers/WEB-INF/beans.xml | 7 +++++--
.../src/test/resources/servlet_as_filter/WEB-INF/beans.xml | 7 +++++--
.../java/org/apache/cxf/systest/dispatch/client-config.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/handlers/beans.xml | 8 ++++++--
.../cxf/systest/handlers/beans_autoRewriteSoapAddress.xml | 8 ++++++--
.../systest/handlers/beans_no_autoRewriteSoapAddress.xml | 8 ++++++--
.../org/apache/cxf/systest/handlers/soap_fault_beans.xml | 8 ++++++--
.../org/apache/cxf/systest/jaxws/fault-stack-trace.xml | 6 ++++--
.../org/apache/cxf/systest/jaxws/springWebService.xml | 8 ++++++--
.../cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml | 9 +++++++--
.../apache/cxf/systest/kerberos/wssec/kerberos/client.xml | 11 +++++++++--
.../apache/cxf/systest/kerberos/wssec/kerberos/server.xml | 14 ++++++++++++--
.../cxf/systest/kerberos/wssec/kerberos/stax-server.xml | 13 +++++++++++--
.../cxf/systest/kerberos/wssec/kerberos/sts-client.xml | 10 ++++++++--
.../apache/cxf/systest/kerberos/wssec/spnego/client.xml | 11 +++++++++--
.../apache/cxf/systest/kerberos/wssec/spnego/server.xml | 13 +++++++++++--
.../cxf/systest/kerberos/wssec/spnego/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 12 ++++++++++--
.../apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 12 ++++++++++--
systests/ldap/src/test/resources/ldap-jaxrs.xml | 7 +++++--
systests/ldap/src/test/resources/ldap.xml | 7 +++++--
.../cxf/systest/http/resources/BethalClientBeans.xml | 10 ++++++++--
.../apache/cxf/systest/http/resources/SessionServer.xml | 9 +++++++--
.../cxf/systest/http/resources/SessionServer_Windows.xml | 9 +++++++--
.../apache/cxf/systest/http/resources/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/http/resources/jaxws-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/http/resources/pkcs12.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec-url.xml | 10 ++++++++--
.../cxf/systest/http/resources/resource-key-spec.xml | 10 ++++++++--
.../cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml | 7 +++++--
.../org/apache/cxf/systest/jaxrs/security/jcs/client.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml | 11 +++++++++--
.../jaxrs/security/jose/jwejws/algorithms-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/jose/jwejws/client.xml | 11 +++++++++--
.../jaxrs/security/jose/jwejws/reference-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/jose/jwejws/server.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverJweJson.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverJwsJson.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwejws/serverMultipart.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/algorithms-server.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/authn-authz-server.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/jose/jwt/client.xml | 11 +++++++++--
.../systest/jaxrs/security/jose/jwt/properties-server.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/filters/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/grants/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/tls/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oauth2/tls/client2.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/oidc/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/oidc/filters/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/saml/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/saml/secureServer.xml | 12 ++++++++++--
.../org/apache/cxf/systest/jaxrs/security/saml/server.xml | 11 +++++++++--
.../apache/cxf/systest/jaxrs/security/samlsso/client.xml | 11 +++++++++--
.../cxf/systest/jaxrs/security/samlsso/metadata-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/jaxrs/security/xml/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/jaxrs/security/xml/server.xml | 12 ++++++++++--
.../apache/cxf/systest/jaxrs/security/xml/stax-server.xml | 12 ++++++++++--
.../test/java/org/apache/cxf/systest/jms/JMSClients.xml | 7 +++++--
.../cxf/systest/jms/continuations/jms_test_config.xml | 9 +++++++--
.../src/test/java/org/apache/cxf/systest/jms/gzipBus.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/jms/soap12Bus.xml | 8 ++++++--
.../org/apache/cxf/systest/http_undertow/SessionServer.xml | 10 ++++++++--
.../apache/cxf/systest/http_undertow/continuations/cxf.xml | 8 ++++++--
.../cxf/systest/http_undertow/continuations/cxf_https.xml | 9 +++++++--
.../systest/http_undertow/continuations/jaxws-server.xml | 9 +++++++--
.../resources/org/apache/cxf/systest/http_undertow/cxf.xml | 7 +++++--
.../cxf/systest/http_undertow/server-lifecycle-beans.xml | 9 +++++++--
.../org/apache/cxf/systest/http_undertow/server.xml | 7 +++++--
.../apache/cxf/systest/http_undertow/undertow-engine.xml | 9 +++++++--
.../cxf/systest/http_undertow/undertowBasicAuthServer.xml | 7 +++++--
.../cxf/systest/http_undertow/undertowDigestServer.xml | 7 +++++--
.../org/apache/cxf/https/ssl3/sslv3-client-allow.xml | 11 +++++++++--
.../resources/org/apache/cxf/https/ssl3/sslv3-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/https/ssl3/sslv3-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/http/SessionServer.xml | 10 ++++++++--
.../apache/cxf/systest/http_jetty/continuations/cxf.xml | 8 ++++++--
.../cxf/systest/http_jetty/continuations/cxf_https.xml | 9 +++++++--
.../cxf/systest/http_jetty/continuations/jaxws-server.xml | 9 +++++++--
.../cxf/systest/http_jetty/continuations/jetty-engine.xml | 7 +++++--
.../resources/org/apache/cxf/systest/http_jetty/cxf.xml | 7 +++++--
.../org/apache/cxf/systest/http_jetty/jetty-engine.xml | 9 +++++++--
.../apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml | 7 +++++--
.../apache/cxf/systest/http_jetty/jettyDigestServer.xml | 7 +++++--
.../cxf/systest/http_jetty/server-lifecycle-beans.xml | 9 +++++++--
.../resources/org/apache/cxf/systest/http_jetty/server.xml | 7 +++++--
.../ciphersuites/ciphersuites-client-expired-cert.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-noconfig.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-tlsv12.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-client-tlsv13.xml | 11 +++++++++--
.../cxf/systest/https/ciphersuites/ciphersuites-client.xml | 11 +++++++++--
.../systest/https/ciphersuites/ciphersuites-dhe-client.xml | 11 +++++++++--
.../https/ciphersuites/ciphersuites-explicit-client.xml | 11 +++++++++--
.../cxf/systest/https/ciphersuites/ciphersuites-server.xml | 12 ++++++++++--
.../cxf/systest/https/clientauth/client-auth-chain.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-invalid.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-invalid2.xml | 11 +++++++++--
.../cxf/systest/https/clientauth/client-auth-server.xml | 12 ++++++++++--
.../apache/cxf/systest/https/clientauth/client-auth.xml | 11 +++++++++--
.../apache/cxf/systest/https/clientauth/client-no-auth.xml | 11 +++++++++--
.../apache/cxf/systest/https/conduit/BethalClientBeans.xml | 10 ++++++++--
.../cxf/systest/https/conduit/jaxws-publish-callback.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/jaxws-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/jaxws-server.xml | 10 ++++++++--
.../cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml | 10 ++++++++--
.../org/apache/cxf/systest/https/conduit/pkcs12.xml | 10 ++++++++--
.../cxf/systest/https/conduit/resource-key-spec-url.xml | 11 +++++++++--
.../apache/cxf/systest/https/conduit/resource-key-spec.xml | 10 ++++++++--
.../systest/https/constraints/jaxws-server-constraints.xml | 10 ++++++++--
.../systest/https/hostname/hostname-client-disablecn.xml | 11 +++++++++--
.../systest/https/hostname/hostname-client-usedefault.xml | 11 +++++++++--
.../apache/cxf/systest/https/hostname/hostname-client.xml | 11 +++++++++--
.../systest/https/hostname/hostname-server-deprecated.xml | 12 ++++++++++--
.../apache/cxf/systest/https/hostname/hostname-server.xml | 12 ++++++++++--
.../apache/cxf/systest/https/trust/client-trust-config.xml | 11 +++++++++--
.../cxf/systest/https/trust/client-trust-empty-config.xml | 11 +++++++++--
.../org/apache/cxf/systest/https/trust/client-trust.xml | 11 +++++++++--
.../org/apache/cxf/systest/https/trust/trust-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/servlet/cxf-jaxrs.xml | 8 ++++++--
.../org/apache/cxf/systest/servlet/cxf-servlet.xml | 7 +++++--
.../org/apache/cxf/systest/servlet/spring-auto-launch.xml | 7 +++++--
.../org/apache/cxf/systest/servlet/spring-error.xml | 7 +++++--
.../resources/org/apache/cxf/systest/servlet/spring-js.xml | 6 ++++--
.../resources/org/apache/cxf/systest/servlet/spring.xml | 7 +++++--
.../src/test/resources/resolver/WEB-INF/beans.xml | 2 +-
.../src/test/java/org/apache/cxf/cxf1226/beans.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/cxf1332/beans.xml | 8 ++++++--
.../apache/cxf/systest/beanincreationexception/beans.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/bus/basic.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/bus/servlet.xml | 7 +++++--
.../cxf/systest/clustering/circuit_breaker_failover.xml | 8 ++++++--
.../java/org/apache/cxf/systest/clustering/failover.xml | 9 +++++++--
.../cxf/systest/clustering/failover_address_override.xml | 10 ++++++++--
.../org/apache/cxf/systest/clustering/load_distributor.xml | 9 +++++++--
.../clustering/load_distributor_address_override.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/clustering/targets.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml | 10 ++++++++--
.../src/test/java/org/apache/cxf/systest/coloc/cxf.xml | 2 +-
.../cxf/systest/corba/corba_binding_factory_configurer.xml | 9 +++++++--
.../org/apache/cxf/systest/corba/hello_world_client.xml | 8 ++++++--
.../org/apache/cxf/systest/corba/hello_world_server.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/cxf6319/handler.xml | 2 +-
.../java/org/apache/cxf/systest/factory_pattern/cxf.xml | 6 ++++--
.../apache/cxf/systest/factory_pattern/cxf_multiplex.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/interceptor/addr.xml | 7 +++++--
.../java/org/apache/cxf/systest/interceptor/no-addr.xml | 7 +++++--
.../src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml | 8 ++++++--
.../org/apache/cxf/systest/management/counter-spring.xml | 6 ++++--
.../java/org/apache/cxf/systest/management/managed-bus.xml | 6 ++++--
.../org/apache/cxf/systest/management/managed-spring.xml | 6 ++++--
.../org/apache/cxf/systest/management/persistent-id.xml | 6 ++++--
.../java/org/apache/cxf/systest/outofband/header/cxf.xml | 8 ++++++--
.../java/org/apache/cxf/systest/soapfault/handlers.xml | 5 +++--
.../systest/type_test/databinding-schema-validation.xml | 6 ++++--
.../uncategorized/src/test/resources/crossSchemaBeans.xml | 8 ++++++--
.../test/resources/org/apache/cxf/systest/soap/client.xml | 11 +++++++++--
.../test/resources/org/apache/cxf/systest/soap/server.xml | 2 +-
.../org/apache/cxf/systest/soap/transform-server.xml | 2 +-
.../resources/org/apache/cxf/systest/soap/xslt-server.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/atleastonce-inorder.xml | 9 ++++++---
.../test/java/org/apache/cxf/systest/ws/rm/atleastonce.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/rm/atmostonce-inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/atmostonce.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/decoupled.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/deferred.xml | 8 ++++++--
.../cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/rm/exactlyonce-inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/exactlyonce.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/expire-fast-seq.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/inactivity-timeout.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/ws/rm/inorder.xml | 8 ++++++--
.../test/java/org/apache/cxf/systest/ws/rm/limit-seqs.xml | 8 ++++++--
.../java/org/apache/cxf/systest/ws/rm/managed-client.xml | 11 +++++++++--
.../java/org/apache/cxf/systest/ws/rm/managed-server.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/message-loss-server.xml | 10 ++++++++--
.../java/org/apache/cxf/systest/ws/rm/message-loss.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/rm/no-offer.xml | 8 ++++++--
.../cxf/systest/ws/rm/persistent-message-loss-server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/systest/ws/rm/persistent.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/rm/rminterceptors.xml | 7 +++++--
.../apache/cxf/systest/ws/rm/rminterceptors_provider.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/rm/seqlength1.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/rm/seqlength10.xml | 8 ++++++--
.../src/test/java/org/apache/cxf/systest/ws/rm/simple.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/rm/suppressed.xml | 8 ++++++--
.../cxf/systest/ws/rm/sync-ack-atmostonce-server.xml | 11 +++++++++--
.../cxf/systest/ws/rm/sync-ack-persistent-server.xml | 11 +++++++++--
.../java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/rm/terminate-on-shutdown.xml | 8 ++++++--
.../apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml | 6 ++++--
.../org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml | 9 +++++++--
.../org/apache/cxf/systest/wssec/examples/saml/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/saml/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/saml/stax-server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/secconv/client.xml | 11 +++++++++--
.../apache/cxf/systest/wssec/examples/secconv/server.xml | 12 ++++++++++--
.../cxf/systest/wssec/examples/secconv/stax-server.xml | 12 ++++++++++--
.../cxf/systest/wssec/examples/sts/cxf-symmetric.xml | 10 ++++++++--
.../org/apache/cxf/systest/wssec/examples/ut/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/ut/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/ut/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/wssec/examples/x509/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/wssec/examples/x509/server.xml | 12 ++++++++++--
.../apache/cxf/systest/wssec/examples/x509/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/action/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/action/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/action/signature-server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/action/signature-stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/algsuite/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/algsuite/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/algsuite/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/basicauth/client.xml | 11 +++++++++--
.../cxf/systest/ws/basicauth/server-continuation.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/basicauth/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/bindings/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/bindings/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/bindings/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/cache/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/cache/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/coverage_checker/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/coverage_checker/server.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/coverage_checker/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/fault/client-untrusted.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/fault/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/fault/modified-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/fault/server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/gcm/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/httpget/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/httpget/server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/https/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/https/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/https/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/mtom/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/mtom/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/mtom/stax-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/parts/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/parts/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/parts/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/client-bus.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/policy/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/javafirstclient.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/javafirstserver.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/policy/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/sslcertclient.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/policy/sslnocertclient.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/saml/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/saml/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/saml/subjectconf/client-auth.xml | 11 +++++++++--
.../cxf/systest/ws/saml/subjectconf/client-noauth.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/saml/subjectconf/server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/saml/subjectconf/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/security/client.xml | 7 +++++--
.../org/apache/cxf/systest/ws/security/handler/client.xml | 14 ++++++++++++--
.../org/apache/cxf/systest/ws/security/handler/server.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/security/https_config.xml | 10 ++++++++--
.../apache/cxf/systest/ws/security/https_config_client.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/security/server.xml | 10 ++++++++--
.../org/apache/cxf/systest/ws/security/stax-server.xml | 10 ++++++++--
.../resources/org/apache/cxf/systest/ws/swa/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/swa/policy-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/swa/policy-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/swa/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/swa/stax-policy-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/tokens/bst-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/tokens/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/endorsing-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/endorsing-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/tokens/server.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/tokens/stax-endorsing-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/tokens/tls-stax-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/client-derived.xml | 11 +++++++++--
.../test/resources/org/apache/cxf/systest/ws/ut/client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/ut/policy-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/server-derived.xml | 12 ++++++++++--
.../test/resources/org/apache/cxf/systest/ws/ut/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/ut/stax-policy-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/ut/stax-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/wssc/client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssc/server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/wssec10/client.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec10/client_restricted.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec10/client_unauthorized.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssec10/server.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_authorized.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_authorized_2.xml | 13 +++++++++++--
.../apache/cxf/systest/ws/wssec10/server_restricted.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/wssec10/stax-server.xml | 13 +++++++++++--
.../cxf/systest/ws/wssec10/stax-server_restricted.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/wssec11/client.xml | 11 +++++++++--
.../apache/cxf/systest/ws/wssec11/client_restricted.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/wssec11/server.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/x509/client.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/x509/intermediary-client.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/x509/intermediary.xml | 11 +++++++++--
.../org/apache/cxf/systest/ws/x509/jaxws-client.xml | 11 +++++++++--
.../resources/org/apache/cxf/systest/ws/x509/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 13 +++++++++++--
.../resources/org/apache/cxf/systest/ws/xkms/client.xml | 12 ++++++++++--
.../resources/org/apache/cxf/systest/ws/xkms/server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 13 +++++++++++--
.../org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml | 13 +++++++++++--
.../java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/addressing/cxf.xml | 7 +++++--
.../org/apache/cxf/systest/ws/addressing/jms_decoupled.xml | 7 +++++--
.../java/org/apache/cxf/systest/ws/addressing/server.xml | 6 ++++--
.../org/apache/cxf/systest/ws/addressing/spring/spring.xml | 9 +++++++--
.../apache/cxf/systest/ws/addressing/wsa_interceptors.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/addr-anon-client.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/addr-anon-server.xml | 9 +++++++--
.../cxf/systest/ws/policy/addr-inline-policy-old.xml | 12 ++++++++++--
.../apache/cxf/systest/ws/policy/addr-inline-policy.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/addr-optional.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml | 9 +++++++--
.../test/java/org/apache/cxf/systest/ws/policy/addr.xml | 9 +++++++--
.../java/org/apache/cxf/systest/ws/policy/addr0705.xml | 9 +++++++--
.../org/apache/cxf/systest/ws/policy/http-addr-server.xml | 7 +++++--
.../java/org/apache/cxf/systest/ws/policy/http-server.xml | 7 +++++--
.../test/java/org/apache/cxf/systest/ws/policy/http.xml | 7 +++++--
.../cxf/systest/ws/policy/http_client_policy_feature.xml | 12 ++++++++++--
.../src/test/java/org/apache/cxf/systest/ws/policy/rm.xml | 8 ++++++--
.../org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml | 12 ++++++++++--
.../org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml | 11 +++++++++--
.../test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml | 7 +++++--
.../wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml | 7 +++++--
658 files changed, 5140 insertions(+), 1319 deletions(-)
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
index 9543378..6e35b73 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://InteropBaseAddress/interop" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocat [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://InteropBaseAddress/interop"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<http:conduit name="https://.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="ckpass">
@@ -28,4 +37,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
index 168338a..de2e0d0 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://InteropBaseAddress/interop" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocat [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://InteropBaseAddress/interop"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<httpj:engine-factory id="tls-settings">
<httpj:engine port="8080">
<httpj:tlsServerParameters>
@@ -30,4 +39,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
index 8056d89..1028a05 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
@@ -32,4 +39,4 @@
<entry key="security.encryption.properties" value="etc/serviceKeystore.properties"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
index d5b0df4..1991b93 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
@@ -30,4 +37,4 @@
<entry key="security.encryption.properties" value="etc/serviceKeystore.properties"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
index 042145b..354b41b 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
<jaxws:properties>
<entry key="security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
@@ -30,4 +37,4 @@
<entry key="security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/cxf-servlet.xml b/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/cxf-servlet.xml
index 80bf2fa..ecb75ee 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -17,6 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:endpoint id="DocPortType" implementor="org.apache.cxf.performance.complex_type.server.ServerImpl" wsdlLocation="/wsdl/perf.wsdl" address="/SoapHttpDocLitPort"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/cxf/cxf.xml b/core/src/main/resources/META-INF/cxf/cxf.xml
index cb699ae..fb5949c 100644
--- a/core/src/main/resources/META-INF/cxf/cxf.xml
+++ b/core/src/main/resources/META-INF/cxf/cxf.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- For Testing using the Spring commons processor, uncomment one of:-->
<!--
<bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
@@ -27,4 +30,4 @@
<bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
<bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
<bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/bus.xml b/core/src/test/java/org/apache/cxf/bus/spring/bus.xml
index 9b2085b..376b15e 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/bus.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/bus.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:c="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:c="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<c:bus>
<c:features>
<c:logging/>
@@ -27,4 +30,4 @@
</c:features>
</c:bus>
<bean id="tb" class="org.apache.cxf.bus.spring.BusDefinitionParserTest$TestBean"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml b/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml
index 0b0f8c9..bdd6166 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<cxf:bus bus="cxf1">
<cxf:outInterceptors>
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
@@ -28,4 +31,4 @@
<bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
</cxf:inInterceptors>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml b/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml
index 0b0f8c9..bdd6166 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<cxf:bus bus="cxf1">
<cxf:outInterceptors>
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
@@ -28,4 +31,4 @@
<bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
</cxf:inInterceptors>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/init.xml b/core/src/test/java/org/apache/cxf/bus/spring/init.xml
index 55b13ff..6921613 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/init.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/init.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.cxf.bus.spring.SpringBusFactoryTest$TestListener">
<property name="bus" ref="cxf"/>
</bean>
@@ -26,4 +29,4 @@
<bean class="org.apache.cxf.bus.spring.SpringBusFactoryTest$TestFeature"/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml b/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml
index 6cc4f07..14020e2 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml
@@ -17,10 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:c="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd" default-lazy-init="true">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:c="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd" default-lazy-init="true">
<c:bus>
<c:features>
<c:logging/>
</c:features>
</c:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/resources/bus-overwrite.xml b/core/src/test/java/org/apache/cxf/bus/spring/resources/bus-overwrite.xml
index 64d5485..0fd7bd2 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/resources/bus-overwrite.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/resources/bus-overwrite.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cxf" class="org.apache.cxf.bus.extension.ExtensionManagerBus">
<property name="inInterceptors">
<list>
@@ -56,4 +59,4 @@
<bean id="out-fault" class="org.apache.cxf.bus.spring.SpringBusFactoryTest$TestInterceptor">
<property name="name" value="out-fault"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/test.xml b/core/src/test/java/org/apache/cxf/bus/spring/test.xml
index 65506f3..88d2ec9 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/test.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/test.xml
@@ -17,11 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<property name="propertyEditorRegistrars">
<list merge="true">
</list>
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml b/core/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml
index 8bcecc3..0f4eb91 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml
+++ b/core/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml
@@ -17,8 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="testExtension" class="org.apache.cxf.bus.spring.SpringBusFactoryTest$TestExtension">
<constructor-arg ref="cxf"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml b/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
index 359bb47..bcf962d 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/configuration/spring/bean.properties"/>
</bean>
@@ -56,4 +58,4 @@
<property name="unsignedShortAttr" value="20"/>
<property name="unsignedByteAttr" value="21"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml b/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
index 801968a..00dc24f 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="complex" class="org.apache.cxf.configuration.spring.JaxbPropertyEditorTest$FooBean" lazy-init="true">
<property name="name">
<value>foam</value>
@@ -40,4 +43,4 @@
</value>
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml b/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml
index 64f295f..7831263 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml
@@ -18,11 +18,14 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<bean id="client" class="demo.spring.HelloWorld" factory-bean="clientFactory" factory-method="create"/>
<bean id="clientFactory" class="org.apache.cxf.frontend.ClientProxyFactoryBean">
<property name="serviceClass" value="demo.spring.HelloWorld"/>
<property name="address" value="http://localhost:9002/services/HelloWorld"/>
</bean>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
index b1432f6..e7ab11d 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -18,7 +18,11 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:lang="http://www.springframework.org/schema/lang" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://cxf.apache.org/simple http://cxf.apache.org/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:lang="http://www.springframework.org/schema/lang"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
@@ -36,4 +40,4 @@
</simple:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/in_jvm_transport/coloc.xml b/distribution/src/main/release/samples/in_jvm_transport/coloc.xml
index 88b2488..ccf93e7 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/coloc.xml
+++ b/distribution/src/main/release/samples/in_jvm_transport/coloc.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:coloc="http://cxf.apache.org/binding/coloc" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sprin [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:coloc="http://cxf.apache.org/binding/coloc"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="faultOutbound" class="demo.colocated.common.ThrowFaultInterceptor"/>
<cxf:bus>
<cxf:outInterceptors>
@@ -31,4 +36,4 @@
<coloc:enableColoc/>
</jaxws:features>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
index 9297610..8c54d16 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -17,10 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:server id="jaxwsService" serviceClass="demo.hw.server.HelloWorld" address="/hello_world">
<jaxws:serviceBean>
<bean class="demo.hw.server.HelloWorldImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml b/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml
index b451f70..343bb4d 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml
@@ -18,11 +18,14 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
<bean id="client" class="demo.spring.service.HelloWorld" factory-bean="clientFactory" factory-method="create"/>
<bean id="clientFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
<property name="serviceClass" value="demo.spring.service.HelloWorld"/>
<property name="address" value="http://localhost:9002/services/HelloWorld"/>
</bean>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
index 760f310..6ed08f6 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -18,7 +18,10 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxws:endpoint id="helloWorld" implementor="demo.spring.service.HelloWorldImpl" address="/HelloWorld">
@@ -27,4 +30,4 @@
</jaxws:features>
</jaxws:endpoint>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml
index 3d2e07f..caac497 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml
@@ -17,7 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/trans [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
@@ -33,4 +38,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
index d0100c1..ffb8059 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
@@ -20,7 +20,12 @@
<!--
** This file configures the Server which exposes the REST endpoint.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transport [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="9000">
<httpj:tlsServerParameters>
@@ -34,4 +39,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
index 8548491..70b7f9b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring- [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxrs:server id="bookservice" address="/">
@@ -52,4 +57,4 @@
</security:authentication-provider>
</security:authentication-manager>
<bean id="noopEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml
index 364d1a2..43519ae 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:endpoint id="SoapService" address="/SoapContext/SoapPort" implementor="demo.hw.server.GreeterImpl">
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
index e3de1cf..cb5f700 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/resources/cxf.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http:/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd">
<httpj:engine-factory bus="cxf">
<!-- The server runs on port 9000 -->
<httpj:engine port="9000">
@@ -43,4 +48,4 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml b/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml
index 12ac5ef..31ef864 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/resources/cxf.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http:/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd">
<httpj:engine-factory bus="cxf">
<!-- The server runs on port 9000 -->
<httpj:engine port="9000">
@@ -49,4 +54,4 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/webapp/WEB-INF/spring-servlet.xml b/distribution/src/main/release/samples/oauth/client/src/main/webapp/WEB-INF/spring-servlet.xml
index 2202d48..734771c 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/distribution/src/main/release/samples/oauth/client/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.sp [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<mvc:annotation-driven/>
<context:annotation-config/>
<context:component-scan base-package="demo.oauth.client.controllers"/>
@@ -25,4 +29,4 @@
<property name="prefix" value="/WEB-INF/views/"/>
<property name="suffix" value=".jsp"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
index f69f50e..2c05c5d 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
+++ b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation="http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http:/ [...]
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<!-- Publish OAuth endpoints-->
@@ -47,4 +54,4 @@
<bean id="springSecurityExceptionMapper" class="demo.oauth.server.spring.SpringSecurityExceptionMapper"/>
<!-- Resource Provider -->
<bean id="resource" class="demo.oauth.server.SampleResourceProvider"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/spring-servlet.xml b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/spring-servlet.xml
index 0b5b40a..ace2ba2 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.sp [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<mvc:annotation-driven/>
<context:annotation-config/>
<context:component-scan base-package="demo.oauth.server.controllers"/>
@@ -25,4 +29,4 @@
<property name="prefix" value="/WEB-INF/views/"/>
<property name="suffix" value=".jsp"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml b/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml
index 4cabcbc..bea11c3 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml
@@ -18,11 +18,14 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<bean id="client" class="demo.spring.service.HelloWorld" factory-bean="clientFactory" factory-method="create"/>
<bean id="clientFactory" class="org.apache.cxf.frontend.ClientProxyFactoryBean">
<property name="serviceClass" value="demo.spring.service.HelloWorld"/>
<property name="address" value="http://localhost:9002/services/HelloWorld"/>
</bean>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
index fe41cde..7286592 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -18,7 +18,11 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:lang="http://www.springframework.org/schema/lang" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://cxf.apache.org/simple http://cxf.apache.org/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:lang="http://www.springframework.org/schema/lang"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<lang:jruby id="helloworldImpl" script-source="classpath:HelloWorldImpl.rb" script-interfaces="demo.spring.service.HelloWorld" scope="prototype">
@@ -29,4 +33,4 @@
</simple:serviceBean>
</simple:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
index 12c9245..742987f 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -58,4 +64,4 @@
</entry>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
index dba83bf..0fb5d8e 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -57,4 +63,4 @@
</entry>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
index 78b7b36..9a5b3a6 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -32,4 +39,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
index dc2192b..7be4ed8 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -31,4 +38,4 @@
<entry key="security.encryption.properties" value="serviceKeystore.properties"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
index 0d7e6e1..6ebb10a 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -60,4 +66,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
index fd53519..f32034a 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -59,4 +65,4 @@
<entry key="security.signature.username" value="mystskey"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_addressing/src/main/resources/client.xml b/distribution/src/main/release/samples/ws_addressing/src/main/resources/client.xml
index 4cb8b9f..06eeb2e 100644
--- a/distribution/src/main/release/samples/ws_addressing/src/main/resources/client.xml
+++ b/distribution/src/main/release/samples/ws_addressing/src/main/resources/client.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://ww [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
@@ -26,4 +31,4 @@
<wsa:addressing/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_addressing/src/main/resources/server.xml b/distribution/src/main/release/samples/ws_addressing/src/main/resources/server.xml
index bdc1f86..4ee3315 100644
--- a/distribution/src/main/release/samples/ws_addressing/src/main/resources/server.xml
+++ b/distribution/src/main/release/samples/ws_addressing/src/main/resources/server.xml
@@ -17,10 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<wsa:addressing/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml
index ad8042f..473f1dd 100644
--- a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml
+++ b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml
@@ -1,5 +1,9 @@
<?xml version="1.0"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean id="eventSourceBean" class="demo.wseventing.services.TestEventSource"/>
@@ -14,4 +18,4 @@
<cxf:logging/>
</jaxws:features>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml b/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml
index 3020f4f..2a343d6 100644
--- a/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml
+++ b/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
@@ -26,4 +31,4 @@
<p:policies/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml b/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml
index 6764fdf..adee65a 100644
--- a/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml
+++ b/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml
@@ -17,11 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<p:policies/>
</cxf:features>
</cxf:bus>
<p:externalAttachment location="addr-external.xml"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml b/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
index acbe3c5..e8dc9fa 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
+++ b/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -36,4 +43,4 @@
<http:conduit name="{http://cxf.apache.org/hello_world_soap_http}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml b/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
index 8577ce2..48eadb9 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
+++ b/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -33,4 +40,4 @@
</wsrm-mgr:reliableMessaging>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml
index 1d7a439..157b64d 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -27,4 +34,4 @@
<http:conduit name="{http://cxf.apache.org/hello_world_soap_http}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml
index 1d7a439..157b64d 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -27,4 +34,4 @@
<http:conduit name="{http://cxf.apache.org/hello_world_soap_http}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
index 248ee21..0f3982d 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
@@ -20,7 +20,13 @@
<!--
** This file configures the web service client
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -34,4 +40,4 @@
<entry key="security.encryption.username" value="serverx509v1"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
index 083d84f..f67b53e 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
@@ -20,7 +20,13 @@
<!--
** This file configures the web service client
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -35,4 +41,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
index fd095b5..d022ff9 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
@@ -20,7 +20,14 @@
<!--
** This file configures the web service provider.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -36,4 +43,4 @@
<entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
index 6091ee9..af872b6 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
@@ -20,7 +20,14 @@
<!--
** This file configures the web service provider.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -37,4 +44,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml b/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
index 1d7a439..157b64d 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/resources/wssec.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsa="http://cxf.apache.org/ws/addressing" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -27,4 +34,4 @@
<http:conduit name="{http://cxf.apache.org/hello_world_soap_http}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
index 11e5f34..12babae 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
@@ -20,7 +20,13 @@
<!--
** This file configures the web service client
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -42,4 +48,4 @@
<entry key="security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
index 289c1d1..b1fc8fb 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
@@ -20,7 +20,13 @@
<!--
** This file configures the web service client
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -43,4 +49,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
index db242d8..999f3ba 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
@@ -20,7 +20,14 @@
<!--
** This file configures the web service provider.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -55,4 +62,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
index ee898ce..25cbca1 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
@@ -20,7 +20,14 @@
<!--
** This file configures the web service provider.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -56,4 +63,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/resources/client-applicationContext.xml b/distribution/src/main/release/samples/wsdl_first/src/main/resources/client-applicationContext.xml
index 4e1e1a4..bdb3c38 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/resources/client-applicationContext.xml
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/resources/client-applicationContext.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:customer="http://customerservice.example.com/" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/sche [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:customer="http://customerservice.example.com/"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<!--
Define a cxf endpoint based on client stub generated from a wsdl. It
is important to provide serviceName and endpointName so the wsdl is
@@ -31,4 +36,4 @@
<bean id="tester" class="com.example.customerservice.client.CustomerServiceTester">
<property name="customerService" ref="customerService"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml b/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
index f6be41f..c36465a 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/resources/cxf.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<!-- comment this bean to disable schema validation in the client -->
<jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
<jaxws:properties>
@@ -29,4 +33,4 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
index 9ef1b40..8bf5109 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/resources/server-applicationContext.xml
@@ -17,9 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:cxf="http://cxf.apache.org/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd ">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<cxf:bus name="cxf">
<cxf:features>
@@ -43,4 +45,4 @@
<bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</jaxws:features>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml b/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
index c6b6d2c..8a0fffc 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -17,10 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:endpoint xmlns:customer="http://customerservice.example.com/" id="CustomerServiceHTTP" address="/CustomerServicePort" serviceName="customer:CustomerServiceService" endpointName="customer:CustomerServicePort" implementor="com.example.customerservice.server.CustomerServiceImpl">
<!--jaxws:properties>
<entry key="schema-validation-enabled" value="true" />
</jaxws:properties-->
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/server-beans.xml b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/server-beans.xml
index 3be147c..0cc06e0 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/server-beans.xml
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/server-beans.xml
@@ -14,6 +14,9 @@
the specific language governing permissions and limitations under the
License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:endpoint id="complex-server" implementor="org.apache.cxf.demo.complex.ComplexImpl" address="http://localhost:9000/Complex" wsdlLocation="wsdl/complex.wsdl"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/InsecureClient.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/InsecureClient.xml
index a557f91..4d7a67b 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/InsecureClient.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/InsecureClient.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
index aa6b481..0a406f6 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
@@ -20,7 +20,11 @@
<!--
** This file configures the Wibble Client
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configur [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="ckpass">
@@ -31,4 +35,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
index 5e9353b..2be0f07 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
@@ -20,7 +20,12 @@
<!--
** This file configures the Server which runs the web service.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apach [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">
</http:destination>
<httpj:engine-factory>
@@ -36,4 +41,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
index 4d4aa4b..f7eff67 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/jaxrs http://cx [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<context:property-placeholder/>
<context:annotation-config/>
@@ -13,4 +17,4 @@
<bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
</jaxrs:providers>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml b/rt/databinding/aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml
index 6ef23af..ae3f3b6 100644
--- a/rt/databinding/aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml
+++ b/rt/databinding/aegis/src/main/resources/META-INF/cxf/java2wsbeans.xml
@@ -17,6 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml b/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
index 8762f91..9efda3c 100644
--- a/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
+++ b/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxw [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding">
@@ -44,4 +48,4 @@
<ref bean="jaxws-and-aegis-service-factory"/>
</jaxws:serviceFactory>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/databinding/jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml b/rt/databinding/jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml
index e300209..d9af011 100644
--- a/rt/databinding/jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml
+++ b/rt/databinding/jaxb/src/main/resources/META-INF/cxf/java2wsbeans.xml
@@ -17,6 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="JaxbDatabindingBean" class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
index cc75402..5e5c687 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -63,4 +66,4 @@
</property>
</bean>
<jaxrs:server id="moduleServer" modelRef="classpath:/org/apache/cxf/jaxrs/spring/resources.xml" address="http://localhost:9090/simpleWithAddress2" bus="cxf"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
index 54925b4..2d5a9da 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -45,4 +48,4 @@
<bean id="bookstore2" class="org.apache.cxf.jaxrs.resources.BookStore" scope="prototype"/>
<bean id="bookstore3" class="org.apache.cxf.jaxrs.resources.BookStore"/>
<bean id="bookstore4" class="org.apache.cxf.jaxrs.resources.BookStore" scope="prototype"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml b/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
index 86b3ec7..f61dd1b 100644
--- a/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
+++ b/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
@@ -17,10 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="true">
<constructor-arg ref="cxf"/>
</bean>
<bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl" id="org.apache.cxf.jaxws.context.WebServiceContextImpl" lazy-init="true"/>
<alias name="org.apache.cxf.jaxws.context.WebServiceContextImpl" alias="javax.xml.ws.WebServiceContext"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
index 3f0b311..33e083e 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean name="{http://apache.org/hello_world_soap_http}SOAPService" abstract="true">
<property name="inInterceptors">
<list>
@@ -73,4 +77,4 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml
index 16634ce..3488c22 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<!--
Client-side endpoint. For this example, Alice is the client
and Bob is the service.
@@ -27,4 +30,4 @@
<bean class="org.apache.cxf.ext.logging.LoggingInInterceptor"/>
</jaxws:inInterceptors>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemaFirst.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemaFirst.xml
index 99fb6a0..2bcb17c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemaFirst.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemaFirst.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -39,4 +43,4 @@
<jaxws:schemaLocation>/org/apache/cxf/jaxws/service/echoFoo.xsd</jaxws:schemaLocation>
</jaxws:schemaLocations>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemavalidationtype-configured-endpoints.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemavalidationtype-configured-endpoints.xml
index 3a1ea8f..338cdd4 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemavalidationtype-configured-endpoints.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/schemavalidationtype-configured-endpoints.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean name="{http://apache.org/hello_world_soap_http}SOAPService" abstract="true">
<property name="inInterceptors">
<list>
@@ -73,4 +77,4 @@
<entry key="schema-validation-enabled" value="BOTH"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
index d1b2152..14a8f5f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/soapServiceConfig.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
<jaxws:properties>
<entry key="foo" value="bar"/>
@@ -26,4 +29,4 @@
<bean class="org.apache.cxf.endpoint.NullConduitSelector"/>
</jaxws:conduitSelector>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/child.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/child.xml
index 26a62e7..933b480 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/child.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/child.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean class="org.apache.cxf.jaxws.spring.NullInvoker"/>
<bean class="org.apache.cxf.jaxws.spring.ClientHolderBean"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
index d148b44..8770b76 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
@@ -14,7 +14,13 @@
the specific language governing permissions and limitations under the
License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/sch [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<context:annotation-config/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.jaxws.spring.ClientHolderBean" id="greeters" autowire="default">
@@ -78,4 +84,4 @@
</cxf:bus>
<jaxws:client xmlns:s="http://apache.org/hello_world_soap_http" id="differentBusGreeter" bus="FooSnarf" serviceClass="org.apache.hello_world_soap_http.Greeter" address="http://localhost:9000/foo" serviceName="s:SOAPService">
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml
index 517d4d0..3f05cad 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959a.xml
@@ -17,9 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<jaxws:endpoint implementor="org.apache.cxf.jaxws.spring.PostConstructCalledCount" address="/HelloWorld1"/>
<bean id="theBean" class="org.apache.cxf.jaxws.spring.PostConstructCalledCount"/>
<jaxws:endpoint implementor="#theBean" address="/HelloWorld2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml
index 1c1d7a3..c5fe50a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959b.xml
@@ -17,8 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:endpoint implementor="org.apache.cxf.jaxws.spring.PostConstructCalledCount" address="/HelloWorld1"/>
<bean id="theBean" class="org.apache.cxf.jaxws.spring.PostConstructCalledCount"/>
<jaxws:endpoint implementor="#theBean" address="/HelloWorld2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml
index 26d787d..77b0108 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/cxf3959c.xml
@@ -17,10 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/context http://www.springframework.org/sche [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:annotation-config/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<jaxws:endpoint implementor="org.apache.cxf.jaxws.spring.PostConstructCalledCount" address="/HelloWorld1"/>
<bean id="theBean" class="org.apache.cxf.jaxws.spring.PostConstructCalledCount"/>
<jaxws:endpoint implementor="#theBean" address="/HelloWorld2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
index bb95059..51d1f46 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -93,4 +97,4 @@
<jaxws:endpoint id="implementorClass" implementor="java.lang.Object" implementorClass="org.apache.cxf.jaxws.service.Hello" address="http://localhost:8080/test3"/>
<jaxws:endpoint id="publishedEndpointUrl" implementor="#greeter" address="http://localhost:8080/publishedEndpointUrl" publishedEndpointUrl="http://cxf.apache.org/Greeter"/>
<jaxws:endpoint id="unpublishedEndpoint" implementor="#greeter" address="http://localhost:8080/unpublished" publish="false"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
index dfd0dfc..4ab6076 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<cxf:bus bus="cxf1">
<cxf:properties>
@@ -31,4 +35,4 @@
</cxf:bus>
<jaxws:endpoint id="ep1" address="/path/one" implementor="org.apache.hello_world_soap_http.GreeterImpl" bus="cxf1"/>
<jaxws:endpoint id="ep2" address="/path/two" implementor="org.apache.hello_world_soap_http.GreeterImpl" bus="cxf2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints3.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints3.xml
index 74248d2..ed0d6d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints3.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints3.xml
@@ -17,8 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<jaxws:endpoint id="ep1" address="/path/one" implementor="org.apache.hello_world_soap_http.GreeterImpl" bus="cxf"/>
<jaxws:endpoint id="ep2" address="/path/two" implementor="org.apache.hello_world_soap_http.GreeterImpl" bus="cxf1"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
index ded0317..962bdaa 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -91,4 +95,4 @@
</jaxws:dataBinding>
</jaxws:server>
<jaxws:server serviceBean="#greeter" address="http://localhost:8080/test3"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml
index d57b79c..47ec511 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:p="http://cxf.apache.org/policy" xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy" xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xsi:schemaLocation=" http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/w [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy"
+ xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xsi:schemaLocation="http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://schemas.xmlsoap.org/ws/2004/09/policy http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<jaxws:server id="test" abstract="true">
<jaxws:features>
<p:policies>
@@ -40,4 +47,4 @@
</jaxws:features>
</jaxws:server>
<wsp-200607:Policy wsu:Id="External"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
index a7e34b1..3a8450f 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -51,4 +55,4 @@
</simple:client>
<simple:client id="client3" serviceClass="org.apache.cxf.service.factory.HelloService" address="http://localhost:9000/foo2" username="testUser" password="password">
</simple:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/rountrip.xml b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/rountrip.xml
index a0e70b0..937d74b 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/rountrip.xml
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/rountrip.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -31,4 +35,4 @@
<bean id="greeter" class="org.apache.cxf.service.factory.HelloServiceImpl"/>
<simple:server id="server" serviceBean="#greeter" serviceClass="org.apache.cxf.service.factory.HelloService" address="local://hello"/>
<simple:client id="client" serviceClass="org.apache.cxf.service.factory.HelloService" address="local://hello"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
index 0a31523..d0f2b53 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -59,4 +63,4 @@
<bean class="org.apache.cxf.service.factory.HelloServiceProxyFactory"/>
</simple:serviceBean>
</simple:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml b/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
index 2ec1978..cda3d9b 100644
--- a/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
@@ -14,7 +14,11 @@
the specific language governing permissions and limitations under the
License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/si [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<simple:server id="aegis-service" serviceClass="org.apache.cxf.javascript.fortest.AegisService" address="http://localhost:${testutil.ports.TestPort}/aegis">
@@ -36,4 +40,4 @@
</bean>
</simple:serviceFactory>
</simple:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml b/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
index 10d4873..68d35b6 100644
--- a/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="any-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/any">
@@ -25,4 +28,4 @@
<bean class="org.apache.cxf.javascript.fortest.AnyImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
index 256e802..93703a8 100644
--- a/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="dlb-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/SimpleDocLitBare">
@@ -25,4 +28,4 @@
<bean class="org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
index 4030830..0770a1a 100644
--- a/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http: [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<!--
@@ -32,4 +36,4 @@
<bean class="org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
index b48db92..85af18c 100644
--- a/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="greeter-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/Greeter">
@@ -25,4 +28,4 @@
<bean class="org.apache.cxf.javascript.hwdemo.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml b/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
index 41f3acc..addf6bc 100644
--- a/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="hw-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/HelloWorldDocLit">
@@ -25,4 +28,4 @@
<bean class="org.apache.hello_world_doc_lit.GreeterImplDoc"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml b/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
index d695a73..45aeca2 100644
--- a/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="hwg-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/HelloWorldGreeter">
@@ -45,4 +48,4 @@
</bean>
</jaxws:features>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
index 13cf8c0..5d02c67 100644
--- a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server id="mtom-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/mtom">
@@ -33,4 +36,4 @@
<bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
</jaxws:outInterceptors>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
index 5b608d7..78079e0 100644
--- a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="rpc-service" class="org.apache.cxf.javascript.fortest.SimpleRPCImpl"/>
@@ -26,4 +29,4 @@
<ref bean="rpc-service"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
index 1ed074e..0bd3f51 100644
--- a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
@@ -14,7 +14,13 @@
the specific language governing permissions and limitations under the
License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws. [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework. [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<httpj:engine-factory bus="cxf">
@@ -49,4 +55,4 @@
</httpj:engine-factory>
<jaxws:endpoint id="greeter-service-endpoint" implementor="org.apache.hello_world_xml_http.wrapped.GreeterImpl" address="http://localhost:${testutil.ports.JsHttpRequestTest}/Greeter">
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
index 7de5fb7..ada4a3a 100644
--- a/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
@@ -17,7 +17,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- CXF -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
@@ -27,4 +31,4 @@ under the License.
</bean>
<jaxws:server id="AttributeTestServerBean" serviceClass="org.apache.cxf.javascript.fortest.AttributeTestServiceImpl" address="local://AttributeTestService">
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/javascript/javascript-tests/src/test/resources/serializationTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/serializationTestBeans.xml
index e074185..cca350c 100644
--- a/rt/javascript/javascript-tests/src/test/resources/serializationTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/serializationTestBeans.xml
@@ -17,7 +17,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<!-- CXF -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<!-- We use a client for the service for basic tests. We don't need a server at all. -->
@@ -33,4 +37,4 @@ under the License.
address="local://TestService">
</jaxws:server>
-->
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/managed-spring-twobuses.xml b/rt/management/src/test/resources/managed-spring-twobuses.xml
index 55683ef..d33f159 100644
--- a/rt/management/src/test/resources/managed-spring-twobuses.xml
+++ b/rt/management/src/test/resources/managed-spring-twobuses.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<cxf:bus bus="cxf1"/>
<cxf:bus bus="cxf2"/>
@@ -27,4 +31,4 @@
<bean id="CounterRepository2" class="org.apache.cxf.management.counters.CounterRepository">
<property name="bus" ref="cxf2"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/managed-spring-twobuses2.xml b/rt/management/src/test/resources/managed-spring-twobuses2.xml
index 562ea16..39e32f3 100644
--- a/rt/management/src/test/resources/managed-spring-twobuses2.xml
+++ b/rt/management/src/test/resources/managed-spring-twobuses2.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<cxf:bus bus="cxf1">
<cxf:properties>
@@ -26,4 +30,4 @@
</cxf:properties>
</cxf:bus>
<cxf:bus bus="cxf2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/managed-spring.xml b/rt/management/src/test/resources/managed-spring.xml
index dab2022..81808a5 100644
--- a/rt/management/src/test/resources/managed-spring.xml
+++ b/rt/management/src/test/resources/managed-spring.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus id="CXF-Test-Bus" bus="cxf"/>
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
@@ -28,4 +32,4 @@
</bean>
<cxf:workqueue name="default" highWaterMark="15" lowWaterMark="5"/>
<cxf:workqueue name="test-wq" highWaterMark="10" lowWaterMark="2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/managed-spring2.xml b/rt/management/src/test/resources/managed-spring2.xml
index 487808a..873ad46 100644
--- a/rt/management/src/test/resources/managed-spring2.xml
+++ b/rt/management/src/test/resources/managed-spring2.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus id="CXF-Test-Bus" bus="cxf">
<cxf:properties>
<entry key="bus.jmx.enabled" value="true"/>
@@ -26,4 +30,4 @@
<entry key="bus.jmx.JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"/>
</cxf:properties>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/managed-spring3.xml b/rt/management/src/test/resources/managed-spring3.xml
index 5a15984..83add99 100644
--- a/rt/management/src/test/resources/managed-spring3.xml
+++ b/rt/management/src/test/resources/managed-spring3.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus id="CXF-Test-Bus" bus="cxf"/>
<!-- the bus setting at the end should not interfer with the other props -->
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
@@ -27,4 +31,4 @@
<property name="JMXServiceURL" value="service:jmx:rmi:///jndi/rmi://localhost:9914/jmxrmi"/>
<property name="bus" ref="cxf"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/management/src/test/resources/no-connector-spring.xml b/rt/management/src/test/resources/no-connector-spring.xml
index cd06c66..f6c197d 100644
--- a/rt/management/src/test/resources/no-connector-spring.xml
+++ b/rt/management/src/test/resources/no-connector-spring.xml
@@ -17,10 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:im="http://cxf.apache.org/management" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:im="http://cxf.apache.org/management"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
<property name="createMBServerConnectorFactory" value="false"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
index 74ae059..5162562 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs-client" xmlns:soap="http://cxf.apache.org/bindings/soap" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/j [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
+ xmlns:soap="http://cxf.apache.org/bindings/soap"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
<property name="transportIds">
@@ -45,4 +49,4 @@
<entry key="Accept" value="text/xml"/>
</jaxrs:headers>
</jaxrs:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml
index ddb101d..5377896 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean id="atom" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider">
<property name="atomWriters" ref="atomWriters"/>
<property name="atomBuilders" ref="atomBuilders"/>
@@ -66,4 +69,4 @@
<entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/>
</util:map>
<bean id="simpleEntryBuilder" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomEntryBuilder"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
index 23d9ecb..f18d97d 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.or [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="1234">
<httpj:tlsServerParameters>
@@ -25,4 +31,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
index ef17fde..c7bbc22 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="1234">
<httpj:connector>
@@ -43,4 +48,4 @@
<bean id="httpConnectionFactory" class="org.eclipse.jetty.server.HttpConnectionFactory">
<constructor-arg ref="httpConfiguration"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
index f8e3bc3..fa56a7c 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="1234">
<httpj:tlsServerParameters>
@@ -25,4 +30,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
index 03d4a11..2849af6 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_jetty/spring/bean.properties"/>
</bean>
@@ -73,4 +79,4 @@
<hj:tlsServerParametersRef id="sample1"/>
</hj:engine>
</hj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
index 314a0ca..1b81d6c 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd">
<h:destination name="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
@@ -60,4 +66,4 @@
<hj:tlsServerParametersRef id="sample1"/>
</hj:engine>
</hj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml
index bc8da5d..545be3c 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml
@@ -17,11 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<h:destination id="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
<h:conduit id="{urn:test:ns}Foo.http-conduit">
<h:client ConnectionTimeout="97"/>
</h:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
index cb524db..02db82d 100644
--- a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
+++ b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
@@ -20,7 +20,12 @@
<!--
** This file configures the Server which runs the web service.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apach [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">
</http:destination>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -37,4 +42,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
index cc7cb09..572090f 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
@@ -20,7 +20,14 @@
<!--
** This file configures the Server which runs the web service.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpn="http://cxf.apache.org/transports/http-netty-server/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/configuration/security [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpn="http://cxf.apache.org/transports/http-netty-server/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-netty-server/configuration http://cxf.apache.org/schemas/configuration/http-netty-server.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/ [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus/>
<jaxws:endpoint id="myEndpoint" bus="cxf" implementor="org.apache.hello_world_soap_http.GreeterImpl" address="https://localhost:${SSLNettySpringServerTest.port}/SoapContext/SoapPort"/>
@@ -39,4 +46,4 @@
</httpn:tlsServerParameters>
</httpn:engine>
</httpn:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
index e6b7c02..73a2ef4 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
@@ -20,7 +20,12 @@
<!--
** This file configures the Server which runs the web service.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpn="http://cxf.apache.org/transports/http-netty-server/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cx [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpn="http://cxf.apache.org/transports/http-netty-server/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-netty-server/configuration http://cxf.apache.org/schemas/configuration/http-netty-server.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">
</http:destination>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -37,4 +42,4 @@
</httpn:tlsServerParameters>
</httpn:engine>
</httpn:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans-props.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans-props.xml
index 35b199a..6b2fc2f 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans-props.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans-props.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hn="http://cxf.apache.org/transports/http-netty-server/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframewo [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hn="http://cxf.apache.org/transports/http-netty-server/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-netty-server/configuration http://cxf.apache.org/schemas/configuration/http-netty-server.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http/netty/server/spring/bean.properties"/>
</bean>
@@ -65,4 +71,4 @@
<hn:tlsServerParametersRef id="sample1"/>
</hn:engine>
</hn:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans.xml
index f4f2387..bec9330 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/beans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hn="http://cxf.apache.org/transports/http-netty-server/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframewo [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hn="http://cxf.apache.org/transports/http-netty-server/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-netty-server/configuration http://cxf.apache.org/schemas/configuration/http-netty-server.xsd">
<h:destination name="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
@@ -55,4 +61,4 @@
<hn:tlsServerParametersRef id="sample1"/>
</hn:engine>
</hn:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/invalid-beans.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/invalid-beans.xml
index bc8da5d..545be3c 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/invalid-beans.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/invalid-beans.xml
@@ -17,11 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<h:destination id="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
<h:conduit id="{urn:test:ns}Foo.http-conduit">
<h:client ConnectionTimeout="97"/>
</h:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
index 7079b42..d576196 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-undertow/configuration http://cxf.apache.org/schemas/configuration/http-undertow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpu:engine-factory bus="cxf">
<httpu:engine port="1234">
<httpu:tlsServerParameters>
@@ -25,4 +31,4 @@
</httpu:tlsServerParameters>
</httpu:engine>
</httpu:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
index 4ec64a8..ca8be0d 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http:// [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-undertow/configuration http://cxf.apache.org/schemas/configuration/http-undertow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpu:engine-factory bus="cxf">
<httpu:engine port="1234">
<httpu:tlsServerParameters>
@@ -25,4 +30,4 @@
</httpu:tlsServerParameters>
</httpu:engine>
</httpu:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans-props.xml b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans-props.xml
index 7273cf5..834ec0d 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans-props.xml
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans-props.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hj="http://cxf.apache.org/transports/http-undertow/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.o [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hj="http://cxf.apache.org/transports/http-undertow/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-undertow/configuration http://cxf.apache.org/schemas/configuration/http-undertow.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_undertow/spring/bean.properties"/>
</bean>
@@ -71,4 +77,4 @@
<hj:tlsServerParametersRef id="sample1"/>
</hj:engine>
</hj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans.xml b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans.xml
index 0676794..b4a550e 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans.xml
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/beans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xmlns:hj="http://cxf.apache.org/transports/http-undertow/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.o [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xmlns:hj="http://cxf.apache.org/transports/http-undertow/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-undertow/configuration http://cxf.apache.org/schemas/configuration/http-undertow.xsd">
<h:destination name="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
@@ -58,4 +64,4 @@
<hj:tlsServerParametersRef id="sample1"/>
</hj:engine>
</hj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/invalid-beans.xml b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/invalid-beans.xml
index bc8da5d..545be3c 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/invalid-beans.xml
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/invalid-beans.xml
@@ -17,11 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:h="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<h:destination id="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
<h:conduit id="{urn:test:ns}Foo.http-conduit">
<h:client ConnectionTimeout="97"/>
</h:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml b/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
index 31cc1e4..5754e64 100644
--- a/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
+++ b/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-bean.xml b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-bean.xml
index bc0dbd3..fffb48f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-bean.xml
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-bean.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf-beans="http://cxf.apache.org/configuration/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.or [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<http:conduit name="{http://apache.org/hello_world}HelloWorld.http-conduit">
<http:tlsClientParameters sslCacheTimeout="3600000" disableCNCheck="true">
<sec:keyManagers keyPassword="password">
@@ -37,4 +42,4 @@
</http:authorization>
<http:client AutoRedirect="true" Connection="Keep-Alive" ChunkLength="10240"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-tlsrefs-bean.xml b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-tlsrefs-bean.xml
index acf654b..1ef0323 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-tlsrefs-bean.xml
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/conduit-tlsrefs-bean.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf-beans="http://cxf.apache.org/configuration/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.or [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="keyManagers" class="org.apache.cxf.transport.http.spring.HttpConduitConfigurationTest$ManagersFactory" factory-method="getKeyManagers"/>
<bean id="trustManagers" class="org.apache.cxf.transport.http.spring.HttpConduitConfigurationTest$ManagersFactory" factory-method="getTrustManagers"/>
<http:conduit name="{http://apache.org/hello_world}HelloWorld.http-conduit">
@@ -35,4 +40,4 @@
</http:authorization>
<http:client AutoRedirect="true" ChunkLength="10240" Connection="Keep-Alive"/>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/disable-policy-bus.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/disable-policy-bus.xml
index cc7b3e6..ba940e8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/disable-policy-bus.xml
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/disable-policy-bus.xml
@@ -17,10 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<p:policies enabled="false"/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml
index 66290b1..8a89750 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apa [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<cxf:bus>
<cxf:outInterceptors>
@@ -39,4 +45,4 @@
</list>
</constructor-arg>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml
index 7627d09..f1bcdc3 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apa [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<!-- use bean ids if you want to load multiple external attachment providers -->
<cxf:bus bus="cxf1">
@@ -45,4 +51,4 @@
</list>
</constructor-arg>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml
index e8c5851..57b010f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/policy-bus.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.apache.cxf.ws.policy.PolicyExtensionsTest$TestAssertionBuilder"/>
<bean class="org.apache.cxf.ws.policy.PolicyExtensionsTest$TestPolicyInterceptorProvider"/>
@@ -26,4 +31,4 @@
<constructor-arg ref="cxf"/>
<property name="location" value="org/apache/cxf/ws/policy/policy-bus.xml"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
index d008a8c..6f3e2c4 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://cxf.apache.org/policy" xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy" xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xsi:schemaLocation=" http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://schemas.xmlsoap.org/ws [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy"
+ xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xsi:schemaLocation="http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://schemas.xmlsoap.org/ws/2004/09/policy http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<p:engine enabled="true" ignoreUnknownAssertions="true">
<p:alternativeSelector>
<bean class="org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector"/>
@@ -25,4 +31,4 @@
</p:engine>
<p:externalAttachment id="external4" location="classpath:/org/apache/cxf/ws/policy/attachment/external/attachments4.xml"/>
<p:externalAttachment location="classpath:/org/apache/cxf/ws/policy/attachment/external/attachments3.xml"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml
index 142231e..e618d90 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/custom-rmmanager.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf-beans="http://cxf.apache.org/configuration/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xsi:schemaLocation=" http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/20 [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xsi:schemaLocation="http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--
http://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf-beans.xsd
-->
@@ -34,4 +39,4 @@
<wsrm-mgr:acksPolicy intraMessageThreshold="0"/>
</wsrm-mgr:destinationPolicy>
</wsrm-mgr:rmManager>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
index 845385d..597c2d7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/exactly-once.xml
@@ -17,11 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf-beans="http://cxf.apache.org/configuration/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xsi:schemaLocation=" http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/20 [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xsi:schemaLocation="http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="rmmanager.xml"/>
<wsrm-mgr:rmManager name="{http://cxf.apache.org}ws.rm.RMManager">
<wsrm-mgr:deliveryAssurance>
<wsrm-mgr:ExactlyOnce/>
</wsrm-mgr:deliveryAssurance>
</wsrm-mgr:rmManager>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
index 93e289e..3f14f7c 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/feature.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/w [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<cxf:bus>
<cxf:features>
<wsrm-mgr:reliableMessaging>
@@ -43,4 +48,4 @@
</wsrm-mgr:reliableMessaging>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
index 3d5b6cd..8e01539 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/w [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
@@ -44,4 +49,4 @@
</wsrm-mgr:reliableMessaging>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml
index 4e215d4..cb9a838 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/manager-bean.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf-beans="http://cxf.apache.org/configuration/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xsi:schemaLocation=" http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/20 [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xsi:schemaLocation="http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="rmmanager.xml"/>
<wsrm-mgr:rmManager name="{http://cxf.apache.org}ws.rm.RMManager">
<wsrm-policy:RMAssertion>
@@ -40,4 +45,4 @@
</bean>
</wsrm-mgr:store>
</wsrm-mgr:rmManager>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml
index 6d50095..53dfd14 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/rmmanager.xml
@@ -17,6 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:/META-INF/cxf/cxf.xml"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml
index 88d0a17..17ce8bb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-client.xml
@@ -17,10 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
index 963d8c5..46971fa 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -61,4 +67,4 @@
<entry key="security.signature.username" value="mystskey"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
index da1bff8..74225eb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -62,4 +68,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml
index 99744b9..fcfb9f4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -31,4 +37,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml
index b7d098c..a4b0686 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -31,4 +37,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
index a8352ed..ce29728 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -83,4 +91,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
index df7d1d6..4abf02c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -85,4 +93,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml
index 51a4819..4320268 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -34,4 +40,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
index a8b1a70..f70cd9d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -113,4 +121,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
index 61f29c0..cd656c3 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -119,4 +127,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
index d68d150..e343f7f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -32,4 +38,4 @@
<entry key="security.encryption.username" value="myservicekey"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
index c805a94..5787dfc 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -32,4 +38,4 @@
<entry key="security.encryption.username" value="myservicekey"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
index 814a623..9b90005 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -60,4 +67,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
index 95b1f08..f57544c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -62,4 +69,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
index 984c70b..1688492 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1alternative" implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1AlternativePort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.caching.CachingServer}/doubleit/services/doubleittransportsaml1alternative" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
<jaxws:properties>
@@ -100,4 +107,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
index 215df7f8..b21d09a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -79,4 +85,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
index 421c940..2756d01 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.caching.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
<jaxws:properties>
@@ -60,4 +67,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
index fbd6932..71fa35f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -55,4 +61,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
index 9532423..416d159 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -58,4 +64,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
index 7649f7e..3669f97 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -76,4 +82,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
index 2ce59ee..2ede3ed 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.claims.Server}/doubleit/services/doubleittransportsaml1claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
<jaxws:properties>
@@ -93,4 +100,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
index ad72b76..5d2eb18 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.claims.StaxServer}/doubleit/services/doubleittransportsaml1claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
<jaxws:properties>
@@ -99,4 +106,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
index 88e4018..530d833 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -80,4 +86,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
index 075a14a..f2a8608 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitcrossdomain" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItCrossDomainPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.cross_domain.Server}/doubleit/services/doubleitcrossdomain" wsdlLocation="org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl">
<jaxws:properties>
@@ -51,4 +58,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
index f916aac..a67ebe7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -80,4 +88,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index 27179d7..d2ea4cf 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -80,4 +88,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml
index 846b55d..d95a28f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -42,4 +48,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml
index 9f90717..8cf5d78 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportcustomparameter" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportCustomParameterPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom.Server}/doubleit/services/doubleittransportcustomparameter" wsdlLocation="org/apache/cxf/systest/sts/custom/DoubleIt.wsdl">
<jaxws:properties>
@@ -44,4 +51,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
index 168ed65..de05349 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
@@ -130,4 +138,4 @@
<bean id="restSTS" class="org.apache.cxf.sts.rest.RESTSecurityTokenServiceImpl">
<property name="issueSingleOperation" ref="transportIssueDelegate" />
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml
index 275f70e..2e783fee 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:sc [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<import resource="./cxf-sts-common.xml" />
@@ -63,4 +72,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
index 2cca10f..ed2a02e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -63,4 +69,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index e67da07..4848910 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbst" implementor="org.apache.cxf.systest.sts.custom_onbehalfof.SAMLDoubleItPortTypeImpl" endpointName="s:DoubleItTransportCustomBSTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom_onbehalfof.Server}/doubleit/services/doubleittransportcustombst" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl">
<jaxws:properties>
@@ -77,4 +84,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
index 40c105c..991b062 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -141,4 +149,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml
index 51a4819..4320268 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -34,4 +40,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
index 43b1618..3d55594 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
@@ -46,4 +54,4 @@
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml
index 6f69f33..1ab8d1c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<import resource="cxf-sts-common.xml" />
@@ -36,4 +44,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
index 6f9d003..1f342fd 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
@@ -125,4 +133,4 @@
<property name="issuer" value="${issuer}"/>
<property name="encryptionUsername" value="${encryption.username}"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
index 6cc7d33..8d0c8b6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<import resource="cxf-sts-common.xml" />
@@ -47,4 +55,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
index a461375..acb5ba4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<import resource="cxf-sts-common.xml" />
@@ -54,4 +62,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
index cc4cabe..5d57ff9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -64,4 +70,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
index 9aed6ce..bb6f511 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsct" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSCTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.distributed_caching.Server}/doubleit/services/doubleittransportsct" wsdlLocation="org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl">
<jaxws:properties>
@@ -97,4 +104,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
index 438fc7e..665574f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:hz="http://www.hazelcast.com/schema/spring" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:hz="http://www.hazelcast.com/schema/spring"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -136,4 +145,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
index 307c019..c944de8 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:hz="http://www.hazelcast.com/schema/spring" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:hz="http://www.hazelcast.com/schema/spring"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -129,4 +138,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
index a669b37..038450b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -36,4 +42,4 @@
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
index de769d1..13f1dd5 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -50,4 +58,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml
index eacdd37..3e084b8 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -45,4 +51,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml
index 28d2a8d..c575b3c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -40,4 +46,4 @@
</http:authorization>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
index bdba93a..1649955 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -101,4 +109,4 @@
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
index df67d53..4e64e9b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -40,4 +47,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
index b122898..84d3389 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -118,4 +124,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
index 435762f..4ab66ba 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitrealma" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItRealmAPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.realms.Server}/doubleit/services/doubleitrealma" wsdlLocation="org/apache/cxf/systest/sts/realms/DoubleIt.wsdl">
<jaxws:properties>
@@ -139,4 +146,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
index bff5db8..e39565d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -104,4 +112,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
index f230bd7..b4d3329 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -97,4 +105,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml
index 51a4819..4320268 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -34,4 +40,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
index 80b784f..d8a3941 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -164,4 +170,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
index 41941e6..89d927e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -64,4 +71,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
index d6d272c..97d885d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -139,4 +147,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
index ca5de96..894736a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -121,4 +129,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
index 469f009..510b976 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -124,4 +132,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
index 4228c0c..6c72ad1 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -65,4 +71,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
index 2d0cc6e..8b837b6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsecureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSecureConvPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.secure_conv.Server}/doubleit/services/doubleittransportsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
<jaxws:properties>
@@ -97,4 +104,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
index f3065d0..8d3f8af 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -151,4 +159,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
index f9b0ca7..831b7c0 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -158,4 +166,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
index c17da7e..449d179 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -55,4 +61,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
index b194138..e41b503 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.soap12.Server}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl">
<jaxws:properties>
@@ -70,4 +77,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
index d1799f8..f97c3db 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.soap12.StaxServer}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl">
<jaxws:properties>
@@ -72,4 +79,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
index f8ce53f..c43033d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -50,4 +56,4 @@
<entry key="security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
index 17a5c61..71540c8 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.sts.sts_sender_vouches.Server}/doubleit/services/doubleitasymmetricsaml2" wsdlLocation="org/apache/cxf/systest/sts/sts_sender_vouches/DoubleIt.wsdl">
<jaxws:properties>
@@ -27,4 +34,4 @@
<entry key="security.encryption.properties" value="clientKeystore.properties"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
index 93f374a..b807c19 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -59,4 +65,4 @@
<entry key="security.signature.username" value="mystskey"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
index 5ffcf14..ce939f7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -60,4 +66,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
index b92bd08..9fe450a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -42,4 +48,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
index 894daf8..c7d7e7c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -94,4 +101,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
index b2826db..7b82a35 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -42,4 +48,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
index 66b0281..8de50fa 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -43,4 +49,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
index c22c2df..1dbfb63 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -110,4 +117,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
index f454461b..e127e31 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -68,4 +75,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
index 943e953..4e778ce 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -118,4 +124,4 @@
</entry>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
index cbc183c..70c70c5 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.asymmetric.Server}/doubleit/services/doubleitasymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
<jaxws:properties>
@@ -49,4 +56,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
index 3c6ca76..f207cc6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.asymmetric.StaxServer}/doubleit/services/doubleitasymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
<jaxws:properties>
@@ -53,4 +60,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
index 2e93b0d..793e0b8 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -58,4 +64,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
index e733d03..36dc030 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2BearerPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.bearer.Server}/doubleit/services/doubleittransportsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
<jaxws:properties>
@@ -46,4 +53,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
index 3f68318..91e1f21 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2BearerPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.bearer.StaxServer}/doubleit/services/doubleittransportsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
<jaxws:properties>
@@ -48,4 +55,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
index cb39b76..87eae22 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -37,4 +43,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
index e776c29..472184f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -35,4 +41,4 @@
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
index e48fa80..2042372 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -132,4 +140,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
index 5245101..d2bc272 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -51,4 +59,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
index ded296d..50fd3b2 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -44,4 +50,4 @@
<entry key="security.signature.username" value="mystskey"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
index c78a68b..b7df0d0 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -33,4 +39,4 @@
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
index 4447f5b..33840f3 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -40,4 +46,4 @@
<entry key="security.encryption.username" value="useReqSigCert"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
index 41e03f7..830ec17 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -53,4 +61,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
index 05ce5cf..83470cb 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -45,4 +51,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
index f84738c..d70cc32 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -34,4 +40,4 @@
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
index c636778..55a4cc1 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -41,4 +47,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
index 40a220b..c121021 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -95,4 +103,4 @@
<property name="samlRealmCodec" ref="samlRealmCodec"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
index 4713aee..4a7c39c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<!-- Realms -->
<bean id="realmA" class="org.apache.cxf.sts.token.realm.RealmProperties">
@@ -52,4 +60,4 @@
</bean>
</util:list>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
index 40b91f5..08847f9 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -54,4 +60,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
index eea8f25..48b633f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -53,4 +59,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
index 7a0baba..9a8b0a5 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -74,4 +81,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
index f3a84d7..3469264 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -74,4 +81,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
index 978c7b6..d7e0e2c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -48,4 +55,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
index 40b7dd4..b6fed74 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -72,4 +78,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
index 57d4269..a5bda33 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -50,4 +58,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
index 5565827..56f99d3 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.issuer.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
<jaxws:properties>
@@ -60,4 +67,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
index 8adb43c..57806ce 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -30,4 +36,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
index aca188c..711dc7f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -34,4 +40,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index a1036d9..db886c8 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="roleClaimsCallbackHandler"
@@ -136,4 +144,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
index a8e679b..c7ee1a4 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- JAX-WS service -->
@@ -66,4 +74,4 @@
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
index 5265cfa..928c2ef 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/core [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configurat [...]
<http:conduit name="https://localhost.*">
<http:tlsClientParameters disableCNCheck="true">
@@ -29,4 +37,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
index fc64eb1..7f11ae6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -33,4 +39,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
index 70b708f..9d57e23 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www [...]
<import resource="classpath:META-INF/cxf/cxf.xml"/>
@@ -150,4 +159,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml
index eaa692b..0bf7aba 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -36,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
index eeb1f3e..225d9b4 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -52,4 +59,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
index 30d83b1..00de8b9 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -43,4 +50,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
index ee2f81a..1e805e1 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -58,4 +65,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
index 12ab91c..9f26eaa 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -44,4 +51,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
index 5844f50..c91eabc 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -55,4 +61,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
index 7d6c3ef..b8a971a 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -55,4 +61,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml
index 0473cc8..8d46616 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.stsclient.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/stsclient/DoubleIt.wsdl">
<jaxws:properties>
@@ -38,4 +45,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
index c05e934..66f975a 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -79,4 +85,4 @@
<entry key="security.sts.client.sct" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
index 37efbdd..aa8a7b0 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.Server}/doubleit/services/doubleitsymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
@@ -54,4 +61,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
index 8f77cf7..c769395 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
@@ -59,4 +66,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml
index 6356679..4dea76c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -47,4 +53,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml
index 115248c..d52a620 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.template.Server}/doubleit/services/doubleittransportsaml1publickey" wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl">
<jaxws:properties>
@@ -46,4 +53,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml
index f90d40b..3cbe608 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.template.StaxServer}/doubleit/services/doubleittransportsaml1publickey" wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl">
<jaxws:properties>
@@ -48,4 +55,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
index f1253e1..a616385 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -79,4 +85,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
index 567d845..7b9f52d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -107,4 +113,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
index ebb1bcb..3285dc6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.transport.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl">
<jaxws:properties>
@@ -79,4 +86,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
index 6142c9e..8551392 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.transport.StaxServer}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl">
<jaxws:properties>
@@ -88,4 +95,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
index f4ad046..a46ee0b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -176,4 +182,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
index 97bbe5f..9ea217c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.username_actas.Server}/doubleit/services/doubleitasymmetricsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
<jaxws:properties>
@@ -80,4 +87,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
index a946a10..2ee64b2 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.username_actas.Server2}/doubleit/services/doubleitasymmetricsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
<jaxws:properties>
@@ -79,4 +86,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
index e5f9fd6..9716d4e 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -176,4 +182,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
index 1b2128a..99cef71 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.username_onbehalfof.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
<jaxws:properties>
@@ -80,4 +87,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
index 25b7fb5..7771309 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.username_onbehalfof.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
<jaxws:properties>
@@ -79,4 +86,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
index 4402a09..4e94301 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
@@ -51,4 +58,4 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml
index 38d117e..30c89ad 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -75,4 +81,4 @@
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-service.xml
index 88ed6b8..e906f30 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
@@ -82,4 +89,4 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-stax-service.xml
index 215c25d..bbf78b9 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-stax-service.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/co [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
@@ -86,4 +93,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 62fbced..125bc24 100644
--- a/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/sts/systests/sts-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core" xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws" xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0" xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd h [...]
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core" xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws" xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0" xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd http://cxf.apache.org/blueprint/jaxws http://cxf.a [...]
<bean id="x509STSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
@@ -57,4 +58,4 @@
<entry key="ws-security.encryption.username" value="useReqSigCert" />
</jaxws:properties>
</jaxws:endpoint>
-</blueprint>
+</blueprint>
\ No newline at end of file
diff --git a/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml b/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml
index 2266a9b..8d33987 100644
--- a/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/services/xkms/xkms-war/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="xkms-endpoint.xml"/>
<import resource="xkms-key-handlers.xml"/>
@@ -26,4 +32,4 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml b/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml
index 018f2c7..8e02c22 100644
--- a/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml
+++ b/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-endpoint.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<cxf:bus>
<cxf:features>
<cxf:logging/>
@@ -55,4 +61,4 @@
</entry>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml b/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml
index b34133f..375c1ed 100644
--- a/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml
+++ b/services/xkms/xkms-war/src/main/webapp/WEB-INF/xkms-key-handlers.xml
@@ -9,7 +9,13 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:test="http://apache.org/hello_world_soap_http"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<bean id="dateValidator" class="org.apache.cxf.xkms.x509.validator.DateValidator"/>
<bean id="trustedAuthorityValidator" class="org.apache.cxf.xkms.x509.validator.TrustedAuthorityValidator">
<constructor-arg ref="certificateRepo"/>
@@ -54,4 +60,4 @@
class="org.apache.cxf.xkms.x509.repo.file.FileCertificateRepo">
<constructor-arg value="../conf/certs" />
</bean-->
-</beans>
+</beans>
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 4bc347d..3201362 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd" name="Maven">
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd" name="Maven">
<version position="right"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
diff --git a/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml b/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
index ccc163c..53dcbfc 100644
--- a/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
@@ -18,9 +18,12 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxws:endpoint id="helloWorld" implementor="demo.spring.HelloWorldImpl" address="/HelloWorld"/>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/source/cxf.xml b/systests/databinding/src/test/java/org/apache/cxf/systest/source/cxf.xml
index b749fe2d..cfa7630 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/source/cxf.xml
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/source/cxf.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<jaxws:client name="{http://apache.org/hello_world_soap_http_source/source}SoapPort" createdFromAPI="true">
<!-- jaxws:properties>
<entry key="schema-validation-enabled" value="true" />
@@ -29,4 +33,4 @@
</jaxws:properties>
</jaxws:endpoint>
<jaxws:endpoint name="{http://cxf.apache.org/source/doc_lit_bare}SoapPort" wsdlLocation="classpath:wsdl_systest_databinding/source/doc_lit_bare.wsdl" createdFromAPI="true"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml b/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
index fe5393b..03606c7 100644
--- a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
+++ b/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
@@ -55,4 +60,4 @@
<entry key="mtom-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml b/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
index 3108df1..6bf0755 100644
--- a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
+++ b/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="sportsImpl" class="org.apache.cxf.systest.aegis.SportsServiceImpl"/>
@@ -29,4 +34,4 @@
<ref bean="sportsImpl"/>
</simple:serviceBean>
</simple:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml b/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
index 7fcd552..f431c32 100644
--- a/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
+++ b/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
@@ -30,4 +35,4 @@
<ref bean="jaxws-and-aegis-service-factory"/>
</jaxws:serviceFactory>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/extrajaxbclass.xml b/systests/databinding/src/test/resources/extrajaxbclass.xml
index eebccfa..15345b8 100644
--- a/systests/databinding/src/test/resources/extrajaxbclass.xml
+++ b/systests/databinding/src/test/resources/extrajaxbclass.xml
@@ -17,7 +17,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd">
<!-- CXF -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -72,4 +76,4 @@ under the License.
</entry>
</jaxws:properties>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/mtomTestBeans.xml b/systests/databinding/src/test/resources/mtomTestBeans.xml
index 7442810..0dc0f36 100644
--- a/systests/databinding/src/test/resources/mtomTestBeans.xml
+++ b/systests/databinding/src/test/resources/mtomTestBeans.xml
@@ -9,7 +9,12 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="mtomImpl" class="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl"/>
@@ -63,4 +68,4 @@
</bean>
</simple:serviceFactory>
</simple:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml b/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
index 018796d..b618a5d 100644
--- a/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
+++ b/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
@@ -23,7 +23,11 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simple="http://cxf.apache.org/simple" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<simple:server address="/service" serviceClass="org.apache.cxf.authservice.AuthService">
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
index 19a76b2..1d27275 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/config [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http:/ [...]
<import resource="classpath:org/apache/cxf/systest/http/resources/BethalClientConfig.cxf"/>
<jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:9002/Bethal"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
index 90d51cd..b69a9a9 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
@@ -17,10 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="9020">
<httpj:sessionSupport>true</httpj:sessionSupport>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
index 02bc6ae..e6fa092 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="9020">
<httpj:sessionSupport>true</httpj:sessionSupport>
@@ -26,4 +31,4 @@
<httpj:reuseAddress>false</httpj:reuseAddress>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
index efe93c3..070c4da 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -60,4 +66,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
index ab6eddd..b620481 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -70,4 +76,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
index 6570e17..e4c7435 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -66,4 +72,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
index ff7b8e8..63decdf 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -64,4 +70,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
index 0861d5e..6420722 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -64,4 +70,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml
index 736d9be..bf4d7df 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:p="http://www.springframework.org/schema/p" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/j [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jms="http://cxf.apache.org/transports/jms"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="ConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
@@ -30,4 +35,4 @@
<bean class="org.apache.cxf.systest.jaxrs.JMSBookStore"/>
</jaxrs:serviceBeans>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
index d87496c..95420ea 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
@@ -17,7 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/trans [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<!-- -->
<!-- HTTP/S configuration for proxy clients -->
<!-- -->
@@ -46,4 +51,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
index cb4942c..c831da0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
@@ -17,7 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/trans [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<!-- this conduit is less specific and should not be selected -->
<http:conduit name="*.http-conduit">
<http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
@@ -33,4 +38,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
index 6aa22a8..72c806d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxrs="http://cxf.apache.org/jaxrs-client" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf. [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
@@ -34,4 +40,4 @@ under the License.
</http:tlsClientParameters>
</http:conduit>
<jaxrs:client xmlns:s="http://service.rs" id="bookService" serviceName="s:BookService" address="https://localhost:${testutil.ports.jaxrs-https}" serviceClass="org.apache.cxf.systest.jaxrs.BookStore"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
index 865dfdc..1cc91f1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxrs="http://cxf.apache.org/jaxrs-client" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf. [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
@@ -44,4 +50,4 @@ under the License.
</bean>
</jaxrs:providers>
</jaxrs:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
index a200063..c2361ba 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxrs="http://cxf.apache.org/jaxrs-client" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf. [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
@@ -44,4 +50,4 @@ under the License.
</bean>
</jaxrs:providers>
</jaxrs:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
index e2fd7e0..7957359 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
@@ -23,7 +23,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
@@ -54,4 +54,4 @@ under the License.
</bean>
</jaxrs:providers>
</jaxrs:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
index 766f170..b5f74d6 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
@@ -17,7 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/trans [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<httpj:engine-factory id="port-9095-tls-config">
<httpj:engine port="${testutil.ports.jaxrs-https}">
@@ -32,4 +37,4 @@ under the License.
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
index 97e9b17..16c85c7 100644
--- a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
@@ -18,11 +18,12 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:cxf="http://cxf.apache.org/core"
- xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
@@ -288,4 +289,4 @@
<property name="consumeMediaTypes" ref="jsonTypes"/>
</bean>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
index 7bd60fa..8250e89 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
@@ -21,10 +21,14 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxrs:server id="atomservice" address="/bookstore" staticSubresourceResolution="true">
@@ -87,4 +91,4 @@
</bean>
<bean id="entry" class="org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider"/>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
index e850859..5b6dc21 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
@@ -9,7 +9,11 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:/META-INF/cxf/cxf.xml"/>
<bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/>
<jaxrs:server id="unann-cors-service" address="/untest">
@@ -55,4 +59,4 @@
<bean id="unann-cors-server" scope="prototype" class="org.apache.cxf.systest.jaxrs.cors.UnannotatedCorsServer"/>
<bean id="ann-cors-server" scope="prototype" class="org.apache.cxf.systest.jaxrs.cors.AnnotatedCorsServer"/>
<bean id="ann-cors-server2" scope="prototype" class="org.apache.cxf.systest.jaxrs.cors.AnnotatedCorsServer2"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
index 404b9f9..d94b294 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
@@ -21,10 +21,15 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>
@@ -51,4 +56,4 @@
</jaxrs:dataBinding>
</jaxrs:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3eba438..3a510a9 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -21,10 +21,15 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.apache.cxf.systest.jaxrs.BookStoreDispatch" id="serviceBean"/>
@@ -87,4 +92,4 @@
</jaxrs:providers>
</jaxrs:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml
index ed03c22..db00ec6 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch_simple/WEB-INF/beans.xml
@@ -21,10 +21,15 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.apache.cxf.systest.jaxrs.BookStoreSpring" id="serviceBean"/>
@@ -68,4 +73,4 @@
</jaxrs:providers>
</jaxrs:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml
index 3ef056e..4846e89 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.o [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxrs:server address="/jaas">
@@ -91,4 +95,4 @@
<entry key="getBook" value="ROLE_BOOK_OWNER"/>
</util:map>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml
index bd1b3d8..55670a4 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_many_destinations/WEB-INF/beans.xml
@@ -21,10 +21,15 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.apache.cxf.systest.jaxrs.JAXRSOverlappingDestinationsTest.Resource" id="serviceBean"/>
@@ -34,4 +39,4 @@
</jaxrs:serviceBeans>
</jaxrs:server>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
index 49cad1a..68424f9 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
@@ -21,10 +21,14 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schema [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
@@ -105,4 +109,4 @@
</aop:config>
<bean id="simpleLogger" class="org.apache.cxf.systest.jaxrs.SimpleLoggingAspect"/>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
index c5f2659..5c2e625 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_security/WEB-INF/beans.xml
@@ -21,14 +21,15 @@
<!--beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
@@ -70,4 +71,4 @@
</security:authentication-manager>
<bean id="noopEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
index fa37ba9..37e4926 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
@@ -18,7 +18,13 @@
under the License.
-->
<!-- START SNIPPET: beans -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:jaxrs-client="http://cxf.apache.org/jaxrs-client" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.sp [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:jaxrs-client="http://cxf.apache.org/jaxrs-client"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -162,4 +168,4 @@
</property>
</bean>
</beans>
-<!-- END SNIPPET: beans -->
+<!-- END SNIPPET: beans -->
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml
index 94ebbfc..be6e535 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_spring/WEB-INF/beans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean class="org.apache.cxf.systest.jaxrs.Book"/>
@@ -31,4 +34,4 @@
<bean id="bookstore" scope="prototype" class="org.apache.cxf.systest.jaxrs.BookStore"/>
<bean id="petstore" scope="prototype" class="org.apache.cxf.systest.jaxrs.PetStore"/>
<bean id="bookstoreSimple" class="org.apache.cxf.systest.jaxrs.BookStoreSimple"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml
index 60538f4..1359844 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:/META-INF/cxf/cxf.xml"/>
<jaxrs:server id="bookservice" address="/resources">
<jaxrs:serviceBeans>
@@ -61,4 +64,4 @@
<ref bean="bookstore"/>
</jaxrs:serviceBeans>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/beans.xml
index 10fb444..425b8c7 100644
--- a/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/servlet_as_filter/WEB-INF/beans.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:/META-INF/cxf/cxf.xml"/>
<jaxrs:server id="bookservice" address="/resources">
<jaxrs:serviceBeans>
@@ -25,4 +28,4 @@
</jaxrs:serviceBeans>
</jaxrs:server>
<bean id="servletconfigstore" class="org.apache.cxf.systest.jaxrs.SpringServletConfigStore"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml
index 5966f11..d648abc 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/client-config.xml
@@ -17,11 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<jaxws:client name="{http://apache.org/hello_world_soap_http}SoapDispatchPort" createdFromAPI="true">
<jaxws:features>
<bean class="org.apache.cxf.systest.dispatch.TestDispatchFeature"/>
</jaxws:features>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml
index fdaf461..686818e 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springport}/SpringEndpoint">
@@ -45,4 +49,4 @@
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
</jaxws:handlers>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
index 0441924..3ef2e17 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/SpringEndpoint">
@@ -48,4 +52,4 @@
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
</jaxws:handlers>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
index b1a6b09..0c88796 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}/SpringEndpoint">
@@ -48,4 +52,4 @@
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
</jaxws:handlers>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/soap_fault_beans.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/soap_fault_beans.xml
index e04fb03..305cb46 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/soap_fault_beans.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/soap_fault_beans.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.SoapFaultHandler}/SpringEndpoint">
<jaxws:properties>
@@ -33,4 +37,4 @@
</jaxws:endpoint>
<jaxws:client id="cxfHandlerTestClientEndpoint" serviceClass="org.apache.handlers.AddNumbers" address="http://localhost:${testutil.ports.SoapFaultHandler}/SpringEndpoint">
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml
index d1e41d5..d6b993f 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.cxf.frontend.ServerFactoryBean" id="org.apache.cxf.service.factory.ServerFactoryBean">
<property name="properties">
<map>
@@ -25,4 +27,4 @@
</map>
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml b/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
index df38fcc..3f185d9 100644
--- a/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
+++ b/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation=" http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/ [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<jaxws:server address="http://localhost:${testutil.ports.org.apache.cxf.systest.jaxws.CXF5061Test}/cxf5061" serviceClass="org.apache.cxf.systest.jaxws.TestService">
<jaxws:serviceBean>
@@ -29,4 +33,4 @@
<bean class="org.apache.cxf.systest.jaxws.TestServiceImpl"/>
</jaxws:serviceBean>
</jaxws:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml
index e8a093a..71fd406 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml
@@ -17,7 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/trans [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<!-- -->
<!-- HTTP/S configuration for proxy clients -->
<!-- -->
@@ -44,4 +49,4 @@ under the License.
</authorization>
</http:conduit>
-->
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index 04d4e69..804567e 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -266,4 +273,4 @@
</jaxws:outInterceptors>
</jaxws:client>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index b44473b..3ab5073 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -17,7 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://WSSec/wssec10" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="ht [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://WSSec/wssec10"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -213,4 +223,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
index adf8d3c..1178265 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://WSSec/wssec10" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://WSSec/wssec10"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -157,4 +166,4 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
index 1d559af..60fe827 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -68,4 +74,4 @@
</sec:keyManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
index 17eeddb..b7c439a 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -89,4 +96,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
index e111080..2c07b22 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://WSSec/wssec10" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://WSSec/wssec10"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -89,4 +98,4 @@
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
index 072b253..d1e8200 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
@@ -17,7 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:interop="http://WSSec/wssec10" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:interop="http://WSSec/wssec10"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/confi [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -89,4 +98,4 @@
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
index 9e8cccd..0e94b5d 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -93,4 +101,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
index b17f18a..86963cc 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml
@@ -17,7 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://cxf.apac [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -98,4 +106,4 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/ldap/src/test/resources/ldap-jaxrs.xml b/systests/ldap/src/test/resources/ldap-jaxrs.xml
index 72fcfb3..c753430 100644
--- a/systests/ldap/src/test/resources/ldap-jaxrs.xml
+++ b/systests/ldap/src/test/resources/ldap-jaxrs.xml
@@ -19,7 +19,10 @@
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
<property name="url" value="ldap://localhost:portno"/>
<property name="userDn" value="UID=admin,DC=example,DC=com"/>
@@ -28,4 +31,4 @@
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource"/>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/ldap/src/test/resources/ldap.xml b/systests/ldap/src/test/resources/ldap.xml
index 2f6cc50..4703f8c 100644
--- a/systests/ldap/src/test/resources/ldap.xml
+++ b/systests/ldap/src/test/resources/ldap.xml
@@ -19,7 +19,10 @@
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
<property name="url" value="ldap://localhost:portno"/>
<property name="userDn" value="UID=admin,DC=example,DC=com"/>
@@ -77,4 +80,4 @@
<property name="groupBaseDN" value="OU=groups,DC=example,DC=com" />
<property name="customFilters" ref="customFilter" />
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
index 19a76b2..1d27275 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
@@ -17,7 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/config [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http:/ [...]
<import resource="classpath:org/apache/cxf/systest/http/resources/BethalClientConfig.cxf"/>
<jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:9002/Bethal"/>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
index 90d51cd..b69a9a9 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
@@ -17,10 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="9020">
<httpj:sessionSupport>true</httpj:sessionSupport>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
index 02bc6ae..e6fa092 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
@@ -17,7 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<httpj:engine-factory bus="cxf">
<httpj:engine port="9020">
<httpj:sessionSupport>true</httpj:sessionSupport>
@@ -26,4 +31,4 @@
<httpj:reuseAddress>false</httpj:reuseAddress>
</httpj:engine>
</httpj:engine-factory>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
index efe93c3..070c4da 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -60,4 +66,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
index 22c6a0b..5be3a61 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -69,4 +75,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
index 69fc18d..9af91db 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -66,4 +72,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
index ff7b8e8..63decdf 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -64,4 +70,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
index 0861d5e..6420722 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
@@ -17,7 +17,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/s [...]
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
@@ -64,4 +70,4 @@ under the License.
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml
index 8845ab3..314256c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/oauth-beans.xml
@@ -17,7 +17,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<jaxrs:server id="oauthServer" address="/oauth/">
@@ -31,4 +34,4 @@ under the License.
</jaxrs:server>
<bean id="temporaryCredentialService" class="org.apache.cxf.rs.security.oauth.services.RequestTokenService">
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml
index a951c37..e1afb99 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -45,4 +52,4 @@ under the License.
</jaxrs:serviceBeans>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/algorithms-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/algorithms-server.xml
index 5c875a2..d9f529d 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/algorithms-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/algorithms-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -129,4 +136,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml
index 644bbe5..b2795bb 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -95,4 +102,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
index b71c07f..a3cadb1 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -273,4 +280,4 @@ under the License.
<entry key="rs.security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/jwe.direct.properties"/>
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml
index c5ea8fa..648f639 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -78,4 +85,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml
index 5ff334e..fd1de9e 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -89,4 +96,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverMultipart.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverMultipart.xml
index 0ea6aa3..042c8c2 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverMultipart.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverMultipart.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -126,4 +133,4 @@ under the License.
<entry key="rs.security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"/>
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml
index 8bcfb78..4d78f5b 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -169,4 +176,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
index a83abde..8f3decf 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -113,4 +120,4 @@ under the License.
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml
index 9efcbc7..323566c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml
@@ -17,7 +17,14 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation=" http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd ht [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -69,4 +76,4 @@ under the License.
<entry key="rs.security.signature.algorithm" value="none" />
</jaxrs:properties>
</jaxrs:server>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client.xml
index d10dac6..fe6c5a5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client2.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client2.xml
index f0669bf..701cca9 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client2.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/client2.xml
@@ -17,7 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -35,4 +42,4 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
... 7412 lines suppressed ...
[cxf] 02/02: CXF-7940 - FileUtils.delete dramatically slowdown
WildFly server shutdown
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 82080f21d3b2689cbc299be4ac899e75b336646f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 11 13:50:19 2019 +0000
CXF-7940 - FileUtils.delete dramatically slowdown WildFly server shutdown
---
core/src/main/java/org/apache/cxf/helpers/FileUtils.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index 42b59c2..6d21442 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -253,9 +252,6 @@ public final class FileUtils {
}
public static void delete(File f, boolean inShutdown) {
if (!f.delete()) {
- if (isWindows()) {
- System.gc();
- }
try {
Thread.sleep(RETRY_SLEEP_MILLIS);
} catch (InterruptedException ex) {
@@ -267,11 +263,6 @@ public final class FileUtils {
}
}
- private static boolean isWindows() {
- String osName = SystemPropertyAction.getProperty("os.name").toLowerCase(Locale.US);
- return osName.indexOf("windows") > -1;
- }
-
public static File createTempFile(String prefix, String suffix) throws IOException {
return createTempFile(prefix, suffix, null, false);
}