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 2020/04/29 15:18:16 UTC
[cxf] 04/04: Replace deprecated PropertyPlaceholderConfigurer with
PropertySourcesPlaceholderConfigurer
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 d334b46e36d58d3b08b678baefa22f0f09ca34c2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Apr 29 16:17:43 2020 +0100
Replace deprecated PropertyPlaceholderConfigurer with PropertySourcesPlaceholderConfigurer
---
.../test/java/org/apache/cxf/configuration/spring/test-beans.xml | 2 +-
.../samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml | 2 +-
.../resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml | 2 +-
rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml | 2 +-
rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml | 2 +-
.../src/test/resources/DocLitBareClientTestBeans.xml | 2 +-
.../src/test/resources/DocLitWrappedClientTestBeans.xml | 2 +-
.../javascript-tests/src/test/resources/GreeterClientTestBeans.xml | 2 +-
.../javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml | 2 +-
.../javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml | 2 +-
rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml | 2 +-
.../javascript-tests/src/test/resources/RPCClientTestBeans.xml | 2 +-
.../javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml | 2 +-
.../javascript-tests/src/test/resources/attributeTestBeans.xml | 2 +-
.../java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml | 6 +++---
.../cxf/transport/http/netty/client/integration/ServerConfig.xml | 2 +-
.../transport/http/netty/server/integration/ApplicationContext.xml | 2 +-
.../cxf/transport/http/netty/server/integration/ServerConfig.xml | 2 +-
.../apache/cxf/transport/http/netty/server/spring/beans-props.xml | 6 +++---
.../org/apache/cxf/transport/http_undertow/spring/beans-props.xml | 6 +++---
.../org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/caching/cxf-caching-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/caching/cxf-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/caching/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml | 2 +-
.../org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/claims/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/claims/stax-cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-client.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 2 +-
.../org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/custom/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/custom/cxf-sts-common.xml | 2 +-
.../org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml | 2 +-
.../org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml | 2 +-
.../apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml | 2 +-
.../org/apache/cxf/systest/sts/deployment/cxf-sts-common.xml | 2 +-
.../org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml | 2 +-
.../org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 2 +-
.../org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml | 2 +-
.../org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/realms/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml | 2 +-
.../org/apache/cxf/systest/sts/secure_conv/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/transformation/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/usernametoken/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml | 2 +-
.../org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml | 2 +-
.../sts/intermediary_transformation/cxf-intermediary-caching.xml | 2 +-
.../systest/sts/intermediary_transformation/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/intermediary_transformation/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +-
.../org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml | 2 +-
.../org/apache/cxf/systest/sts/sendervouches/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml | 2 +-
.../org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml | 2 +-
.../org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml | 2 +-
.../org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/template/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/template/cxf-stax-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/transport/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/transport/cxf-stax-service.xml | 2 +-
.../org/apache/cxf/systest/sts/username_actas/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/username_actas/cxf-service2.xml | 2 +-
.../org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml | 2 +-
.../org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml | 2 +-
.../org/apache/cxf/systest/sts/x509/cxf-asymmetric-service.xml | 2 +-
.../test/resources/org/apache/cxf/systest/sts/x509/cxf-service.xml | 2 +-
.../resources/org/apache/cxf/systest/sts/x509/cxf-stax-service.xml | 2 +-
systests/databinding/src/test/resources/aegisJaxWsBeans.xml | 2 +-
systests/databinding/src/test/resources/aegisSportsServiceBeans.xml | 2 +-
systests/databinding/src/test/resources/aegisWSDLNSBeans.xml | 2 +-
systests/databinding/src/test/resources/extrajaxbclass.xml | 2 +-
systests/databinding/src/test/resources/jaxbCustomValidators.xml | 2 +-
systests/databinding/src/test/resources/mtomTestBeans.xml | 2 +-
.../resources/org/apache/cxf/systests/forked/ssl3/sslv3-server.xml | 2 +-
.../java/org/apache/cxf/systest/jaxrs/jms/jms_server_config.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml | 2 +-
systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml | 2 +-
.../jaxrs/src/test/resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../jaxrs/src/test/resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/failover/cxf-lb-service.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/failover/cxf-service.xml | 2 +-
.../jaxws/src/test/java/org/apache/cxf/systest/handlers/beans.xml | 2 +-
.../apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml | 2 +-
.../apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml | 2 +-
.../test/java/org/apache/cxf/systest/handlers/soap_fault_beans.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxws/springWebService.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/spnego/client.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/spnego/server.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml | 2 +-
.../resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/httpsignature/client.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/security/jcs/client.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jcs/jcs-server.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwejws/algorithms-server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwejws/http-headers-server.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwejws/serverMultipart.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/properties-server.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/filters/oauth20-serverJwt.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml | 2 +-
.../jaxrs/security/oauth2/grants/dynamic-reg-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/dynamic-reg-server-jcache.xml | 2 +-
.../systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jpa.xml | 2 +-
.../oauth2/grants/grants-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../security/oauth2/grants/grants-negative-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/grants-negative-server-jcache.xml | 2 +-
.../jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml | 2 +-
.../security/oauth2/grants/grants-server-jcache-jwt-non-persist.xml | 2 +-
.../jaxrs/security/oauth2/grants/grants-server-jcache-jwt.xml | 2 +-
.../systest/jaxrs/security/oauth2/grants/grants-server-jcache.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml | 2 +-
.../systest/jaxrs/security/oauth2/grants/grants-server-public.xml | 2 +-
.../oauth2/grants/introspection-server-jcache-jwt-non-persist.xml | 2 +-
.../security/oauth2/grants/introspection-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/introspection-server-jcache.xml | 2 +-
.../jaxrs/security/oauth2/grants/introspection-server-jpa.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/grants/publicclient.xml | 2 +-
.../jaxrs/security/oauth2/grants/revocation-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/revocation-server-jcache.xml | 2 +-
.../systest/jaxrs/security/oauth2/grants/revocation-server-jpa.xml | 2 +-
.../jaxrs/security/oauth2/grants/server-jcache-jwt-non-persist.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/grants/server-jcache.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oauth2/tls/client.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oauth2/tls/client2.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oauth2/tls/serverTls.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/filters/filters-server.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oidc/oidc-keys-jcache.xml | 2 +-
.../security/oidc/oidc-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oidc/oidc-server-dynreg.xml | 2 +-
.../jaxrs/security/oidc/oidc-server-jcache-jwt-non-persist.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml | 2 +-
.../jaxrs/security/oidc/userinfo-server-jcache-jwt-non-persist.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/userinfo-server-jcache.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/samlsso/client.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml | 2 +-
.../resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml | 2 +-
.../org/apache/cxf/systest/jms/continuations/jms_test_config.xml | 2 +-
.../src/test/resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../src/test/resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../org/apache/cxf/systest/http_undertow/SessionServer.xml | 2 +-
.../apache/cxf/systest/http_undertow/continuations/cxf_https.xml | 2 +-
.../apache/cxf/systest/http_undertow/continuations/jaxws-server.xml | 2 +-
.../org/apache/cxf/systest/http_undertow/server-lifecycle-beans.xml | 2 +-
.../test/resources/org/apache/cxf/systest/http_undertow/server.xml | 2 +-
.../org/apache/cxf/systest/http_undertow/undertow-engine.xml | 2 +-
.../apache/cxf/systest/http_undertow/undertowBasicAuthServer.xml | 2 +-
.../org/apache/cxf/systest/http_undertow/undertowDigestServer.xml | 2 +-
.../test/resources/org/apache/cxf/systest/http/SessionServer.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml | 2 +-
.../apache/cxf/systest/http_jetty/continuations/jaxws-server.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/jettyDigestServer.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/http_jetty/server.xml | 2 +-
.../apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml | 2 +-
.../org/apache/cxf/systest/https/clientauth/client-auth-server.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/BethalClientBeans.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/jaxws-publish.xml | 2 +-
.../resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml | 2 +-
.../test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/resource-key-spec.xml | 2 +-
.../cxf/systest/https/constraints/jaxws-server-constraints.xml | 2 +-
.../cxf/systest/https/hostname/hostname-server-deprecated.xml | 2 +-
.../org/apache/cxf/systest/https/hostname/hostname-server.xml | 2 +-
.../resources/org/apache/cxf/systest/https/trust/trust-server.xml | 2 +-
.../uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml | 2 +-
.../org/apache/cxf/systest/clustering/failover_address_override.xml | 2 +-
.../cxf/systest/clustering/load_distributor_address_override.xml | 2 +-
.../java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml | 2 +-
.../test/java/org/apache/cxf/systest/management/counter-spring.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/management/managed-bus.xml | 2 +-
.../test/java/org/apache/cxf/systest/management/managed-spring.xml | 2 +-
.../test/java/org/apache/cxf/systest/management/persistent-id.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/soap/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/soap/transform-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml | 2 +-
.../ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml | 2 +-
.../ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml | 2 +-
.../ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/simple.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml | 2 +-
.../resources/org/apache/cxf/systest/wssec/examples/saml/server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/saml/stax-server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/secconv/server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml | 2 +-
.../resources/org/apache/cxf/systest/wssec/examples/ut/server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/ut/stax-server.xml | 2 +-
.../resources/org/apache/cxf/systest/wssec/examples/x509/server.xml | 2 +-
.../org/apache/cxf/systest/wssec/examples/x509/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/action/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/action/signature-server.xml | 2 +-
.../org/apache/cxf/systest/ws/action/signature-stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/algsuite/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/basicauth/server-continuation.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/basicauth/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/bindings/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/bindings/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/cache/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/coverage_checker/server.xml | 2 +-
.../org/apache/cxf/systest/ws/coverage_checker/stax-server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/fault/modified-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/fault/server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/https/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/https/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/parts/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/password/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/policy/operation/server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/policy/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/saml/client.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/saml/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/security/handler/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/security/https_config.xml | 2 +-
.../org/apache/cxf/systest/ws/security/https_config_client.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/security/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/security/stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/swa/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/tokens/bst-server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml | 2 +-
.../org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/ut/server.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/server_authorized.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/server_restricted.xml | 2 +-
.../resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/x509/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml | 2 +-
.../src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml | 2 +-
.../test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml | 2 +-
.../java/org/apache/cxf/systest/ws/addressing/jms_decoupled.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/policy/addr-anon-client.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/policy/addr-anon-server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml | 2 +-
.../java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/policy/addr.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml | 2 +-
.../ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml | 2 +-
.../src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml | 2 +-
375 files changed, 381 insertions(+), 381 deletions(-)
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 bcf962d..1549352 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
@@ -20,7 +20,7 @@
<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">
+ <bean id="placeholderConfig" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/configuration/spring/bean.properties"/>
</bean>
<bean name="*2" abstract="true" class="org.apache.cxf.configuration.spring.ConfigurerImplTest$SimpleBean">
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 caac497..c1b4c6b 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
@@ -23,7 +23,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
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 9efda3c..7c1bdd6 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
@@ -22,7 +22,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding">
<property name="aegisContext">
diff --git a/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml b/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
index cda3d9b..2ef5235 100644
--- a/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
@@ -19,7 +19,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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">
<simple:serviceBean>
diff --git a/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml b/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
index 68d35b6..1517b80 100644
--- a/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/AnyBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="any-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/any">
<jaxws:serviceBean>
<bean class="org.apache.cxf.javascript.fortest.AnyImpl"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
index 93703a8..9a47cb7 100644
--- a/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/DocLitBareClientTestBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="dlb-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/SimpleDocLitBare">
<jaxws:serviceBean>
<bean class="org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
index 0770a1a..c7b020c 100644
--- a/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/DocLitWrappedClientTestBeans.xml
@@ -22,7 +22,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<!--
<cxf:bus>
diff --git a/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
index 85af18c..4f6ca4c 100644
--- a/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/GreeterClientTestBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="greeter-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/Greeter">
<jaxws:serviceBean>
<bean class="org.apache.cxf.javascript.hwdemo.GreeterImpl"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml b/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
index addf6bc..33ae630 100644
--- a/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/HelloWorldDocLitBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="hw-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/HelloWorldDocLit">
<jaxws:serviceBean>
<bean class="org.apache.hello_world_doc_lit.GreeterImplDoc"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml b/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
index 45aeca2..a16e56c 100644
--- a/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/HelloWorldGreeterBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="hwg-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/HelloWorldGreeter">
<jaxws:serviceBean>
<bean class="org.apache.hello_world.GreeterImpl"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
index 5d02c67..eee2f3f 100644
--- a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server id="mtom-service-endpoint" address="http://localhost:${testutil.ports.TestPort}/mtom">
<jaxws:serviceBean>
<bean class="org.apache.cxf.javascript.fortest.MtoMImpl"/>
diff --git a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
index 78079e0..f039dc2 100644
--- a/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/RPCClientTestBeans.xml
@@ -22,7 +22,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="rpc-service" class="org.apache.cxf.javascript.fortest.SimpleRPCImpl"/>
<jaxws:server id="rpc-service-endpoint" address="http://localhost:${testutil.ports.RPCClientTest}/SimpleRPC">
<jaxws:serviceBean>
diff --git a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
index 0bd3f51..f0a77cd 100644
--- a/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/XMLHttpRequestTestBeans.xml
@@ -21,7 +21,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<httpj:engine-factory bus="cxf">
<httpj:engine port="${testutil.ports.JsHttpRequestTest}">
diff --git a/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml b/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
index ada4a3a..8fccd6d 100644
--- a/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
+++ b/rt/javascript/javascript-tests/src/test/resources/attributeTestBeans.xml
@@ -22,7 +22,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- CXF -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<bean id="attribute-test-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
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 2849af6..1341563 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
@@ -24,15 +24,15 @@
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">
+ <bean id="placeholderConfig" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_jetty/spring/bean.properties"/>
</bean>
- <bean id="placeholderConfig2" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig2" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_jetty/spring/bean.properties"/>
<property name="placeholderPrefix" value="$("/>
<property name="placeholderSuffix" value=")"/>
</bean>
- <bean id="placeholderConfig3" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig3" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_jetty/spring/bean.properties"/>
<property name="placeholderPrefix" value="#["/>
<property name="placeholderSuffix" value="]"/>
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 02db82d..77c138b 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
@@ -28,7 +28,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory>
<httpj:engine port="${SSLNettyClientTest.port}">
<httpj:tlsServerParameters>
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 572090f..26f4c44 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
@@ -28,7 +28,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus/>
<jaxws:endpoint id="myEndpoint" bus="cxf" implementor="org.apache.hello_world_soap_http.GreeterImpl" address="https://localhost:${SSLNettySpringServerTest.port}/SoapContext/SoapPort"/>
<http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">
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 73a2ef4..fe6ecac 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
@@ -28,7 +28,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpn:engine-factory>
<httpn:engine port="${SSLNettyServerTest.port}">
<httpn:tlsServerParameters>
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 6b2fc2f..b04918e 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
@@ -24,15 +24,15 @@
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">
+ <bean id="placeholderConfig" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http/netty/server/spring/bean.properties"/>
</bean>
- <bean id="placeholderConfig2" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig2" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http/netty/server/spring/bean.properties"/>
<property name="placeholderPrefix" value="$("/>
<property name="placeholderSuffix" value=")"/>
</bean>
- <bean id="placeholderConfig3" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig3" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http/netty/server/spring/bean.properties"/>
<property name="placeholderPrefix" value="#["/>
<property name="placeholderSuffix" value="]"/>
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 834ec0d..83b6d93 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
@@ -24,15 +24,15 @@
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">
+ <bean id="placeholderConfig" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_undertow/spring/bean.properties"/>
</bean>
- <bean id="placeholderConfig2" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig2" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_undertow/spring/bean.properties"/>
<property name="placeholderPrefix" value="$("/>
<property name="placeholderSuffix" value=")"/>
</bean>
- <bean id="placeholderConfig3" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="placeholderConfig3" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="org/apache/cxf/transport/http_undertow/spring/bean.properties"/>
<property name="placeholderPrefix" value="#["/>
<property name="placeholderSuffix" value="]"/>
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 e627566..48540b9 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 9bf5b39..6f7abaf 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 ce29728..c91162c 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4abf02c..a6a2d29 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4320268..b314da5 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1794c60..2a92794 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 7172bc7..594d515 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 9b90005..e2f8e17 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 f57544c..695bdeb 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1688492..fa8510e 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 b21d09a..eab9238 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 2756d01..7d24392 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 71fa35f..0562b77 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 416d159..aae0a40 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 3669f97..25be1de 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 2ede3ed..2396eff 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 5d2eb18..8bf48df 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml
index e09f069..69552d3 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml
index 0c06bc4..733d6c0 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 80d0750..20556c7 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 f2a8608..cb25ecd 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="ws-security.saml2.validator">
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 89aa25a..136f8e0 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 a5af159..b757748 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 d95a28f..75f9720 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 8cf5d78..13d3749 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 028dd22..249bce7 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
@@ -27,7 +27,7 @@
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">
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
</bean>
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 ed2a02e..f512c04 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4848910..5a34ae1 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 ce04d7f..d17ad90 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4320268..b314da5 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 a063464..1d5418b 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
@@ -27,7 +27,7 @@
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">
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
</bean>
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 a25b9e9..9a69613 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
@@ -27,7 +27,7 @@
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">
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts.properties"/>
</bean>
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 5d57ff9..ba06205 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 bb6f511..cc22ae1 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 dba4a59..fd5163e 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 c944de8..9c8c52b 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 13f1dd5..71dd925 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 3e084b8..8321a0d 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 c575b3c..364e2e0 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1649955..7a0291b 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4e64e9b..2451764 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 84d3389..3340ee4 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4ab66ba..83ed60c 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="ws-security.saml2.validator">
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 89ace93..ba525b6 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 e42c447..2350342 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4320268..b314da5 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 d8a3941..4befc8e 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 89d927e..9940569 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 2b88278..662cedb 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 e1df6f4..b5505d2 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 32b5454..39c2031 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 6c72ad1..e024106 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 8b837b6..161769c 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 fad2d14..faf38b4 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 f8598c7..eaa8b6c 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 449d179..3088d6b 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 e41b503..66aedd8 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 f97c3db..a37745e 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 71540c8..c27dd50 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 fdd4d90..d7137b5 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1f635d4..f4c7849 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 c7d7e7c..9863a86 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1dbfb63..42f3645 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 e127e31..1a219c8 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 70c70c5..3aca3b3 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 f207cc6..93c9631 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 36dc030..eaa835d 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 91e1f21..2a3b704 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 3268e11..013f77a 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 0c20be6..89c0fd7 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
@@ -32,7 +32,7 @@
</cxf:features>
</cxf:bus>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location" value="classpath:org/apache/cxf/systest/sts/deployment/sts/sts.properties"/>
</bean>
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 9a8b0a5..daa4aad 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 3469264..7814214 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 d7e0e2c..3a6ffe6 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 56f99d3..1c1140a 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 db886c8..521cde5 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="roleClaimsCallbackHandler"
class="org.apache.cxf.ws.security.trust.claims.RoleClaimsCallbackHandler" />
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 c7ee1a4..085fb2b 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
@@ -26,7 +26,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- JAX-WS service -->
<bean id="authenticationInterceptor" class="org.apache.cxf.interceptor.security.JAASLoginInterceptor">
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 01bbf56..89f5cbd 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
@@ -34,7 +34,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml"/>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 225d9b4..cdd997f 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 00de8b9..18f68fb 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 1e805e1..739a424 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 9f26eaa..c97a80c 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 c91eabc..3c939b8 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
@@ -30,7 +30,7 @@
</cxf:features>
</cxf:bus>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient"
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port.sts-client"
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 b8a971a..8f39468 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
@@ -30,7 +30,7 @@
</cxf:features>
</cxf:bus>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient"
name="default.sts-client"
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 8d46616..8380e96 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 aa8a7b0..3e2af26 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 c769395..af95c26 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 d52a620..55486e1 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 3cbe608..4a83db6 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 3285dc6..c27b1a1 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 8551392..675f523 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
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 9ea217c..75c04e2 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 2ee64b2..f6d187e 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 99cef71..756d348 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 7771309..d661770 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<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>
<entry key="security.signature.username" value="myservicekey"/>
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 4e94301..5f6afc7 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
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 e906f30..6da0dbf 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
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 bbf78b9..23dc938 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
diff --git a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml b/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
index 03606c7..6000ecd 100644
--- a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
+++ b/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
@@ -24,7 +24,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
<bean id="jaxws-and-aegis-service-factory" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean" scope="prototype">
<property name="dataBinding" ref="aegisBean"/>
diff --git a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml b/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
index 6bf0755..7c2efb3 100644
--- a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
+++ b/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
@@ -24,7 +24,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="sportsImpl" class="org.apache.cxf.systest.aegis.SportsServiceImpl"/>
<simple:server id="sports-server" address="http://localhost:${testutil.ports.CharacterSchemaTest}/sports" serviceClass="org.apache.cxf.systest.aegis.SportsService">
<simple:dataBinding>
diff --git a/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml b/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
index f431c32..90f2e29 100644
--- a/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
+++ b/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
@@ -24,7 +24,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
<bean id="jaxws-and-aegis-service-factory" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean" scope="prototype">
<property name="dataBinding" ref="aegisBean"/>
diff --git a/systests/databinding/src/test/resources/extrajaxbclass.xml b/systests/databinding/src/test/resources/extrajaxbclass.xml
index 15345b8..cf68d1f 100644
--- a/systests/databinding/src/test/resources/extrajaxbclass.xml
+++ b/systests/databinding/src/test/resources/extrajaxbclass.xml
@@ -24,7 +24,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- Services -->
<jaxws:server id="testServer" serviceClass="org.apache.cxf.systest.jaxb.service.TestService" address="http://localhost:${testutil.ports.TestServiceTest}/service/TestService">
<jaxws:properties>
diff --git a/systests/databinding/src/test/resources/jaxbCustomValidators.xml b/systests/databinding/src/test/resources/jaxbCustomValidators.xml
index 151b268..d832fe7 100644
--- a/systests/databinding/src/test/resources/jaxbCustomValidators.xml
+++ b/systests/databinding/src/test/resources/jaxbCustomValidators.xml
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- Services -->
<jaxws:server
diff --git a/systests/databinding/src/test/resources/mtomTestBeans.xml b/systests/databinding/src/test/resources/mtomTestBeans.xml
index 0dc0f36..be2711e 100644
--- a/systests/databinding/src/test/resources/mtomTestBeans.xml
+++ b/systests/databinding/src/test/resources/mtomTestBeans.xml
@@ -16,7 +16,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="mtomImpl" class="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype"/>
<bean id="jaxws-and-aegis-service-factory" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean" scope="prototype">
diff --git a/systests/forked/src/test/resources/org/apache/cxf/systests/forked/ssl3/sslv3-server.xml b/systests/forked/src/test/resources/org/apache/cxf/systests/forked/ssl3/sslv3-server.xml
index ae7e3bf..44a973b 100644
--- a/systests/forked/src/test/resources/org/apache/cxf/systests/forked/ssl3/sslv3-server.xml
+++ b/systests/forked/src/test/resources/org/apache/cxf/systests/forked/ssl3/sslv3-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 bf4d7df..06792e4 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
@@ -24,7 +24,7 @@
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 class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="ConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
p:brokerURL="tcp://localhost:${testutil.ports.EmbeddedJMSBrokerLauncher}"/>
<jaxrs:server xmlns:s="http://books.com"
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 72c806d..1fddb80 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
@@ -24,7 +24,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
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 1cc91f1..973d2e4 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
@@ -24,7 +24,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
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 c2361ba..946c0e8 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
@@ -24,7 +24,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
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 7957359..0781664 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
@@ -28,7 +28,7 @@ under the License.
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
http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
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 b5f74d6..ddb34d7 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
@@ -23,7 +23,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory id="port-9095-tls-config">
<httpj:engine port="${testutil.ports.jaxrs-https}">
<httpj:tlsServerParameters>
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 37e4926..3e16d36 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded.xml b/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded.xml
index 6e73b10..3a8d02b 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded.xml
@@ -32,7 +32,7 @@
<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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean class="org.apache.cxf.systest.jaxrs.websocket.BookStoreWebSocket" id="serviceBean"/>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded2.xml b/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded2.xml
index c71c39d..aa427d5 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded2.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_websocket/beans-embedded2.xml
@@ -32,7 +32,7 @@
<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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean class="org.apache.cxf.systest.jaxrs.websocket.BookStoreWebSocket" id="serviceBean"/>
diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml
index 53815ba..3a2827b 100644
--- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml
+++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/discovery/jaxrs-http-client.xml
@@ -24,7 +24,7 @@ under the License.
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/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxrs:client id="bookService" address="http://localhost:${testutil.ports.jaxrs-http}"
basePackages="org.apache.cxf.systest.jaxrs.discovery,org.apache.cxf.systest.jaxrs.discovery.sub"/>
diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-lb-service.xml b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-lb-service.xml
index f16dd36..e67ec32 100644
--- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-lb-service.xml
+++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-lb-service.xml
@@ -40,7 +40,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-service.xml b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-service.xml
index f0f5747..eed3cfe 100644
--- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-service.xml
+++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-service.xml
@@ -40,7 +40,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
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 686818e..2b14170 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
@@ -23,7 +23,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springport}/SpringEndpoint">
<jaxws:handlers>
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
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 3ef2e17..61e0e27 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
@@ -23,7 +23,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/SpringEndpoint">
<jaxws:handlers>
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
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 0c88796..f31e2dc 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
@@ -23,7 +23,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}/SpringEndpoint">
<jaxws:handlers>
<bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
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 305cb46..11b29cb 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
@@ -22,7 +22,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:endpoint id="cxfHandlerTestEndpoint" implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" address="http://localhost:${testutil.ports.SoapFaultHandler}/SpringEndpoint">
<jaxws:properties>
<entry key="soap.env.ns.map">
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 3f185d9..a0c925f 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
@@ -22,7 +22,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:server address="http://localhost:${testutil.ports.org.apache.cxf.systest.jaxws.CXF5061Test}/cxf5061" serviceClass="org.apache.cxf.systest.jaxws.TestService">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.jaxws.TestServiceImpl"/>
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 cdffa32..aad2459 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 d1c3215..e8c9411 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
@@ -28,7 +28,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 1178265..50a43bb 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 715b020..daee8dd 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
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 b7c439a..b64f15e 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 2c07b22..815a7e5 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 d1e8200..59aa18b 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
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
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 ac35b6c..4591236 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 8f48610..cb15bc2 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
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/client.xml
index f8476fd..5f49cc1 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/client.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
index 175d945..28bffc0 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/server.xml
@@ -26,7 +26,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:util="http://www.springframework.org/schema/util"
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fe6c5a5..77fbff5 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 e1afb99..47847aa 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 d9f529d..74415b8 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fe6c5a5..77fbff5 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/http-headers-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/http-headers-server.xml
index 311d990..4314bc6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/http-headers-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/http-headers-server.xml
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 b2795bb..93d38a6 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 7e11572..a8a1e8b 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 648f639..41cb110 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fd1de9e..a6f1998 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 042c8c2..425b64e 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 4d78f5b..764d135 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 8f3decf..c12840c 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fe6c5a5..77fbff5 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 323566c..8a40439 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
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml
index 080faa8..9b0001a 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml
index ce69a7f..da77426 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml
index 571a29c..32c2221 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-serverJwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-serverJwt.xml
index 52c45f8..01bad0f 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-serverJwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-serverJwt.xml
@@ -26,7 +26,7 @@ under the License.
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory id="tls-config">
<httpj:engine port="${testutil.ports.jaxrs-oauth2-serviceJwt}">
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
index 66d4bc9..e337747 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/partner-service.xml
@@ -34,7 +34,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fe6c5a5..77fbff5 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache-jwt.xml
index cfcb5b3..4ef6cce 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache.xml
index 7f85b27..c14c6fc 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jpa.xml
index 096a14c..c4da677 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/dynamic-reg-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt-non-persist.xml
index 05b0336..968343a 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt.xml
index d6c00c3..ddc68d5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache.xml
index b0bba24..4f452c8 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
index 9a23d78..04017bb 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt-non-persist.xml
index c027432..f286773 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt.xml
index 49d86ff..8f76658 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache.xml
index 745b4ad..0e167bf 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
index f3bbf53..7fe9fce 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public.xml
index 32d2bba..e922f21 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt-non-persist.xml
index e7660ac..788366d 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt.xml
index 09be199..5473572 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache.xml
index b1b548d..db3f924 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
index eea246b..559bc38 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/publicclient.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/publicclient.xml
index 1663654..9360d93 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/publicclient.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/publicclient.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache-jwt.xml
index a846f9e..1b203bc 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache.xml
index 9350e9a..fe848d2 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jpa.xml
index cb77014..de705d1 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/revocation-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt-non-persist.xml
index 9e01ba7..fcaaef7 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt.xml
index 8e975d6..1f7b308 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache.xml
index 14ece1b..72cb43c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
index 1127162..3e8b49a 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 fe6c5a5..77fbff5 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
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 701cca9..acf409d 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
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/serverTls.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/serverTls.xml
index 53ef715..4c8f4a8 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/serverTls.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/tls/serverTls.xml
@@ -34,7 +34,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
index cf23ab6..6a4f6db 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/filters-server.xml
@@ -34,7 +34,7 @@ under the License.
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://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
index 85f38ac..b3dc39e 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-keys-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-keys-jcache.xml
index 19647b7..098ca4b 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-keys-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-keys-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt-non-persist.xml
index 0d5a4de..129bd5e 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt.xml
index 0e55641..a68f5bc 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache.xml
index 01efd30..9207da4 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
index b4b1052..03ae318 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-dynreg.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-dynreg.xml
index 5d87b61..bc4c6b4 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-dynreg.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-dynreg.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt-non-persist.xml
index fd644d2..b1cbf31 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt.xml
index 69aefc1..ca9fc88 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache.xml
index ccea598..886e0b2 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
index 41d16c5..7467041 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt-non-persist.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt-non-persist.xml
index 1653a49..6ad837d 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt-non-persist.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt-non-persist.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt.xml
index ccb825d..43a274b 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache-jwt.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache.xml
index 344cc2c..1301ee9 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jcache.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
index ce8e204..aed29ba 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
index fe6c5a5..77fbff5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
index b3e52fc..3c5118a 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
@@ -26,7 +26,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
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://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.ap [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
index 58087f4..419ad4b 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
@@ -25,7 +25,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
index fe6c5a5..77fbff5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
index 7f0ab4c..d9e9f04 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
@@ -26,7 +26,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
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://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.ap [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
index fe6c5a5..77fbff5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
index cccce47..23be919 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
@@ -26,7 +26,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:util="http://www.springframework.org/schema/util"
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
index 1e0c870..5645b02 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
@@ -26,7 +26,7 @@ under the License.
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:util="http://www.springframework.org/schema/util"
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
index fb5e6f4..c704096 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
@@ -23,7 +23,7 @@
xmlns:jms="http://cxf.apache.org/transports/jms"
xmlns:p="http://www.springframework.org/schema/p"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="ConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
p:brokerURL="${EmbeddedBrokerURL}"/>
</beans>
\ No newline at end of file
diff --git a/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded.xml b/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded.xml
index 9bf342c..576767a 100644
--- a/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded.xml
+++ b/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded.xml
@@ -32,7 +32,7 @@
<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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean class="org.apache.cxf.systest.http_undertow.websocket.BookStoreWebSocket" id="serviceBean"/>
diff --git a/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded2.xml b/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded2.xml
index 935d783..1e93017 100644
--- a/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded2.xml
+++ b/systests/transport-undertow/src/test/resources/jaxrs_websocket/beans-embedded2.xml
@@ -32,7 +32,7 @@
<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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean class="org.apache.cxf.systest.http_undertow.websocket.BookStoreWebSocket" id="serviceBean"/>
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/SessionServer.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/SessionServer.xml
index 9c9d6ac..b44028a 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/SessionServer.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/SessionServer.xml
@@ -24,7 +24,7 @@
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/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-undertow/configuration http://cxf.apache.org/schemas/configuration/http-undertow.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springfram [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpu:engine-factory bus="cxf">
<httpu:engine port="${testutil.ports.SessionServer}">
</httpu:engine>
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/cxf_https.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/cxf_https.xml
index 8cc6244..4bb6bfc 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/cxf_https.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/cxf_https.xml
@@ -23,7 +23,7 @@
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/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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for clients -->
<!-- -->
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
index dc62e4d..6297df4 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
@@ -23,7 +23,7 @@ under the License.
xmlns:httpu="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/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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server-lifecycle-beans.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server-lifecycle-beans.xml
index e8f4083..9a8bdb2 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server-lifecycle-beans.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server-lifecycle-beans.xml
@@ -15,7 +15,7 @@
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"
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 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 class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype">
<property name="configuration">
<bean class="org.apache.cxf.aegis.type.TypeCreationOptions">
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server.xml
index 08f5349..3720704 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/server.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http-undertow="http://cxf.apache.org/transports/http-undertow/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http-undertow:engine-factory bus="cxf">
<http-undertow:engine port="${testutil.ports.org.apache.cxf.systest.http_undertow.Server}">
<http-undertow:threadingParameters minThreads="1" maxThreads="2"/>
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
index 0769733..d511854 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
@@ -23,7 +23,7 @@
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpu:engine-factory bus="cxf">
<httpu:engine port="${testutil.ports.EngineLifecycleTest.2}">
<!--httpu:handlers>
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowBasicAuthServer.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowBasicAuthServer.xml
index a30a944..1a4eff0 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowBasicAuthServer.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowBasicAuthServer.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpu:engine-factory bus="cxf">
<httpu:engine port="${testutil.ports.UndertowBasicAuthServer}">
<httpu:handlers>
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowDigestServer.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowDigestServer.xml
index 35d4ebe..7038025 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowDigestServer.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertowDigestServer.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpu:engine-factory bus="cxf">
<httpu:engine port="${testutil.ports.UndertowDigestAuthTest}">
<httpu:handlers>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
index 82b1bed..b4a84cf 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
@@ -24,7 +24,7 @@
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://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework. [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory bus="cxf">
<httpj:engine port="${testutil.ports.SessionServer}">
<httpj:sessionSupport>true</httpj:sessionSupport>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
index a74e6d9..fed97cd 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
@@ -23,7 +23,7 @@
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/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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for clients -->
<!-- -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
index 5dced77..12b289f 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
@@ -23,7 +23,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
index 69e5b52..cc693e8 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory bus="cxf">
<httpj:engine port="${testutil.ports.JettyBasicAuthServer}">
<httpj:handlers>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
index 5156851..573d8ac 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<httpj:engine-factory bus="cxf">
<httpj:engine port="${testutil.ports.JettyDigestAuthTest}">
<httpj:handlers>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
index 63c7c50..249bbb9 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
@@ -15,7 +15,7 @@
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
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 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 class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype">
<property name="configuration">
<bean class="org.apache.cxf.aegis.type.TypeCreationOptions">
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server.xml
index 7c48527..5254cc9 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/server.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http-jetty="http://cxf.apache.org/transports/http-jetty/configuration"
xsi:schemaLocation="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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http-jetty:engine-factory bus="cxf">
<http-jetty:engine port="${testutil.ports.org.apache.cxf.systest.http_jetty.Server}">
<http-jetty:threadingParameters minThreads="3" maxThreads="${ThreadPoolTest.threads}"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
index 510150c..d898e83 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-server.xml
index eb71d9d..0cba9cb 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
index 548cf1b..ef6164d 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
@@ -24,7 +24,7 @@
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:/ [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="classpath:org/apache/cxf/systest/https/conduit/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:${testutil.ports.BusServer.4}/Bethal"/>
</beans>
\ No newline at end of file
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
index 4d67d5c..4a653d4 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
index 867a70d..a02440b 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
index eac9ffc..d793b55 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
index b4fd9a7..379423b 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
index debf776..8a6d104 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
index e7a6181..7fa53ef 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
@@ -25,7 +25,7 @@ under the License.
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/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 ht [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
index 0cfa953..f9a42c3 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
index 6806d7b..686788a 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server-deprecated.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server-deprecated.xml
index 567a8d7..e0eec82 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server-deprecated.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server-deprecated.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server.xml
index c717744..67b59f4 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/trust-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/trust-server.xml
index b07615d..dec3647 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/trust-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/trust-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
index 6c1cae7..0c2d105 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
@@ -23,7 +23,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
<cxf:bus>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
index 46ded78..3e6a81a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
@@ -24,7 +24,7 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.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://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<util:list id="addressList">
<value>http://localhost:${testutil.ports.Server.1}/SoapContext/ReplicatedPortA</value>
<value>http://localhost:${testutil.ports.Server.2}/SoapContext/ReplicatedPortB</value>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
index 5198c48..273fd02 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
@@ -24,7 +24,7 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.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://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<util:list id="addressList">
<value>http://localhost:${testutil.ports.Server.1}/SoapContext/ReplicatedPortA</value>
<value>http://localhost:${testutil.ports.Server.2}/SoapContext/ReplicatedPortB</value>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml
index 9239be5..f41331e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml
@@ -23,7 +23,7 @@
xmlns:cxf="http://cxf.apache.org/core"
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/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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.MultiplexClientServerTest}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
index b3d5160..d2e3ae3 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
@@ -20,7 +20,7 @@
<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.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
index fed391b..f901730 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-bus.xml
@@ -20,7 +20,7 @@
<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.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
index fed391b..f901730 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
@@ -20,7 +20,7 @@
<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.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
index 9219b56..ed54954 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/persistent-id.xml
@@ -20,7 +20,7 @@
<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.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="org.apache.cxf.management.InstrumentationManager" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
diff --git a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/server.xml b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/server.xml
index a32f8d7..bc31285 100644
--- a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/server.xml
+++ b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/transform-server.xml b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/transform-server.xml
index b56d0fb..d4ce7ea 100644
--- a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/transform-server.xml
+++ b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/transform-server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
</cxf:features>
diff --git a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml
index 360a839..5d0557d 100644
--- a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml
+++ b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml
@@ -32,7 +32,7 @@ under the License.
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
index 5fa645e..21fd410 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
@@ -22,7 +22,7 @@
xmlns:cxf="http://cxf.apache.org/core"
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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.DecoupledClientServerTest}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
index a248f11..154b473 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
@@ -22,7 +22,7 @@
xmlns:cxf="http://cxf.apache.org/core"
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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.DecoupledBareTest}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml
index d2ba756..d2c7ca8 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/exactlyonce-inorder-decoupled.xml
@@ -25,7 +25,7 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="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://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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/sp [...]
<import resource="rminterceptors.xml"/>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.DecoupledClientServerOnewayTest}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml
index e57722e..1fc6ce0 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent-message-loss-server.xml
@@ -25,7 +25,7 @@
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/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://cxf.apache.org/configuration/beans http://cxf.apache.org/schemas/configuration/cxf- [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="messageLoss" class="org.apache.cxf.systest.ws.rm.MessageLossSimulator"/>
<cxf:bus>
<cxf:features>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml
index ac74d58..f0d615d 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/persistent.xml
@@ -23,7 +23,7 @@
xmlns:wsa="http://cxf.apache.org/ws/addressing"
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/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<wsa:addressing/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
index 0fcae05..8128795 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
@@ -31,7 +31,7 @@ under the License.
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus bus="bus">
<cxf:features>
<p:policies/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
index c9c288b..bbbd7a5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
@@ -31,7 +31,7 @@
http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/simple.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/simple.xml
index 5f76850..4999b41 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/simple.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/simple.xml
@@ -23,7 +23,7 @@
xmlns:wsa="http://cxf.apache.org/ws/addressing"
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/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<wsa:addressing/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml
index 8f8a417..4cd9ae5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml
@@ -25,7 +25,7 @@
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml
index 4fe81ab..dd0346c 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/wsrm-policy-resolve.xml
@@ -5,7 +5,7 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
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/policy http://cxf.apache.org/schemas/policy.xsd http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="RM">
<wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
<wsp:Policy/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
index 9b1d965..9f1ef75 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
index d1c7738..44d8fcf 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
index 5b1357b..1abeea6 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
index 7f7e8f3..a37d0e4 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
index 49fd1c4..5a5ebb7 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
@@ -24,7 +24,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<cxf:logging/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
index b06db07..093a036 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
index 661bf47..4d946a9 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
index 7a2ed64..4b6b84c 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
index 46b8b30..4cb5f0f 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index f00b9f2..cb72c67 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
index 30d8845..c05f0d0 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
index 6929716..4933075 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
index 3f09ef1..1c6a9c9 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
index b661174..52e4648 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
index 20f91cc..9b32485 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
index 2721d1e..ed85e1d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
index f367e0d..a16d36f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
index 8ca5cef..51d1704 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
index d76f72a..75775de 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
index b95d6f5..1edcd0f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
index 857ad02..5366d04 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
index 91000bd..2a57ffb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
index c6df683..c3ae0ee 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
index cbc7f39..20a8717 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
index ed903ff..4b05409 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
index 48f6c56..0acf136 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
index 738a982..f98c0bd 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
index 17f81fb..a1cd5d2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
index 94b3b18..a385816 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
index 9885333..b9b9cfe 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
index 28f5e9d..11093e4 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml
index 2be6812..add9e62 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
index a338826..b080230 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
index 2afccce..ad20687 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
index 8d4268b..deae7da 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
index 5a57212..76751ea 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
index d97c7ae..b58c25e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
@@ -18,7 +18,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml
index 3d2abdb..3465cfa 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
index ffafaf5..422ad04 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
index 68e6e4e..25e82f7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
@@ -17,7 +17,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
index 883f548..ee33dbb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
@@ -17,7 +17,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
index 82d7f81..58150a2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
index b9bb2ce..cc88258 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
index 2b62c0a..5ef42d5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
index bce1dd5..3bdf326 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
index eb7aa63..002b465 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
index 58d0580..365e829 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
index 5d131d1..35badba 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
index 752ffbb..d9f8c31 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
@@ -22,7 +22,7 @@
xmlns:beans="http://www.springframework.org/schema/beans"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
<map>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
index e9d106e..2dbf85d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- This Spring config file is designed to represent a minimal -->
<!-- configuration for spring-loading a CXF servant, where the -->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
index 4d53c4d..a8c788b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
@@ -24,7 +24,7 @@ under the License.
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 [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- HTTP/S configuration for clients -->
<!-- -->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
index 2b5bdce..42a41d9 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
@@ -24,7 +24,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://cxf.apache.org/ws/addressing"
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!--
Enable logging at all endpoints
-->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
index 9a96aa2..4e27bea 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
@@ -24,7 +24,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://cxf.apache.org/ws/addressing"
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!--
Enable logging at all endpoints
-->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
index 22f6835..4d742c1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
index 594512f..fc9357a 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
index f55855bb..bd2cbc1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/bst-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/bst-server.xml
index c41a1f6..8be85bc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/bst-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/bst-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
index 5af61d1..42f3f20 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
index a63d17a..6fe1cef 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
index 707f77e..e85e4f3 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
index d72661c..f133950 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
index 7656e1e..347c3b8 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
index 672b4b7..10611de 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
index a93b6c0..aa731ad 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
index 1eee710..50a330f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
index b0b2896..5df02b9 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
index f6f121c..3cb1479 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
index 4f4e7b5..971eb32 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
@@ -26,7 +26,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
index 4214ba4..a1fd105 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
@@ -33,7 +33,7 @@
</cxf:features>
</cxf:bus>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- Any services listening on port 9009 must use the following -->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
index 7e67d25..7740fbe 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
@@ -26,7 +26,7 @@
xmlns:sec="http://cxf.apache.org/configuration/security"
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/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/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-jetty/confi [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
index c80947c..5693d1b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
index eb62243..962eeeb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- Any services listening on port 9001 must use the following -->
<!-- Transport Layer Security (TLS) settings -->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
index df1e4c2..12bb6db 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_authorized_2.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<!-- -->
<!-- Any services listening on port 9001 must use the following -->
<!-- Transport Layer Security (TLS) settings -->
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
index 4348a89..7d8f326 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
index fbf76e4..b8041f6 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml
index a9d1a3c..9a50de5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml
@@ -27,7 +27,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
index 9b29c93..b8c1f76 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
@@ -25,7 +25,7 @@
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"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index a8d7ee5..62f9ec0 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
index b0dbf8c..96ce5a5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
index 1edd7ce..6914152 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
@@ -26,7 +26,7 @@
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://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/conf [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
index 56f837d..dd5bc28 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
index 903a816..e96820b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
index 86b64ff..e45c996 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
@@ -27,7 +27,7 @@
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://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/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 h [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml
index 7e28c31..5c08c60 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf-hpux.xml
@@ -21,7 +21,7 @@
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client Connection="Keep-Alive" DecoupledEndpoint="http://localhost:${testutil.ports.MAPTestBase.1}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
index 076021f..df26336 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
@@ -21,7 +21,7 @@
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.MAPTestBase.1}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/jms_decoupled.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/jms_decoupled.xml
index 389724d..290d12a 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/jms_decoupled.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/jms_decoupled.xml
@@ -21,7 +21,7 @@
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="wsa_interceptors.xml"/>
<jaxws:client name="{http://apache.org/hello_world_soap_http}GreeterPort" createdFromAPI="true">
<jaxws:properties>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-client.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-client.xml
index fcd957f..16fcdf5 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-client.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-client.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-server.xml
index 2528063..0e6c439 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-server.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-anon-server.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
<p:policies/>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
index 4e1f81d..861bc95 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
@@ -25,7 +25,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
index b152016..e5f6496 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
@@ -25,7 +25,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/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://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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
index dc57025..da4bee0 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
index 994b1b5..b112fd5 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
index 0d0d7c7..cbe0cff 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
index 82e21ad..2600d70 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
@@ -23,7 +23,7 @@
xmlns:p="http://cxf.apache.org/policy"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
index e794761..15394e8 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
@@ -26,7 +26,7 @@
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
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/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/b [...]
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<jaxws:client name="{http://cxf.apache.org/greeter_control}GreeterPort" createdFromAPI="true">
<jaxws:features>
<p:policies>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
index bf18d53..29b80d1 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
@@ -22,7 +22,7 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
index a5f006a..fa4719a 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
@@ -30,7 +30,7 @@
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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
index 5bf72b1..5fbb2ba 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
@@ -30,7 +30,7 @@
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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
index 7786a66..cc2ae96 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
@@ -21,7 +21,7 @@
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">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<http:conduit name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>