From 683f4d1c513b6a2bcce0f7477d02513eedb34b6e Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Sun, 28 Dec 2025 12:07:00 -0500 Subject: [PATCH] CXF-9116: Remove org.apache.cxf.feature.LoggingFeature --- .../org/apache/cxf/annotations/Logging.java | 64 ---- .../cxf/bus/spring/NamespaceHandler.java | 3 - .../apache/cxf/feature/LoggingFeature.java | 196 ------------- .../cxf/interceptor/LoggingInInterceptor.java | 241 --------------- .../cxf/interceptor/LoggingMessage.java | 133 --------- .../interceptor/LoggingOutInterceptor.java | 275 ------------------ .../transform/TransformOutInterceptor.java | 1 - .../factory/FactoryBeanListenerManager.java | 1 - .../OldLoggingFactoryBeanListener.java | 77 ----- core/src/main/resources/schemas/core.xsd | 15 - .../bus/spring/BusDefinitionParserTest.java | 19 -- .../java/org/apache/cxf/bus/spring/bus.xml | 1 - .../org/apache/cxf/bus/spring/customerBus.xml | 4 +- .../apache/cxf/bus/spring/customerBus2.xml | 4 +- .../org/apache/cxf/bus/spring/lazyInitBus.xml | 30 -- .../interceptor/LoggingInInterceptorTest.java | 135 --------- .../LoggingOutInterceptorTest.java | 227 --------------- .../in_jvm_transport/logging.properties | 4 +- .../src/graalvm/client/reflect-config.json | 3 - .../src/graalvm/server/reflect-config.json | 7 - .../src/graalvm/client/reflect-config.json | 7 - .../src/graalvm/server/reflect-config.json | 7 - .../reflect-config.json | 7 - .../reflect-config.json | 7 - .../src/main/resources/wssec-client-stax.xml | 2 +- .../sts/src/main/resources/wssec-client.xml | 2 +- .../src/main/resources/wssec-server-stax.xml | 2 +- .../sts/src/main/resources/wssec-server.xml | 2 +- .../sts/src/main/resources/wssec-sts-stax.xml | 2 +- .../sts/src/main/resources/wssec-sts.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 4 +- .../release/samples/ws_rm/logging.properties | 4 +- .../ws_rm/src/main/resources/client.xml | 2 +- .../ws_rm/src/main/resources/server.xml | 2 +- .../ws_security/sign_enc/logging.properties | 4 +- .../src/main/java/demo/wssec/client/wssec.xml | 2 +- .../src/main/java/demo/wssec/server/wssec.xml | 2 +- .../src/main/resources/ClientConfig.xml | 2 +- .../src/main/resources/ClientConfigStax.xml | 2 +- .../src/main/resources/ServiceConfig.xml | 2 +- .../src/main/resources/ServiceConfigStax.xml | 2 +- .../ut/src/main/resources/wssec.xml | 2 +- .../src/main/resources/ClientConfig.xml | 2 +- .../src/main/resources/ClientConfigStax.xml | 2 +- .../src/main/resources/ServiceConfig.xml | 2 +- .../src/main/resources/ServiceConfigStax.xml | 2 +- .../OldLoggingFactoryBeanListener.java | 127 -------- .../resources/META-INF/cxf/bus-extensions.txt | 1 - rt/javascript/javascript-tests/pom.xml | 6 + .../cxf/javascript/fortest/AnyImpl.java | 2 +- .../cxf/javascript/fortest/MtoMImpl.java | 2 +- .../cxf/javascript/fortest/SimpleRPCImpl.java | 2 +- .../cxf/javascript/hwdemo/GreeterImpl.java | 2 +- .../DocLitWrappedClientTestBeans.xml | 7 - .../src/test/resources/MtoMBeans.xml | 4 +- .../cxf/jaxrs/client/spring/clients.xml | 4 +- .../http/AbstractHTTPDestination.java | 9 +- rt/ws/policy/pom.xml | 6 + .../apache/cxf/ws/policy/ignorable-policy.xml | 2 +- .../cxf/ws/policy/ignorable-policy2.xml | 4 +- .../cxf/ws/rm/RMCaptureOutInterceptor.java | 1 - .../wss4j/WSS4JStaxOutInterceptor.java | 3 - .../systest/sts/asymmetric_encr/cxf-sts.xml | 2 +- .../sts/asymmetric_encr/stax-cxf-sts.xml | 2 +- .../systest/sts/basic_auth/cxf-bad-client.xml | 2 +- .../cxf/systest/sts/basic_auth/cxf-client.xml | 2 +- .../systest/sts/basic_auth/cxf-service.xml | 2 +- .../sts/basic_auth/stax-cxf-service.xml | 2 +- .../cxf/systest/sts/batch/cxf-client-unit.xml | 2 +- .../apache/cxf/systest/sts/batch/cxf-sts.xml | 2 +- .../cxf/systest/sts/batch/stax-cxf-sts.xml | 2 +- .../binarysecuritytoken/cxf-bad-client.xml | 2 +- .../sts/binarysecuritytoken/cxf-client.xml | 2 +- .../sts/binarysecuritytoken/cxf-service.xml | 2 +- .../binarysecuritytoken/stax-cxf-service.xml | 2 +- .../cxf/systest/sts/caching/cxf-client.xml | 2 +- .../cxf/systest/sts/claims/cxf-bad-client.xml | 2 +- .../sts/claims/cxf-client-cbhandler.xml | 2 +- .../sts/claims/cxf-client-cbhandler2.xml | 2 +- .../cxf/systest/sts/claims/cxf-client.xml | 2 +- .../systest/sts/cross_domain/cxf-client-b.xml | 2 +- .../sts/cross_domain/cxf-client-mex.xml | 2 +- .../systest/sts/cross_domain/cxf-client.xml | 2 +- .../sts/cross_domain/cxf-sts-saml1.xml | 2 +- .../sts/cross_domain/cxf-sts-saml2.xml | 2 +- .../cxf/systest/sts/custom/cxf-client.xml | 2 +- .../cxf/systest/sts/custom/cxf-sts-common.xml | 2 +- .../sts/custom_onbehalfof/cxf-client.xml | 2 +- .../systest/sts/custom_onbehalfof/cxf-sts.xml | 2 +- .../defaultstsprovider/cxf-client-unit.xml | 2 +- .../sts/defaultstsprovider/cxf-sts-common.xml | 2 +- .../systest/sts/deployment/cxf-sts-common.xml | 2 +- .../sts/distributed_caching/cxf-client.xml | 2 +- .../sts/distributed_caching/cxf-sts-1.xml | 2 +- .../sts/distributed_caching/cxf-sts-2.xml | 2 +- .../apache/cxf/systest/sts/jwt/cxf-client.xml | 2 +- .../cxf/systest/sts/jwt/cxf-service.xml | 2 +- .../sts/kerberos/cxf-intermediary-client.xml | 2 +- .../cxf-intermediary-jaxrs-client.xml | 2 +- .../systest/sts/kerberos/cxf-intermediary.xml | 2 +- .../cxf/systest/sts/kerberos/cxf-service.xml | 2 +- .../cxf/systest/sts/realms/cxf-client.xml | 2 +- .../cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +- .../cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +- .../cxf/systest/sts/renew/cxf-client-unit.xml | 2 +- .../cxf/systest/sts/renew/cxf-client.xml | 2 +- .../cxf/systest/sts/renew/cxf-service.xml | 2 +- .../cxf/systest/sts/renew/cxf-sts-pop.xml | 2 +- .../apache/cxf/systest/sts/renew/cxf-sts.xml | 2 +- .../cxf/systest/sts/renew/stax-cxf-sts.xml | 2 +- .../systest/sts/secure_conv/cxf-client.xml | 2 +- .../cxf/systest/sts/secure_conv/cxf-sts.xml | 2 +- .../systest/sts/secure_conv/stax-cxf-sts.xml | 2 +- .../cxf/systest/sts/soap12/cxf-client.xml | 2 +- .../sts/sts_sender_vouches/cxf-client.xml | 2 +- .../sts/sts_sender_vouches/cxf-sts.xml | 2 +- .../sts/sts_sender_vouches/stax-cxf-sts.xml | 2 +- .../systest/sts/transformation/cxf-client.xml | 2 +- .../sts/transformation/cxf-service.xml | 2 +- .../sts/usernametoken/cxf-bad-client.xml | 2 +- .../systest/sts/usernametoken/cxf-client.xml | 2 +- .../systest/sts/usernametoken/cxf-service.xml | 2 +- .../sts/usernametoken/stax-cxf-service.xml | 2 +- .../sts/common/DoubleItPortTypeImpl.java | 2 +- .../DoubleItPortTypeImpl.java | 2 +- .../IntermediaryCachingPortTypeImpl.java | 2 +- .../IntermediaryPortTypeImpl.java | 2 +- .../sts/jaas/DoubleItPortTypeImpl.java | 2 +- .../sendervouches/DoubleItPortTypeImpl.java | 2 +- .../cxf/systest/sts/asymmetric/cxf-client.xml | 2 +- .../cxf/systest/sts/bearer/cxf-client.xml | 2 +- .../sts/bearer/cxf-unsigned-client.xml | 2 +- .../cxf/systest/sts/delegation/cxf-client.xml | 2 +- .../sts/delegation/cxf-sts-transport.xml | 2 +- .../cxf/systest/sts/deployment/cxf-x509.xml | 2 +- .../systest/sts/deployment/stax-cxf-x509.xml | 2 +- .../systest/sts/deployment/sts/cxf-sts.xml | 2 +- .../cxf-bad-client.xml | 2 +- .../cxf-client.xml | 2 +- .../cxf-intermediary-caching.xml | 2 +- .../cxf-intermediary.xml | 2 +- .../cxf-service.xml | 2 +- .../cxf/systest/sts/issuer/cxf-client.xml | 2 +- .../cxf/systest/sts/issueunit/cxf-client.xml | 2 +- .../cxf/systest/sts/jaas/cxf-client.xml | 2 +- .../cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +- .../systest/sts/sendervouches/cxf-client.xml | 2 +- .../sts/sendervouches/cxf-intermediary.xml | 2 +- .../systest/sts/sendervouches/cxf-service.xml | 2 +- .../sendervouches/cxf-stax-intermediary.xml | 2 +- .../sts/sendervouches/cxf-stax-service.xml | 2 +- .../systest/sts/stsclient/cxf-client-name.xml | 2 +- .../sts/stsclient/cxf-default-client.xml | 2 +- .../cxf/systest/sts/symmetric/cxf-client.xml | 2 +- .../cxf/systest/sts/template/cxf-client.xml | 2 +- .../systest/sts/transport/cxf-bad-client.xml | 2 +- .../cxf/systest/sts/transport/cxf-client.xml | 2 +- .../systest/sts/username_actas/cxf-client.xml | 2 +- .../sts/username_onbehalfof/cxf-client.xml | 2 +- .../sts/x509/cxf-asymmetric-service.xml | 2 +- .../cxf/systest/sts/x509/cxf-client.xml | 2 +- .../cxf/systest/sts/x509/cxf-service.xml | 2 +- .../cxf/systest/sts/x509/cxf-stax-service.xml | 2 +- .../src/test/resources/extrajaxbclass.xml | 4 +- .../test/resources/jaxrs/WEB-INF/beans.xml | 4 +- .../resources/jaxrs_cors/WEB-INF/beans.xml | 5 - .../jaxrs_non_spring/WEB-INF/web.xml | 4 +- .../jaxrs_security_cglib/WEB-INF/beans.xml | 2 +- .../cxf/systest/jaxrs/failover/cxf-client.xml | 2 +- .../systest/jaxrs/failover/cxf-lb-service.xml | 2 +- .../systest/jaxrs/failover/cxf-service.xml | 2 +- .../kerberos/common/DoubleItPortTypeImpl.java | 2 +- .../kerberos/wssec/kerberos/client.xml | 2 +- .../kerberos/wssec/kerberos/server.xml | 2 +- .../kerberos/wssec/kerberos/stax-server.xml | 2 +- .../kerberos/wssec/kerberos/sts-client.xml | 2 +- .../systest/kerberos/wssec/spnego/client.xml | 2 +- .../systest/kerberos/wssec/spnego/server.xml | 2 +- .../kerberos/wssec/spnego/stax-server.xml | 2 +- .../systest/kerberos/wssec/sts/cxf-sts.xml | 2 +- .../kerberos/wssec/sts/stax-cxf-sts.xml | 2 +- .../jaxrs/security/httpsignature/client.xml | 2 +- .../jaxrs/security/httpsignature/server.xml | 2 +- .../cxf/systest/jaxrs/security/jcs/client.xml | 2 +- .../systest/jaxrs/security/jcs/jcs-server.xml | 2 +- .../jose/jwejws/algorithms-server.xml | 2 +- .../jaxrs/security/jose/jwejws/client.xml | 2 +- .../jose/jwejws/http-headers-server.xml | 2 +- .../security/jose/jwejws/reference-server.xml | 2 +- .../jaxrs/security/jose/jwejws/server.xml | 2 +- .../security/jose/jwejws/serverJweJson.xml | 2 +- .../security/jose/jwejws/serverJwsJson.xml | 2 +- .../security/jose/jwejws/serverMultipart.xml | 2 +- .../security/jose/jwt/algorithms-server.xml | 2 +- .../security/jose/jwt/authn-authz-server.xml | 2 +- .../jaxrs/security/jose/jwt/client.xml | 2 +- .../security/jose/jwt/properties-server.xml | 2 +- .../oauth2/filters/filters-server.xml | 2 +- .../oauth2/filters/filters-serverJwt.xml | 2 +- .../oauth2/filters/oauth20-server.xml | 2 +- .../oauth2/filters/partner-service.xml | 2 +- .../jaxrs/security/oauth2/grants/client.xml | 2 +- .../grants/dynamic-reg-server-jcache-jwt.xml | 2 +- .../grants/dynamic-reg-server-jcache.xml | 2 +- .../oauth2/grants/dynamic-reg-server-jpa.xml | 2 +- ...negative-server-jcache-jwt-non-persist.xml | 2 +- .../grants-negative-server-jcache-jwt.xml | 2 +- .../grants/grants-negative-server-jcache.xml | 2 +- .../grants/grants-negative-server-jpa.xml | 2 +- .../grants-server-jcache-jwt-non-persist.xml | 2 +- .../grants/grants-server-jcache-jwt.xml | 2 +- .../grants/grants-server-jcache-session.xml | 2 +- .../oauth2/grants/grants-server-jcache.xml | 2 +- .../oauth2/grants/grants-server-jpa.xml | 2 +- .../grants/grants-server-public-session.xml | 2 +- .../oauth2/grants/grants-server-public.xml | 2 +- ...spection-server-jcache-jwt-non-persist.xml | 2 +- .../introspection-server-jcache-jwt.xml | 2 +- .../grants/introspection-server-jcache.xml | 2 +- .../grants/introspection-server-jpa.xml | 2 +- .../security/oauth2/grants/publicclient.xml | 2 +- .../grants/revocation-server-jcache-jwt.xml | 2 +- .../grants/revocation-server-jcache.xml | 2 +- .../oauth2/grants/revocation-server-jpa.xml | 2 +- .../grants/server-jcache-jwt-non-persist.xml | 2 +- .../oauth2/grants/server-jcache-jwt.xml | 2 +- .../security/oauth2/grants/server-jcache.xml | 2 +- .../security/oauth2/grants/server-jpa.xml | 2 +- .../jaxrs/security/oauth2/tls/client.xml | 2 +- .../jaxrs/security/oauth2/tls/client2.xml | 2 +- .../jaxrs/security/oauth2/tls/serverTls.xml | 2 +- .../systest/jaxrs/security/oidc/client.xml | 2 +- .../security/oidc/filters/filters-server.xml | 2 +- .../security/oidc/filters/oidc-server.xml | 2 +- .../jaxrs/security/oidc/oidc-keys-jcache.xml | 2 +- ...negative-server-jcache-jwt-non-persist.xml | 2 +- .../oidc/oidc-negative-server-jcache-jwt.xml | 2 +- .../oidc/oidc-negative-server-jcache.xml | 2 +- .../oidc/oidc-negative-server-jpa.xml | 2 +- .../security/oidc/oidc-server-dynreg.xml | 2 +- .../oidc-server-jcache-jwt-non-persist.xml | 2 +- .../security/oidc/oidc-server-jcache-jwt.xml | 2 +- .../security/oidc/oidc-server-jcache.xml | 2 +- ...userinfo-server-jcache-jwt-non-persist.xml | 2 +- .../oidc/userinfo-server-jcache-jwt.xml | 2 +- .../security/oidc/userinfo-server-jcache.xml | 2 +- .../security/oidc/userinfo-server-jpa.xml | 2 +- .../systest/jaxrs/security/saml/client.xml | 2 +- .../jaxrs/security/saml/secureServer.xml | 2 +- .../systest/jaxrs/security/saml/server.xml | 2 +- .../systest/jaxrs/security/samlsso/client.xml | 2 +- .../security/samlsso/metadata-server.xml | 2 +- .../cxf/systest/jaxrs/security/xml/client.xml | 2 +- .../cxf/systest/jaxrs/security/xml/server.xml | 2 +- .../jaxrs/security/xml/stax-server.xml | 2 +- .../jaxrs/JAXRSAsyncClientChunkingTest.java | 23 +- .../hc5/jaxws/JAXWSAsyncClientTest.java | 4 +- .../https/clientauth/client-auth-chain.xml | 2 +- .../https/clientauth/client-auth-invalid.xml | 2 +- .../https/clientauth/client-auth-invalid2.xml | 2 +- .../https/clientauth/client-auth-server.xml | 2 +- .../https/clientauth/client-auth-tls-1.3.xml | 2 +- .../hc5/https/clientauth/client-auth.xml | 2 +- .../hc5/https/clientauth/client-no-auth.xml | 2 +- .../hostname/hostname-client-disablecn.xml | 2 +- .../hostname/hostname-client-usedefault.xml | 2 +- .../hc5/https/hostname/hostname-client.xml | 2 +- .../hostname/hostname-server-deprecated.xml | 2 +- .../hc5/https/hostname/hostname-server.xml | 2 +- .../hc5/https/trust/client-trust-config.xml | 2 +- .../https/trust/client-trust-empty-config.xml | 2 +- .../https/trust/client-trust-manager-ref.xml | 2 +- .../systest/hc5/https/trust/client-trust.xml | 2 +- .../systest/hc5/https/trust/trust-server.xml | 2 +- .../http/jaxws/JAXWSAsyncClientTest.java | 4 +- .../jaxrs/JAXRSAsyncClientChunkingTest.java | 23 +- .../ciphersuites-client-expired-cert.xml | 2 +- .../ciphersuites-client-noconfig.xml | 2 +- .../ciphersuites-client-tlsv12.xml | 2 +- .../ciphersuites-client-tlsv13.xml | 2 +- .../ciphersuites/ciphersuites-client.xml | 2 +- .../ciphersuites/ciphersuites-dhe-client.xml | 2 +- .../ciphersuites-explicit-client.xml | 2 +- .../ciphersuites/ciphersuites-server.xml | 2 +- .../https/clientauth/client-auth-chain.xml | 2 +- .../https/clientauth/client-auth-invalid.xml | 2 +- .../https/clientauth/client-auth-invalid2.xml | 2 +- .../https/clientauth/client-auth-server.xml | 2 +- .../systest/https/clientauth/client-auth.xml | 2 +- .../https/clientauth/client-no-auth.xml | 2 +- .../https/conduit/resource-key-spec-url.xml | 2 +- .../hostname/hostname-client-disablecn.xml | 2 +- .../hostname/hostname-client-usedefault.xml | 2 +- .../https/hostname/hostname-client.xml | 2 +- .../hostname/hostname-server-deprecated.xml | 2 +- .../https/hostname/hostname-server.xml | 2 +- .../https/trust/client-trust-config.xml | 2 +- .../https/trust/client-trust-empty-config.xml | 2 +- .../https/trust/client-trust-manager-ref.xml | 2 +- .../cxf/systest/https/trust/client-trust.xml | 2 +- .../cxf/systest/https/trust/trust-server.xml | 2 +- .../java/org/apache/cxf/cxf1226/beans.xml | 4 +- .../java/org/apache/cxf/cxf1332/beans.xml | 4 +- .../systest/factory_pattern/cxf_multiplex.xml | 2 +- .../apache/cxf/systest/interceptor/addr.xml | 4 +- .../cxf/systest/interceptor/no-addr.xml | 4 +- .../apache/cxf/systest/soap/DoubleItImpl.java | 2 +- .../org/apache/cxf/systest/soap/client.xml | 2 +- .../org/apache/cxf/systest/soap/server.xml | 2 +- .../apache/cxf/systest/soap/xslt-server.xml | 2 +- .../apache/cxf/systest/ws/rm/gzip-enabled.xml | 2 +- .../cxf/systest/ws/rm/managed-client.xml | 2 +- .../cxf/systest/ws/rm/managed-server.xml | 2 +- .../cxf/systest/ws/rm/rminterceptors.xml | 6 +- .../systest/ws/rm/rminterceptors_provider.xml | 8 +- .../cxf/systest/ws/rm/sec/client-policy.xml | 2 +- .../cxf/systest/ws/rm/sec/server-policy.xml | 2 +- .../ws/rm/sync-ack-atmostonce-server.xml | 2 +- .../ws/rm/sync-ack-persistent-server.xml | 2 +- .../cxf/systest/ws/rm/sync-ack-server.xml | 2 +- .../ws/rm/twoway-endpoint-specific.xml | 4 +- systests/ws-security-examples/pom.xml | 6 + .../examples/common/DoubleItPortTypeImpl.java | 2 +- .../systest/wssec/examples/saml/client.xml | 2 +- .../systest/wssec/examples/saml/server.xml | 2 +- .../wssec/examples/saml/stax-server.xml | 2 +- .../systest/wssec/examples/secconv/client.xml | 2 +- .../systest/wssec/examples/secconv/server.xml | 2 +- .../wssec/examples/secconv/stax-server.xml | 2 +- .../wssec/examples/sts/cxf-symmetric.xml | 2 +- .../cxf/systest/wssec/examples/ut/client.xml | 2 +- .../cxf/systest/wssec/examples/ut/server.xml | 2 +- .../systest/wssec/examples/ut/stax-server.xml | 2 +- .../systest/wssec/examples/x509/client.xml | 2 +- .../systest/wssec/examples/x509/server.xml | 2 +- .../wssec/examples/x509/stax-server.xml | 2 +- .../cxf/systest/ws/common/DoubleIt2Impl.java | 2 +- .../cxf/systest/ws/common/DoubleIt3Impl.java | 2 +- .../ws/common/DoubleItImplContinuation.java | 2 +- .../systest/ws/common/DoubleItOneWayImpl.java | 2 +- .../ws/common/DoubleItPortTypeImpl.java | 2 +- .../ws/fault/DoubleItPortTypeImpl.java | 2 +- .../fault/DoubleItPortTypeImplJavaFirst.java | 2 +- .../cxf/systest/ws/mtom/DoubleIt4Impl.java | 2 +- .../systest/ws/tokens/DoubleItBSTImpl.java | 2 +- .../ws/x509/DoubleItIntermediaryImpl.java | 2 +- .../ws/x509/DoubleItPropertiesImpl.java | 2 +- .../apache/cxf/systest/ws/action/client.xml | 2 +- .../apache/cxf/systest/ws/action/server.xml | 2 +- .../systest/ws/action/signature-server.xml | 2 +- .../ws/action/signature-stax-server.xml | 2 +- .../apache/cxf/systest/ws/algsuite/client.xml | 2 +- .../apache/cxf/systest/ws/algsuite/server.xml | 2 +- .../cxf/systest/ws/algsuite/stax-server.xml | 2 +- .../cxf/systest/ws/basicauth/client.xml | 2 +- .../ws/basicauth/server-continuation.xml | 2 +- .../cxf/systest/ws/basicauth/server.xml | 2 +- .../apache/cxf/systest/ws/bindings/client.xml | 2 +- .../apache/cxf/systest/ws/bindings/server.xml | 2 +- .../cxf/systest/ws/bindings/stax-server.xml | 2 +- .../apache/cxf/systest/ws/cache/client.xml | 2 +- .../apache/cxf/systest/ws/cache/server.xml | 2 +- .../systest/ws/coverage_checker/client.xml | 2 +- .../systest/ws/coverage_checker/server.xml | 2 +- .../ws/coverage_checker/stax-server.xml | 2 +- .../cxf/systest/ws/fault/client-untrusted.xml | 2 +- .../apache/cxf/systest/ws/fault/client.xml | 2 +- .../cxf/systest/ws/fault/modified-server.xml | 2 +- .../apache/cxf/systest/ws/fault/server.xml | 2 +- .../org/apache/cxf/systest/ws/gcm/client.xml | 2 +- .../apache/cxf/systest/ws/gcm/mgf-client.xml | 2 +- .../apache/cxf/systest/ws/gcm/mgf-server.xml | 2 +- .../cxf/systest/ws/gcm/mgf-stax-server.xml | 2 +- .../org/apache/cxf/systest/ws/gcm/server.xml | 2 +- .../apache/cxf/systest/ws/gcm/stax-server.xml | 2 +- .../apache/cxf/systest/ws/httpget/client.xml | 2 +- .../apache/cxf/systest/ws/httpget/server.xml | 2 +- .../apache/cxf/systest/ws/https/client.xml | 2 +- .../apache/cxf/systest/ws/https/server.xml | 2 +- .../cxf/systest/ws/https/stax-server.xml | 2 +- .../org/apache/cxf/systest/ws/mtom/client.xml | 2 +- .../org/apache/cxf/systest/ws/mtom/server.xml | 2 +- .../cxf/systest/ws/mtom/stax-server.xml | 2 +- .../apache/cxf/systest/ws/parts/client.xml | 2 +- .../apache/cxf/systest/ws/parts/server.xml | 2 +- .../cxf/systest/ws/parts/stax-server.xml | 2 +- .../apache/cxf/systest/ws/password/server.xml | 2 +- .../cxf/systest/ws/policy/client-bus.xml | 2 +- .../apache/cxf/systest/ws/policy/client.xml | 2 +- .../cxf/systest/ws/policy/javafirstclient.xml | 2 +- .../cxf/systest/ws/policy/javafirstserver.xml | 2 +- .../systest/ws/policy/operation/client.xml | 2 +- .../systest/ws/policy/operation/server.xml | 2 +- .../apache/cxf/systest/ws/policy/server.xml | 2 +- .../cxf/systest/ws/policy/sslcertclient.xml | 2 +- .../cxf/systest/ws/policy/sslnocertclient.xml | 2 +- .../org/apache/cxf/systest/ws/saml/client.xml | 2 +- .../org/apache/cxf/systest/ws/saml/server.xml | 2 +- .../cxf/systest/ws/saml/stax-server.xml | 2 +- .../ws/saml/subjectconf/client-auth.xml | 2 +- .../ws/saml/subjectconf/client-noauth.xml | 2 +- .../systest/ws/saml/subjectconf/server.xml | 2 +- .../ws/saml/subjectconf/stax-server.xml | 2 +- .../org/apache/cxf/systest/ws/swa/client.xml | 2 +- .../cxf/systest/ws/swa/policy-client.xml | 2 +- .../cxf/systest/ws/swa/policy-server.xml | 2 +- .../org/apache/cxf/systest/ws/swa/server.xml | 2 +- .../cxf/systest/ws/swa/stax-policy-server.xml | 2 +- .../cxf/systest/ws/tokens/bst-server.xml | 2 +- .../apache/cxf/systest/ws/tokens/client.xml | 2 +- .../systest/ws/tokens/endorsing-client.xml | 2 +- .../systest/ws/tokens/endorsing-server.xml | 2 +- .../apache/cxf/systest/ws/tokens/server.xml | 2 +- .../ws/tokens/stax-endorsing-server.xml | 2 +- .../cxf/systest/ws/tokens/stax-server.xml | 2 +- .../cxf/systest/ws/tokens/tls-client.xml | 2 +- .../cxf/systest/ws/tokens/tls-server.xml | 2 +- .../cxf/systest/ws/tokens/tls-stax-server.xml | 2 +- .../cxf/systest/ws/ut/client-derived.xml | 2 +- .../cxf/systest/ws/ut/client-remote-wsdl.xml | 2 +- .../org/apache/cxf/systest/ws/ut/client.xml | 2 +- .../cxf/systest/ws/ut/policy-client.xml | 2 +- .../cxf/systest/ws/ut/policy-server.xml | 2 +- .../cxf/systest/ws/ut/server-derived.xml | 2 +- .../org/apache/cxf/systest/ws/ut/server.xml | 2 +- .../cxf/systest/ws/ut/stax-policy-server.xml | 2 +- .../apache/cxf/systest/ws/ut/stax-server.xml | 2 +- .../org/apache/cxf/systest/ws/wssc/client.xml | 2 +- .../org/apache/cxf/systest/ws/wssc/server.xml | 2 +- .../cxf/systest/ws/wssc/unit-server.xml | 2 +- .../apache/cxf/systest/ws/wssec10/client.xml | 2 +- .../wssec10/client_customAlgorithmSuite.xml | 2 +- .../systest/ws/wssec10/client_restricted.xml | 2 +- .../ws/wssec10/client_unauthorized.xml | 2 +- .../apache/cxf/systest/ws/wssec10/server.xml | 2 +- .../systest/ws/wssec10/server_authorized.xml | 2 +- .../ws/wssec10/server_authorized_2.xml | 2 +- .../wssec10/server_customAlgorithmSuite.xml | 2 +- .../systest/ws/wssec10/server_restricted.xml | 2 +- .../cxf/systest/ws/wssec10/stax-server.xml | 2 +- .../stax-server_customAlgorithmSuite.xml | 2 +- .../ws/wssec10/stax-server_restricted.xml | 2 +- .../apache/cxf/systest/ws/wssec11/client.xml | 2 +- .../systest/ws/wssec11/client_restricted.xml | 2 +- .../apache/cxf/systest/ws/wssec11/server.xml | 2 +- .../org/apache/cxf/systest/ws/x509/client.xml | 2 +- .../systest/ws/x509/intermediary-client.xml | 2 +- .../cxf/systest/ws/x509/intermediary.xml | 2 +- .../cxf/systest/ws/x509/jaxws-client.xml | 2 +- .../org/apache/cxf/systest/ws/x509/server.xml | 2 +- .../cxf/systest/ws/x509/stax-server.xml | 2 +- .../org/apache/cxf/systest/ws/xkms/client.xml | 2 +- .../org/apache/cxf/systest/ws/xkms/server.xml | 2 +- .../cxf/systest/ws/xkms/stax-server.xml | 2 +- .../cxf/systest/ws/xkms/xkms-server.xml | 2 +- .../ws/addressing/wsa_interceptors.xml | 4 +- .../cxf/systest/ws/policy/addr-optional.xml | 2 +- .../service_listing/WEB-INF/beans.xml | 2 +- 458 files changed, 492 insertions(+), 2081 deletions(-) delete mode 100644 core/src/main/java/org/apache/cxf/annotations/Logging.java delete mode 100644 core/src/main/java/org/apache/cxf/feature/LoggingFeature.java delete mode 100644 core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java delete mode 100644 core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java delete mode 100644 core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java delete mode 100644 core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java delete mode 100644 core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml delete mode 100644 core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java delete mode 100644 core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java delete mode 100644 rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java diff --git a/core/src/main/java/org/apache/cxf/annotations/Logging.java b/core/src/main/java/org/apache/cxf/annotations/Logging.java deleted file mode 100644 index 2d3dd50fe77..00000000000 --- a/core/src/main/java/org/apache/cxf/annotations/Logging.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.apache.cxf.interceptor.AbstractLoggingInterceptor; - -/** - * Enables message Logging - */ -@Deprecated -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE }) -@Inherited -public @interface Logging { - /** - * The size limit at which messages are truncated in the log - */ - int limit() default AbstractLoggingInterceptor.DEFAULT_LIMIT; - - /** - * the locations where the messages are logged. The default is - * which means to log to the java.util.logging.Logger, - * but , , and a "file:/.." URI are acceptable. - */ - String inLocation() default ""; - String outLocation() default ""; - - - /** - * For XML content, turn on pretty printing in the logs - */ - boolean pretty() default false; - - /** - * Ignore binary payloads by default - */ - boolean showBinary() default false; -} - diff --git a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java index 9211ea8411c..237e5924b90 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java @@ -28,12 +28,9 @@ import org.springframework.beans.factory.xml.ParserContext; public class NamespaceHandler extends NamespaceHandlerSupport { - @SuppressWarnings("deprecation") public void init() { registerBeanDefinitionParser("bus", new BusDefinitionParser()); - registerBeanDefinitionParser("logging", - new SimpleBeanDefinitionParser(org.apache.cxf.feature.LoggingFeature.class)); registerBeanDefinitionParser("fastinfoset", new SimpleBeanDefinitionParser(FastInfosetFeature.class)); diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java deleted file mode 100644 index 6d06623e067..00000000000 --- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java +++ /dev/null @@ -1,196 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.feature; - -import org.apache.cxf.Bus; -import org.apache.cxf.annotations.Logging; -import org.apache.cxf.annotations.Provider; -import org.apache.cxf.annotations.Provider.Type; -import org.apache.cxf.common.injection.NoJSR250Annotations; -import org.apache.cxf.interceptor.AbstractLoggingInterceptor; -import org.apache.cxf.interceptor.InterceptorProvider; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; - -/** - * This class is used to control message-on-the-wire logging. - * By attaching this feature to an endpoint, you - * can specify logging. If this feature is present, an endpoint will log input - * and output of ordinary and log messages. - * - * 
- * 
-      
-       
-      
-    
-  ]]>
-
- * - * @deprecated use the logging module rt/features/logging instead - */ -@NoJSR250Annotations -@Deprecated -@Provider(value = Type.Feature) -public class LoggingFeature extends DelegatingFeature { - public LoggingFeature() { - super(new Portable()); - } - public LoggingFeature(int lim) { - super(new Portable(lim)); - } - public LoggingFeature(String in, String out) { - super(new Portable(in, out)); - } - public LoggingFeature(String in, String out, int lim) { - super(new Portable(in, out, lim)); - } - - public LoggingFeature(String in, String out, int lim, boolean p) { - super(new Portable(in, out, lim, p)); - } - - public LoggingFeature(String in, String out, int lim, boolean p, boolean showBinary) { - super(new Portable(in, out, lim, p, showBinary)); - } - - public LoggingFeature(Logging annotation) { - super(new Portable(annotation)); - } - - public void setLimit(int lim) { - delegate.setLimit(lim); - } - - public int getLimit() { - return delegate.getLimit(); - } - - public boolean isPrettyLogging() { - return delegate.isPrettyLogging(); - } - - public void setPrettyLogging(boolean prettyLogging) { - delegate.setPrettyLogging(prettyLogging); - } - - public static class Portable implements AbstractPortableFeature { - private static final int DEFAULT_LIMIT = AbstractLoggingInterceptor.DEFAULT_LIMIT; - private static final LoggingInInterceptor IN = new LoggingInInterceptor(DEFAULT_LIMIT); - private static final LoggingOutInterceptor OUT = new LoggingOutInterceptor(DEFAULT_LIMIT); - - - String inLocation; - String outLocation; - boolean prettyLogging; - boolean showBinary; - - int limit = DEFAULT_LIMIT; - - public Portable() { - - } - public Portable(int lim) { - limit = lim; - } - public Portable(String in, String out) { - inLocation = in; - outLocation = out; - } - public Portable(String in, String out, int lim) { - inLocation = in; - outLocation = out; - limit = lim; - } - - public Portable(String in, String out, int lim, boolean p) { - inLocation = in; - outLocation = out; - limit = lim; - prettyLogging = p; - } - - public Portable(String in, String out, int lim, boolean p, boolean showBinary) { - this(in, out, lim, p); - this.showBinary = showBinary; - } - - public Portable(Logging annotation) { - inLocation = annotation.inLocation(); - outLocation = annotation.outLocation(); - limit = annotation.limit(); - prettyLogging = annotation.pretty(); - showBinary = annotation.showBinary(); - } - - @Override - public void doInitializeProvider(InterceptorProvider provider, Bus bus) { - if (limit == DEFAULT_LIMIT && inLocation == null - && outLocation == null && !prettyLogging) { - provider.getInInterceptors().add(IN); - provider.getInFaultInterceptors().add(IN); - provider.getOutInterceptors().add(OUT); - provider.getOutFaultInterceptors().add(OUT); - } else { - LoggingInInterceptor in = new LoggingInInterceptor(limit); - in.setOutputLocation(inLocation); - in.setPrettyLogging(prettyLogging); - in.setShowBinaryContent(showBinary); - LoggingOutInterceptor out = new LoggingOutInterceptor(limit); - out.setOutputLocation(outLocation); - out.setPrettyLogging(prettyLogging); - out.setShowBinaryContent(showBinary); - - provider.getInInterceptors().add(in); - provider.getInFaultInterceptors().add(in); - provider.getOutInterceptors().add(out); - provider.getOutFaultInterceptors().add(out); - } - } - - /** - * Set a limit on how much content can be logged - * @param lim - */ - public void setLimit(int lim) { - limit = lim; - } - - /** - * Retrieve the value set with {@link #setLimit(int)}. - */ - public int getLimit() { - return limit; - } - - /** - */ - public boolean isPrettyLogging() { - return prettyLogging; - } - /** - * Turn pretty logging of XML content on/off - * @param prettyLogging - */ - public void setPrettyLogging(boolean prettyLogging) { - this.prettyLogging = prettyLogging; - } - } -} diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java deleted file mode 100644 index 1975d685cb5..00000000000 --- a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java +++ /dev/null @@ -1,241 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.interceptor; - -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.Reader; -import java.io.SequenceInputStream; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.cxf.common.injection.NoJSR250Annotations; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.helpers.IOUtils; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.io.CachedWriter; -import org.apache.cxf.io.DelegatingInputStream; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.Phase; - - - -/** - * A simple logging handler which outputs the bytes of the message to the - * Logger. - * @deprecated use the logging module rt/features/logging instead - */ -@NoJSR250Annotations -@Deprecated -public class LoggingInInterceptor extends AbstractLoggingInterceptor { - private static final Logger LOG = LogUtils.getLogger(LoggingInInterceptor.class); - - public LoggingInInterceptor() { - super(Phase.RECEIVE); - } - - public LoggingInInterceptor(String phase) { - super(phase); - } - - public LoggingInInterceptor(String id, String phase) { - super(id, phase); - } - - public LoggingInInterceptor(int lim) { - this(); - limit = lim; - } - public LoggingInInterceptor(String id, int lim) { - this(id, Phase.RECEIVE); - limit = lim; - } - - public LoggingInInterceptor(PrintWriter w) { - this(); - this.writer = w; - } - public LoggingInInterceptor(String id, PrintWriter w) { - this(id, Phase.RECEIVE); - this.writer = w; - } - - public void handleMessage(Message message) { - Logger logger = getMessageLogger(message); - if (logger != null && (writer != null || logger.isLoggable(Level.INFO))) { - logging(logger, message); - } - } - - protected void logging(Logger logger, Message message) { - if (message.containsKey(LoggingMessage.ID_KEY)) { - return; - } - String id = (String)message.getExchange().get(LoggingMessage.ID_KEY); - if (id == null) { - id = LoggingMessage.nextId(); - message.getExchange().put(LoggingMessage.ID_KEY, id); - } - message.put(LoggingMessage.ID_KEY, id); - final LoggingMessage buffer - = new LoggingMessage("Inbound Message\n----------------------------", id); - - if (!Boolean.TRUE.equals(message.get(Message.DECOUPLED_CHANNEL_MESSAGE))) { - // avoid logging the default responseCode 200 for the decoupled responses - Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE); - if (responseCode != null) { - buffer.getResponseCode().append(responseCode); - } - } - - String encoding = (String)message.get(Message.ENCODING); - - if (encoding != null) { - buffer.getEncoding().append(encoding); - } - String httpMethod = (String)message.get(Message.HTTP_REQUEST_METHOD); - if (httpMethod != null) { - buffer.getHttpMethod().append(httpMethod); - } - String ct = (String)message.get(Message.CONTENT_TYPE); - if (ct != null) { - buffer.getContentType().append(ct); - } - Object headers = message.get(Message.PROTOCOL_HEADERS); - - if (headers != null) { - buffer.getHeader().append(headers); - } - String uri = (String)message.get(Message.REQUEST_URL); - if (uri == null) { - String address = (String)message.get(Message.ENDPOINT_ADDRESS); - uri = (String)message.get(Message.REQUEST_URI); - if (uri != null && uri.startsWith("/")) { - if (address != null && !address.startsWith(uri)) { - if (address.endsWith("/") && address.length() > 1) { - address = address.substring(0, address.length() - 1); - } - uri = address + uri; - } - } else { - uri = address; - } - } - if (uri != null) { - buffer.getAddress().append(uri); - String query = (String)message.get(Message.QUERY_STRING); - if (query != null) { - buffer.getAddress().append('?').append(query); - } - } - - if (!isShowBinaryContent() && isBinaryContent(ct)) { - buffer.getMessage().append(BINARY_CONTENT_MESSAGE).append('\n'); - log(logger, buffer.toString()); - return; - } - if (!isShowMultipartContent() && isMultipartContent(ct)) { - buffer.getMessage().append(MULTIPART_CONTENT_MESSAGE).append('\n'); - log(logger, buffer.toString()); - return; - } - - InputStream is = message.getContent(InputStream.class); - if (is != null) { - logInputStream(message, is, buffer, encoding, ct); - } else { - Reader reader = message.getContent(Reader.class); - if (reader != null) { - logReader(message, reader, buffer); - } - } - log(logger, formatLoggingMessage(buffer)); - } - - protected void logReader(Message message, Reader reader, LoggingMessage buffer) { - try (CachedWriter writer = new CachedWriter()) { - IOUtils.copyAndCloseInput(reader, writer); - message.setContent(Reader.class, writer.getReader()); - - if (writer.getTempFile() != null) { - //large thing on disk... - buffer.getMessage().append("\nMessage (saved to tmp file):\n"); - buffer.getMessage().append("Filename: ").append(writer.getTempFile().getAbsolutePath()).append('\n'); - } - if (writer.size() > limit && limit != -1) { - buffer.getMessage().append("(message truncated to ").append(limit).append(" bytes)\n"); - } - writer.writeCacheTo(buffer.getPayload(), limit); - } catch (Exception e) { - throw new Fault(e); - } - } - protected void logInputStream(Message message, InputStream is, LoggingMessage buffer, - String encoding, String ct) { - CachedOutputStream bos = new CachedOutputStream(); - if (threshold > 0) { - bos.setThreshold(threshold); - } - try { - // use the appropriate input stream and restore it later - InputStream bis = is instanceof DelegatingInputStream - ? ((DelegatingInputStream)is).getInputStream() : is; - - - //only copy up to the limit since that's all we need to log - //we can stream the rest - IOUtils.copyAtLeast(bis, bos, limit == -1 ? Integer.MAX_VALUE : limit); - bos.flush(); - bis = new SequenceInputStream(bos.getInputStream(), bis); - - // restore the delegating input stream or the input stream - if (is instanceof DelegatingInputStream) { - ((DelegatingInputStream)is).setInputStream(bis); - } else { - message.setContent(InputStream.class, bis); - } - - if (bos.getTempFile() != null) { - //large thing on disk... - buffer.getMessage().append("\nMessage (saved to tmp file):\n"); - buffer.getMessage().append("Filename: ").append(bos.getTempFile().getAbsolutePath()).append('\n'); - } - boolean truncated = false; - if (bos.size() > limit && limit != -1) { - buffer.getMessage().append("(message truncated to ").append(limit).append(" bytes)\n"); - truncated = true; - } - writePayload(buffer.getPayload(), bos, encoding, ct, truncated); - - bos.close(); - } catch (Exception e) { - throw new Fault(e); - } - } - - protected String formatLoggingMessage(LoggingMessage loggingMessage) { - - return loggingMessage.toString(); - } - - @Override - protected Logger getLogger() { - return LOG; - } -} diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java deleted file mode 100644 index 661e3db942b..00000000000 --- a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.interceptor; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @deprecated use the logging module rt/features/logging instead - */ -@Deprecated -public final class LoggingMessage { - public static final String ID_KEY = LoggingMessage.class.getName() + ".ID"; - private static final AtomicInteger ID = new AtomicInteger(); - - private final String heading; - private final StringBuilder address; - private final StringBuilder contentType; - private final StringBuilder encoding; - private final StringBuilder httpMethod; - private final StringBuilder header; - private final StringBuilder message; - private final StringBuilder payload; - private final StringBuilder responseCode; - private final String id; - - - public LoggingMessage(String h, String i) { - heading = h; - id = i; - - contentType = new StringBuilder(); - address = new StringBuilder(); - encoding = new StringBuilder(); - httpMethod = new StringBuilder(); - header = new StringBuilder(); - message = new StringBuilder(); - payload = new StringBuilder(); - responseCode = new StringBuilder(); - } - - public String getId() { - return id; - } - - public static String nextId() { - return Integer.toString(ID.incrementAndGet()); - } - - - public StringBuilder getAddress() { - return address; - } - - public StringBuilder getEncoding() { - return encoding; - } - - public StringBuilder getHeader() { - return header; - } - - public StringBuilder getHttpMethod() { - return httpMethod; - } - - public StringBuilder getContentType() { - return contentType; - } - - public StringBuilder getMessage() { - return message; - } - - public StringBuilder getPayload() { - return payload; - } - - public StringBuilder getResponseCode() { - return responseCode; - } - - public String toString() { - StringBuilder buffer = new StringBuilder(128); - buffer.append(heading); - buffer.append("\nID: ").append(id); - if (address.length() > 0) { - buffer.append("\nAddress: "); - buffer.append(address); - } - if (responseCode.length() > 0) { - buffer.append("\nResponse-Code: "); - buffer.append(responseCode); - } - if (encoding.length() > 0) { - buffer.append("\nEncoding: "); - buffer.append(encoding); - } - if (httpMethod.length() > 0) { - buffer.append("\nHttp-Method: "); - buffer.append(httpMethod); - } - buffer.append("\nContent-Type: "); - buffer.append(contentType); - buffer.append("\nHeaders: "); - buffer.append(header); - if (message.length() > 0) { - buffer.append("\nMessages: "); - buffer.append(message); - } - if (payload.length() > 0) { - buffer.append("\nPayload: "); - buffer.append(payload); - } - buffer.append("\n--------------------------------------"); - return buffer.toString(); - } -} \ No newline at end of file diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java deleted file mode 100644 index c6d2d662ff6..00000000000 --- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java +++ /dev/null @@ -1,275 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.interceptor; - -import java.io.FilterWriter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.cxf.common.injection.NoJSR250Annotations; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.io.CacheAndWriteOutputStream; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.io.CachedOutputStreamCallback; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.Phase; - -/** - * @deprecated use the logging module rt/features/logging instead - */ -@NoJSR250Annotations -@Deprecated -public class LoggingOutInterceptor extends AbstractLoggingInterceptor { - private static final Logger LOG = LogUtils.getLogger(LoggingOutInterceptor.class); - private static final String LOG_SETUP = LoggingOutInterceptor.class.getName() + ".log-setup"; - - public LoggingOutInterceptor(String phase) { - super(phase); - addBefore(StaxOutInterceptor.class.getName()); - } - public LoggingOutInterceptor() { - this(Phase.PRE_STREAM); - } - public LoggingOutInterceptor(int lim) { - this(); - limit = lim; - } - - public LoggingOutInterceptor(PrintWriter w) { - this(); - this.writer = w; - } - - - public void handleMessage(Message message) { - final OutputStream os = message.getContent(OutputStream.class); - final Writer iowriter = message.getContent(Writer.class); - if (os == null && iowriter == null) { - return; - } - Logger logger = getMessageLogger(message); - if (logger != null && (logger.isLoggable(Level.INFO) || writer != null)) { - // Write the output while caching it for the log message - boolean hasLogged = message.containsKey(LOG_SETUP); - if (!hasLogged) { - message.put(LOG_SETUP, Boolean.TRUE); - if (os != null) { - final CacheAndWriteOutputStream newOut = new CacheAndWriteOutputStream(os); - if (threshold > 0) { - newOut.setThreshold(threshold); - } - if (limit > 0) { - newOut.setCacheLimit(limit); - } - message.setContent(OutputStream.class, newOut); - newOut.registerCallback(new LoggingCallback(logger, message, os)); - } else { - message.setContent(Writer.class, new LogWriter(logger, message, iowriter)); - } - } - } - } - - private LoggingMessage setupBuffer(Message message) { - String id = (String)message.getExchange().get(LoggingMessage.ID_KEY); - if (id == null) { - id = LoggingMessage.nextId(); - message.getExchange().put(LoggingMessage.ID_KEY, id); - } - final LoggingMessage buffer - = new LoggingMessage("Outbound Message\n---------------------------", - id); - - Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE); - if (responseCode != null) { - buffer.getResponseCode().append(responseCode); - } - - String encoding = (String)message.get(Message.ENCODING); - if (encoding != null) { - buffer.getEncoding().append(encoding); - } - String httpMethod = (String)message.get(Message.HTTP_REQUEST_METHOD); - if (httpMethod != null) { - buffer.getHttpMethod().append(httpMethod); - } - String address = (String)message.get(Message.ENDPOINT_ADDRESS); - if (address != null) { - buffer.getAddress().append(address); - String uri = (String)message.get(Message.REQUEST_URI); - if (uri != null && !address.startsWith(uri)) { - if (!address.endsWith("/") && !uri.startsWith("/")) { - buffer.getAddress().append('/'); - } - buffer.getAddress().append(uri); - } - } - String ct = (String)message.get(Message.CONTENT_TYPE); - if (ct != null) { - buffer.getContentType().append(ct); - } - Object headers = message.get(Message.PROTOCOL_HEADERS); - if (headers != null) { - buffer.getHeader().append(headers); - } - return buffer; - } - - private class LogWriter extends FilterWriter { - StringWriter out2; - int count; - Logger logger; - Message message; - final int lim; - - LogWriter(Logger logger, Message message, Writer writer) { - super(writer); - this.logger = logger; - this.message = message; - if (!(writer instanceof StringWriter)) { - out2 = new StringWriter(); - } - lim = limit == -1 ? Integer.MAX_VALUE : limit; - } - public void write(int c) throws IOException { - super.write(c); - if (out2 != null && count < lim) { - out2.write(c); - } - count++; - } - public void write(char[] cbuf, int off, int len) throws IOException { - super.write(cbuf, off, len); - if (out2 != null && count < lim) { - out2.write(cbuf, off, len); - } - count += len; - } - public void write(String str, int off, int len) throws IOException { - super.write(str, off, len); - if (out2 != null && count < lim) { - out2.write(str, off, len); - } - count += len; - } - public void close() throws IOException { - LoggingMessage buffer = setupBuffer(message); - if (count >= lim) { - buffer.getMessage().append("(message truncated to ").append(lim).append(" bytes)\n"); - } - StringWriter w2 = out2; - if (w2 == null) { - w2 = (StringWriter)out; - } - String ct = (String)message.get(Message.CONTENT_TYPE); - try { - writePayload(buffer.getPayload(), w2, ct); - } catch (Exception ex) { - //ignore - } - log(logger, formatLoggingMessage(buffer)); - message.setContent(Writer.class, out); - super.close(); - } - } - - protected String formatLoggingMessage(LoggingMessage buffer) { - return buffer.toString(); - } - - class LoggingCallback implements CachedOutputStreamCallback { - - private final Message message; - private final OutputStream origStream; - private final Logger logger; - private final int lim; - - LoggingCallback(final Logger logger, final Message msg, final OutputStream os) { - this.logger = logger; - this.message = msg; - this.origStream = os; - this.lim = limit == -1 ? Integer.MAX_VALUE : limit; - } - - public void onFlush(CachedOutputStream cos) { - - } - - public void onClose(CachedOutputStream cos) { - LoggingMessage buffer = setupBuffer(message); - - String ct = (String)message.get(Message.CONTENT_TYPE); - if (!isShowBinaryContent() && isBinaryContent(ct)) { - buffer.getMessage().append(BINARY_CONTENT_MESSAGE).append('\n'); - log(logger, formatLoggingMessage(buffer)); - return; - } - if (!isShowMultipartContent() && isMultipartContent(ct)) { - buffer.getMessage().append(MULTIPART_CONTENT_MESSAGE).append('\n'); - log(logger, formatLoggingMessage(buffer)); - return; - } - - boolean truncated = false; - if (cos.getTempFile() == null) { - //buffer.append("Outbound Message:\n"); - if (cos.size() >= lim) { - buffer.getMessage().append("(message truncated to ").append(lim).append(" bytes)\n"); - truncated = true; - } - } else { - buffer.getMessage().append("Outbound Message (saved to tmp file):\n"); - buffer.getMessage().append("Filename: ").append(cos.getTempFile().getAbsolutePath()).append('\n'); - if (cos.size() >= lim) { - buffer.getMessage().append("(message truncated to ").append(lim).append(" bytes)\n"); - truncated = true; - } - } - try { - String encoding = (String)message.get(Message.ENCODING); - writePayload(buffer.getPayload(), cos, encoding, ct, truncated); - } catch (Exception ex) { - //ignore - } - - log(logger, formatLoggingMessage(buffer)); - try { - //empty out the cache - cos.lockOutputStream(); - cos.resetOut(null, false); - } catch (Exception ex) { - //ignore - } - message.setContent(OutputStream.class, origStream); - } - } - - @Override - protected Logger getLogger() { - return LOG; - - } - -} diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java index 38339a2d1d6..2345829fb6e 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java @@ -65,7 +65,6 @@ public TransformOutInterceptor() { public TransformOutInterceptor(String phase) { super(phase); addBefore(StaxOutInterceptor.class.getName()); - addAfter("org.apache.cxf.interceptor.LoggingOutInterceptor"); addAfter("org.apache.cxf.ext.logging.LoggingOutInterceptor"); } diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java index c010b02ce87..e321cc1a7eb 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java +++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java @@ -39,7 +39,6 @@ public class FactoryBeanListenerManager { public FactoryBeanListenerManager() { listeners.add(new AnnotationsFactoryBeanListener()); - listeners.add(new OldLoggingFactoryBeanListener()); } public FactoryBeanListenerManager(Bus b) { this(); diff --git a/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java deleted file mode 100644 index 11e9c60aab5..00000000000 --- a/core/src/main/java/org/apache/cxf/service/factory/OldLoggingFactoryBeanListener.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.service.factory; - - -import java.util.logging.Logger; - -import org.apache.cxf.Bus; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.endpoint.Server; - -/** - * - */ -public class OldLoggingFactoryBeanListener implements FactoryBeanListener { - static final Logger LOG = LogUtils.getL7dLogger(OldLoggingFactoryBeanListener.class); - - /** {@inheritDoc}*/ - @SuppressWarnings("deprecation") - public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args) { - switch (ev) { - case ENDPOINT_SELECTED: { - Class cls = (Class)args[2]; - Endpoint ep = (Endpoint)args[1]; - Bus bus = factory.getBus(); - // To avoid the NPE - if (cls == null) { - return; - } - addLoggingSupport(ep, bus, cls.getAnnotation(org.apache.cxf.annotations.Logging.class)); - break; - } - case SERVER_CREATED: { - Class cls = (Class)args[2]; - if (cls == null) { - return; - } - Server server = (Server)args[0]; - Bus bus = factory.getBus(); - addLoggingSupport(server.getEndpoint(), bus, cls.getAnnotation(org.apache.cxf.annotations.Logging.class)); - break; - } - default: - //do nothing - } - } - - - @SuppressWarnings("deprecation") - private void addLoggingSupport(Endpoint endpoint, Bus bus, org.apache.cxf.annotations.Logging annotation) { - if (annotation != null) { - org.apache.cxf.feature.LoggingFeature lf = new org.apache.cxf.feature.LoggingFeature(annotation); - LOG.warning("Deprecated logging interceptors being used, switch to cxf-rt-ext-logging based logging."); - lf.initialize(endpoint, bus); - } - } - - -} diff --git a/core/src/main/resources/schemas/core.xsd b/core/src/main/resources/schemas/core.xsd index b127fd89185..e296e483ccc 100644 --- a/core/src/main/resources/schemas/core.xsd +++ b/core/src/main/resources/schemas/core.xsd @@ -38,21 +38,6 @@ - - - - The logging feature enables you to log the content of inbound and outbound messages and faults. - The content is logged by all log handlers configured in your java.util.logging configuration file, - provided the log level for classes org.apache.cxf.interceptor.LoggingInInterceptor and - org.apache.cxf.interceptor.LoggingOutInterceptor is at least INFO. - - - - - - - - diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java index 99a1a38bbbb..fa0db7d43da 100644 --- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java +++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java @@ -20,7 +20,6 @@ package org.apache.cxf.bus.spring; import java.util.Collection; -import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import jakarta.annotation.PostConstruct; @@ -29,8 +28,6 @@ import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.feature.AbstractFeature; import org.apache.cxf.feature.Feature; -import org.apache.cxf.interceptor.Interceptor; -import org.apache.cxf.message.Message; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.junit.Test; @@ -44,15 +41,10 @@ public class BusDefinitionParserTest { @Test - @SuppressWarnings("deprecation") public void testFeatures() { String cfgFile = "org/apache/cxf/bus/spring/bus.xml"; Bus bus = new SpringBusFactory().createBus(cfgFile, true); - List> in = bus.getInInterceptors(); - assertTrue("could not find logging interceptor.", - in.stream().anyMatch(i -> i.getClass() == org.apache.cxf.interceptor.LoggingInInterceptor.class)); - Collection features = bus.getFeatures(); TestFeature tf = null; for (Feature f : features) { @@ -115,17 +107,6 @@ public void postShutdown() { assertTrue("postShutdown not called", b.get()); } - @Test - @SuppressWarnings("deprecation") - public void testLazyInit() { - String cfgFile = "org/apache/cxf/bus/spring/lazyInitBus.xml"; - Bus bus = new SpringBusFactory().createBus(cfgFile, true); - - List> in = bus.getInInterceptors(); - assertTrue("could not find logging interceptor.", - in.stream().anyMatch(i -> i.getClass() == org.apache.cxf.interceptor.LoggingInInterceptor.class)); - } - static class TestBean { boolean initialised; diff --git a/core/src/test/java/org/apache/cxf/bus/spring/bus.xml b/core/src/test/java/org/apache/cxf/bus/spring/bus.xml index 376b15ef55f..01510fac1c8 100644 --- a/core/src/test/java/org/apache/cxf/bus/spring/bus.xml +++ b/core/src/test/java/org/apache/cxf/bus/spring/bus.xml @@ -23,7 +23,6 @@ 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"> - diff --git a/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml b/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml index bdd6166718c..5e845a1c593 100644 --- a/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml +++ b/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml @@ -23,12 +23,12 @@ 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"> - + - + \ No newline at end of file diff --git a/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml b/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml index bdd6166718c..5e845a1c593 100644 --- a/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml +++ b/core/src/test/java/org/apache/cxf/bus/spring/customerBus2.xml @@ -23,12 +23,12 @@ 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"> - + - + \ No newline at end of file diff --git a/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml b/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml deleted file mode 100644 index 90955f04f52..00000000000 --- a/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java deleted file mode 100644 index 47d2e35d281..00000000000 --- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.interceptor; - -import java.io.InputStream; -import java.io.StringWriter; -import java.io.Writer; - -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.message.ExchangeImpl; -import org.apache.cxf.message.Message; -import org.apache.cxf.message.MessageImpl; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -@SuppressWarnings("deprecation") -public class LoggingInInterceptorTest { - static String encoding = "UTF-8"; - static String contentType = "text/xml"; - - static String bufferContent = "" - + ""; - static int bufferLength = bufferContent.getBytes().length; - - private Message message; - private InputStream inputStream; - private LoggingMessage loggingMessage; - private LoggingInInterceptorAncestorTester classUnderTest; - - @Before - public void setUp() throws Exception { - loggingMessage = new LoggingMessage("", ""); - - StringWriter sw = new StringWriter(); - sw.append(""); - message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - message.setContent(Writer.class, sw); - - inputStream = mock(InputStream.class); - when(inputStream.read(any(byte[].class), anyInt(), anyInt())) - .then(invocation -> { - System.arraycopy(bufferContent.getBytes(), 0, - invocation.getArgument(0), 0, - bufferLength); - return bufferLength; - }) - .thenReturn(-1); - } - - @After - public void tearDown() throws Exception { - verify(inputStream, atLeastOnce()).read(any(byte[].class), anyInt(), anyInt()); - } - - @Test - public void testLogInputStreamInLimit() throws Exception { - //arrange - classUnderTest = new LoggingInInterceptorAncestorTester(4098); - //act - classUnderTest.testLogInputStream(message, inputStream, loggingMessage, encoding, contentType); - //assert - assertFalse("The truncated status should be set to false", - classUnderTest.isTruncated()); - } - - @Test - public void testLogInputStreamOffLimit() throws Exception { - //arrange - classUnderTest = new LoggingInInterceptorAncestorTester(16); - //act - classUnderTest.testLogInputStream(message, inputStream, loggingMessage, encoding, contentType); - //assert - assertTrue("The truncated status should be set to true", - classUnderTest.isTruncated()); - } - - class LoggingInInterceptorAncestorTester extends LoggingInInterceptor { - private boolean truncated; - - LoggingInInterceptorAncestorTester(int limit) { - super(limit); - } - - public boolean isTruncated() { - return truncated; - } - - public void testLogInputStream(Message logMessage, - InputStream is, - LoggingMessage buffer, - String contentEncoding, - String logContentType) { - this.logInputStream(logMessage, is, buffer, contentEncoding, logContentType); - } - - @Override - protected void writePayload(StringBuilder builder, - CachedOutputStream cos, - String contentEncoding, - String logContentType, - boolean truncatedStatus) { - this.truncated = truncatedStatus; - } - } -} diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java deleted file mode 100644 index cceae2a9137..00000000000 --- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java +++ /dev/null @@ -1,227 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.interceptor; - -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.util.HashMap; -import java.util.logging.Logger; - -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.message.ExchangeImpl; -import org.apache.cxf.message.Message; -import org.apache.cxf.message.MessageImpl; -import org.apache.cxf.service.model.BindingInfo; -import org.apache.cxf.service.model.EndpointInfo; - -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@SuppressWarnings("deprecation") -public class LoggingOutInterceptorTest { - @Test - public void testFormatting() throws Exception { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(baos); - - LoggingOutInterceptor p = new LoggingOutInterceptor(pw); - //p.setPrettyLogging(true); - CachedOutputStream cos = new CachedOutputStream(); - String s = " " - + ""; - cos.write(s.getBytes()); - Message message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - Logger logger = LogUtils.getL7dLogger(this.getClass()); - LoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(logger, message, cos); - l.onClose(cos); - String str = baos.toString(); - //format has changed - assertFalse(str.matches(s)); - assertTrue(str.contains("")); - } - - @Test - public void testPrettyLoggingWithoutEncoding() throws Exception { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(baos); - - LoggingOutInterceptor p = new LoggingOutInterceptor(pw); - p.setPrettyLogging(true); - CachedOutputStream cos = new CachedOutputStream(); - String s = " " - + ""; - cos.write(s.getBytes()); - Message message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - Logger logger = LogUtils.getL7dLogger(this.getClass()); - LoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(logger, message, cos); - l.onClose(cos); - String str = baos.toString(); - //format has changed - assertFalse(str.matches(s)); - assertTrue(str.contains("")); - } - - @Test - public void testPrettyLoggingWithEncoding() throws Exception { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(baos); - - LoggingOutInterceptor p = new LoggingOutInterceptor(pw); - p.setPrettyLogging(true); - CachedOutputStream cos = new CachedOutputStream(); - String s = " " - + ""; - cos.write(s.getBytes()); - Message message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - message.put(Message.ENCODING, "UTF-8"); - Logger logger = LogUtils.getL7dLogger(this.getClass()); - LoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(logger, message, cos); - l.onClose(cos); - String str = baos.toString(); - //format has changed - assertFalse(str.matches(s)); - assertTrue(str.contains("")); - - } - - @Test - public void testFormattingOverride() throws Exception { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - // create a custom logging interceptor that overrides how formatting is done - LoggingOutInterceptor p = new CustomFormatLoggingOutInterceptor(new PrintWriter(baos)); - CachedOutputStream cos = new CachedOutputStream(); - String s = " " - + ""; - cos.write(s.getBytes()); - - Message message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - Logger logger = LogUtils.getL7dLogger(this.getClass()); - LoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(logger, message, cos); - l.onClose(cos); - - String str = baos.toString(); - assertTrue(str.contains("")); - - } - - @Test - public void testFormattingOverrideLogWriter() throws Exception { - // create a custom logging interceptor that overrides how formatting is done - LoggingOutInterceptor p = new CustomFormatLoggingOutInterceptor(); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - p.setPrintWriter(new PrintWriter(baos)); - - StringWriter sw = new StringWriter(); - sw.append(""); - - Endpoint endpoint = mock(Endpoint.class); - EndpointInfo endpointInfo = mock(EndpointInfo.class); - when(endpoint.getEndpointInfo()).thenReturn(endpointInfo); - - Message message = new MessageImpl(); - message.setExchange(new ExchangeImpl()); - message.put(Message.CONTENT_TYPE, "application/xml"); - message.setContent(Writer.class, sw); - - p.handleMessage(message); - - Writer w = message.getContent(Writer.class); - w.close(); - - String str = baos.toString(); - assertTrue(str.contains("")); - } - - @Test - public void testCachedOutputStreamThreshold() throws Exception { - byte[] mex = "".getBytes(); - - LoggingOutInterceptor p = new LoggingOutInterceptor(); - p.setInMemThreshold(mex.length); - - CachedOutputStream cos = handleAndGetCachedOutputStream(p); - cos.write(mex); - assertNull(cos.getTempFile()); - cos.write("a".getBytes()); - assertNotNull(cos.getTempFile()); - } - - private CachedOutputStream handleAndGetCachedOutputStream(LoggingOutInterceptor interceptor) { - interceptor.setPrintWriter(new PrintWriter(new ByteArrayOutputStream())); - - Endpoint endpoint = mock(Endpoint.class); - EndpointInfo endpointInfo = mock(EndpointInfo.class); - when(endpoint.getEndpointInfo()).thenReturn(endpointInfo); - BindingInfo bindingInfo = mock(BindingInfo.class); - when(endpointInfo.getBinding()).thenReturn(bindingInfo); - when(endpointInfo.getProperties()).thenReturn(new HashMap()); - when(bindingInfo.getProperties()).thenReturn(new HashMap()); - - Message message = new MessageImpl(); - ExchangeImpl exchange = new ExchangeImpl(); - message.setExchange(exchange); - exchange.put(Endpoint.class, endpoint); - - message.put(Message.CONTENT_TYPE, "application/xml"); - message.setContent(OutputStream.class, new ByteArrayOutputStream()); - interceptor.handleMessage(message); - OutputStream os = message.getContent(OutputStream.class); - assertTrue(os instanceof CachedOutputStream); - return (CachedOutputStream)os; - } - - private class CustomFormatLoggingOutInterceptor extends LoggingOutInterceptor { - CustomFormatLoggingOutInterceptor() { - super(); - } - - CustomFormatLoggingOutInterceptor(PrintWriter w) { - super(w); - } - - @Override - protected String formatLoggingMessage(LoggingMessage loggingMessage) { - loggingMessage.getPayload().append(""); - return super.formatLoggingMessage(loggingMessage); - } - - } -} \ No newline at end of file diff --git a/distribution/src/main/release/samples/in_jvm_transport/logging.properties b/distribution/src/main/release/samples/in_jvm_transport/logging.properties index b0fd67ec863..d7e1d6874b2 100644 --- a/distribution/src/main/release/samples/in_jvm_transport/logging.properties +++ b/distribution/src/main/release/samples/in_jvm_transport/logging.properties @@ -73,5 +73,5 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter # Set log levels so that we can ob server the exchange of RM protocol messgaes # and the retransmission of application messages org.apache.cxf.configuration.spring.level = SEVERE -org.apache.cxf.interceptor.LoggingInInterceptor.level=INFO -org.apache.cxf.interceptor.LoggingOutInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingInInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingOutInterceptor.level=INFO diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json index 92fb9ea1325..fb138c23861 100644 --- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json +++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json @@ -166,9 +166,6 @@ { "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener" }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener" -}, { "name":"org.apache.cxf.jaxrs.JAXRSBindingFactory", "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json index 28f76241559..f5ce690ba4b 100644 --- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json +++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json @@ -397,13 +397,6 @@ "queryAllPublicMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener", - "allDeclaredFields":true, - "queryAllDeclaredMethods":true, - "queryAllPublicMethods":true, - "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] -}, { "name":"org.apache.cxf.jaxrs.JAXRSBindingFactory", "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json index cd74fe591ab..84d837dcfdd 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json +++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json @@ -343,13 +343,6 @@ "queryAllPublicMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener", - "allDeclaredFields":true, - "queryAllDeclaredMethods":true, - "queryAllPublicMethods":true, - "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] -}, { "name":"org.apache.cxf.jaxb.FactoryClassProxyService" }, diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json index 9acf6a1de1c..120a15a8278 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json +++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json @@ -495,13 +495,6 @@ "queryAllPublicMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener", - "allDeclaredFields":true, - "queryAllDeclaredMethods":true, - "queryAllPublicMethods":true, - "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] -}, { "name":"org.apache.cxf.jaxb.FactoryClassProxyService" }, diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json index 22e7e4d30d6..1b2ead852d8 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json @@ -316,13 +316,6 @@ "queryAllPublicMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener", - "allDeclaredFields":true, - "queryAllDeclaredMethods":true, - "queryAllPublicMethods":true, - "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] -}, { "name":"org.apache.cxf.jaxb.FactoryClassProxyService" }, diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json index fdbe8f67a94..50e0630d879 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json @@ -495,13 +495,6 @@ "queryAllPublicMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener", - "allDeclaredFields":true, - "queryAllDeclaredMethods":true, - "queryAllPublicMethods":true, - "methods":[{"name":"","parameterTypes":["org.apache.cxf.Bus"] }] -}, { "name":"org.apache.cxf.jaxb.FactoryClassProxyService" }, diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml index 742987fbd5a..89a14815c49 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml index 0fb5d8e9d25..0d9ccf9709b 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml @@ -26,7 +26,7 @@ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml index 9a5b3a66104..950e52ce0fd 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml @@ -27,7 +27,7 @@ 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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml index 7be4ed84ae4..a57bcb4bf8e 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml @@ -27,7 +27,7 @@ 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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml index 4bdd366306e..153ceb87c0e 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml index f298f4167d5..f0aa7a5cac5 100644 --- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml +++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml index 473f1dd69b8..ec85f790aa3 100644 --- a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml +++ b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/WEB-INF/beans.xml @@ -10,12 +10,12 @@ - + - + \ No newline at end of file diff --git a/distribution/src/main/release/samples/ws_rm/logging.properties b/distribution/src/main/release/samples/ws_rm/logging.properties index 3babbd9c91e..23e5cc935bb 100644 --- a/distribution/src/main/release/samples/ws_rm/logging.properties +++ b/distribution/src/main/release/samples/ws_rm/logging.properties @@ -75,6 +75,6 @@ java.util.logging.ConsoleHandler.formatter = demos.ws_rm.common.ConciseFormatter # Set log levels so that we can ob server the exchange of RM protocol messgaes # and the retransmission of application messages -org.apache.cxf.interceptor.LoggingInInterceptor.level=INFO -org.apache.cxf.interceptor.LoggingOutInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingInInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingOutInterceptor.level=INFO org.apache.cxf.ws.rm.soap.RetransmissionQueueImpl.level=INFO diff --git a/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml b/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml index e8dc9faf129..2013ff65274 100644 --- a/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml +++ b/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml b/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml index 48eadb9c616..ec5b90d5ce7 100644 --- a/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml +++ b/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties b/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties index ae48361ba82..ae47440a9e3 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties +++ b/distribution/src/main/release/samples/ws_security/sign_enc/logging.properties @@ -74,7 +74,7 @@ java.util.logging.ConsoleHandler.formatter = demos.wssec.common.ConciseFormatter # Set log levels so that we can observe the WSS4JIntercetpor -org.apache.cxf.interceptor.LoggingInInterceptor.level=INFO -org.apache.cxf.interceptor.LoggingOutInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingInInterceptor.level=INFO +org.apache.cxf.ext.logging.LoggingOutInterceptor.level=INFO org.apache.cxf.ws.rm.security.wss4j.WSS4JInInterceptor.level=INFO org.apache.cxf.ws.rm.security.wss4j.WSS4JOutInterceptor.level=INFO \ No newline at end of file diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml index 83f458ad376..83ab2aaa43e 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/wssec.xml @@ -29,7 +29,7 @@ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml index 83f458ad376..83ab2aaa43e 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/wssec.xml @@ -29,7 +29,7 @@ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml index 593b1950308..74d3ee4421c 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml @@ -29,7 +29,7 @@ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml index a953ea5dc3f..ece1341351b 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml @@ -29,7 +29,7 @@ xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml index d022ff98217..aaf44ca32d9 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml @@ -30,7 +30,7 @@ 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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml index eee2f3f15ec..fdbf6501156 100644 --- a/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml +++ b/rt/javascript/javascript-tests/src/test/resources/MtoMBeans.xml @@ -30,10 +30,10 @@ - + - + \ No newline at end of file diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml index 7f33450b841..2f706d9a073 100644 --- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml +++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml @@ -33,10 +33,10 @@ - + - + diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java index 3433fa91a42..812bcd87d28 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java @@ -416,15 +416,17 @@ private boolean isWSAddressingReplyToSpecified(Exchange ex) { inMessage.put(Message.FIXED_PARAMETER_ORDER, isFixedParameterOrder()); inMessage.put(Message.ASYNC_POST_RESPONSE_DISPATCH, Boolean.TRUE); - SecurityContext httpSecurityContext = new SecurityContext() { + final HttpServletRequest reqFromInMessage = (HttpServletRequest)exchange.getInMessage().get(HTTP_REQUEST); + final SecurityContext httpSecurityContext = new SecurityContext() { + private final Principal principal = reqFromInMessage.getUserPrincipal(); + public Principal getUserPrincipal() { //ensure we use req from the one saved in inMessage //as this could be the cachedInput one in oneway and //ReplyTo is specified when ws-addressing is used //which means we need to switch thread context //and underlying transport might discard any data on the original stream - HttpServletRequest reqFromInMessage = (HttpServletRequest)exchange.getInMessage().get(HTTP_REQUEST); - return reqFromInMessage.getUserPrincipal(); + return principal; } public boolean isUserInRole(String role) { //ensure we use req from the one saved in inMessage @@ -432,7 +434,6 @@ public boolean isUserInRole(String role) { //ReplyTo is specified when ws-addressing is used //which means we need to switch thread context //and underlying transport might discard any data on the original stream - HttpServletRequest reqFromInMessage = (HttpServletRequest)exchange.getInMessage().get(HTTP_REQUEST); return reqFromInMessage.isUserInRole(role); } }; diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 798d96a1f12..8634ec645b9 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -82,6 +82,12 @@ ${project.version} test + + org.apache.cxf + cxf-rt-features-logging + ${project.version} + test + org.apache.neethi neethi diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml index 8a897508688..24e7b67d34e 100644 --- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml +++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy.xml @@ -27,7 +27,7 @@ - + diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml index f1bcdc32c3d..d76a74963eb 100644 --- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml +++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/ignorable-policy2.xml @@ -28,12 +28,12 @@ - + - + diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java index 9fb40134ef6..b70a0d4d18e 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java @@ -75,7 +75,6 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor { public RMCaptureOutInterceptor() { super(Phase.PRE_STREAM); addBefore(AttachmentOutInterceptor.class.getName()); - addBefore("org.apache.cxf.interceptor.LoggingOutInterceptor"); addBefore("org.apache.cxf.ext.logging.LoggingOutInterceptor"); } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java index 052b98f44c3..e3f5f5ae147 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java @@ -74,7 +74,6 @@ public WSS4JStaxOutInterceptor(WSSSecurityProperties securityProperties) { WSSec.init(); setPhase(Phase.PRE_STREAM); getBefore().add(StaxOutInterceptor.class.getName()); - getAfter().add("org.apache.cxf.interceptor.LoggingOutInterceptor"); getAfter().add("org.apache.cxf.ext.logging.LoggingOutInterceptor"); ending = createEndingInterceptor(); } @@ -84,7 +83,6 @@ public WSS4JStaxOutInterceptor(Map props) { WSSec.init(); setPhase(Phase.PRE_STREAM); getBefore().add(StaxOutInterceptor.class.getName()); - getAfter().add("org.apache.cxf.interceptor.LoggingOutInterceptor"); getAfter().add("org.apache.cxf.ext.logging.LoggingOutInterceptor"); ending = createEndingInterceptor(); } @@ -94,7 +92,6 @@ public WSS4JStaxOutInterceptor() { WSSec.init(); setPhase(Phase.PRE_STREAM); getBefore().add(StaxOutInterceptor.class.getName()); - getAfter().add("org.apache.cxf.interceptor.LoggingOutInterceptor"); getAfter().add("org.apache.cxf.ext.logging.LoggingOutInterceptor"); ending = createEndingInterceptor(); } 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 932952bc248..b6b70677996 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 @@ -27,7 +27,7 @@ - + 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 8a6c1d7458c..e73daacc78f 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 @@ -27,7 +27,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml index fcfb9f4052c..a00be26928b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-bad-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml index a4b068650b6..f5299745ad7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 8f9c84837d0..f6a2b796306 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 @@ -29,7 +29,7 @@ - + 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 2a873a3017c..d8b99a1273e 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 @@ -29,7 +29,7 @@ - + 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 36508b83e4b..7944bb7fc1f 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 @@ -27,7 +27,7 @@ - + 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 a75c32e9087..1d995aa28be 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 @@ -29,7 +29,7 @@ - + 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 cb1763f8ff9..3e6f0f9482f 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 @@ -29,7 +29,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml index e343f7f5d77..d9b6cbb38b3 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml index 5787dfc4209..8921b685ba8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 68987951321..33ead17a194 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 @@ -28,7 +28,7 @@ - + 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 0a3d534c2ec..91039187c6f 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 @@ -28,7 +28,7 @@ - + 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 052397da17b..f12c9691b2e 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 @@ -27,7 +27,7 @@ - + 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 0c510da350e..f326b6d9666 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 @@ -27,7 +27,7 @@ - + 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 1e55c54c30c..dab88190d6c 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 @@ -27,7 +27,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml index 86d34012143..0ec3db34299 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml @@ -27,7 +27,7 @@ - + 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 58f8dc34d76..7de1041c682 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 @@ -27,7 +27,7 @@ - + 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 8763431a872..31791f6f741 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 @@ -27,7 +27,7 @@ - + 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 77b4c870966..e4ea09d231c 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 @@ -27,7 +27,7 @@ - + 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 e0e7a2979bf..0ea6d02514c 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 @@ -27,7 +27,7 @@ - + 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 90a9e9027bf..5da3a1f9a0e 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 @@ -29,7 +29,7 @@ - + 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 db77e0e11fe..0353db0ec17 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 @@ -29,7 +29,7 @@ - + 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 ef904b6fb4a..d39ad684985 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 @@ -27,7 +27,7 @@ - + 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 249bce7f47e..b8957cdab6f 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 @@ -33,7 +33,7 @@ - + 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 b9680c61499..515b5fe3ce9 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 @@ -27,7 +27,7 @@ - + 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 db69775a2b5..c9e44fdec74 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 @@ -29,7 +29,7 @@ - + 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 36508b83e4b..7944bb7fc1f 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 @@ -27,7 +27,7 @@ - + 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 1d5418bc97a..d96dcf74aa3 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 @@ -33,7 +33,7 @@ - + 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 9a6961372b0..3a48a25ce51 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 @@ -33,7 +33,7 @@ - + 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 6269c5ab2d4..d3001e01216 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 @@ -27,7 +27,7 @@ - + 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 04aab42fd99..e8ecd9eb8bf 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 @@ -30,7 +30,7 @@ - + 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 b19141299a2..faf95a7257f 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 @@ -30,7 +30,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml index cc127a30a73..c35a7f27401 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 bddf41afd32..5255992a8d9 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 @@ -29,7 +29,7 @@ - + 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 63ce0d41d4e..5c85513dc1f 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 @@ -27,7 +27,7 @@ - + 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 b29def6e348..29e352acd29 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 @@ -27,7 +27,7 @@ - + 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 da10e4ef9d3..bf400e1add0 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 @@ -29,7 +29,7 @@ - + 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 f73f81bd1fa..50aeba1a7d0 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 @@ -28,7 +28,7 @@ - + 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 746c2d8c865..4ccc5e5adcf 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 @@ -27,7 +27,7 @@ - + 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 045dc1addaa..75f0b0f2db3 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 @@ -29,7 +29,7 @@ - + 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 7c8d8de4fc1..249b22c4f01 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 @@ -29,7 +29,7 @@ - + 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 36508b83e4b..7944bb7fc1f 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 @@ -27,7 +27,7 @@ - + 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 82010ca9139..d56904a5ae3 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 @@ -27,7 +27,7 @@ - + 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 5599633e470..093ce1ff721 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 @@ -28,7 +28,7 @@ - + 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 530b870912c..8f32a92796a 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 @@ -29,7 +29,7 @@ - + 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 756289118bb..4dac8e1f7f1 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 @@ -29,7 +29,7 @@ - + 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 ef23183043d..488b00e312e 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 @@ -29,7 +29,7 @@ - + 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 43064958871..0875401dbab 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 @@ -27,7 +27,7 @@ - + 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 68456c994d7..29e69ab5d6b 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 @@ -29,7 +29,7 @@ - + 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 e3336ca22b3..c983b2e72ff 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 @@ -29,7 +29,7 @@ - + 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 85b5b6084cf..05a56595f3f 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 @@ -27,7 +27,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml index c43033dd38f..d1df2014860 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 36df49f7834..d1a1d3abb32 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 @@ -27,7 +27,7 @@ - + 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 4eac62bf872..8e4d16e6f9b 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 @@ -27,7 +27,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml index 9fe450a9b30..83e7b18a4bf 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 da5f9c1affb..9ca6775195a 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 @@ -28,7 +28,7 @@ - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml index 7b82a35cf0d..ef7a2165f0c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml index 8de50fae5c4..44230ebc49c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 cefe17dcac4..11eaac9959b 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 @@ -28,7 +28,7 @@ - + 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 1f3438233b0..446c41cae4a 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 @@ -28,7 +28,7 @@ - + diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java index f914b91391f..d4906f62675 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java @@ -31,7 +31,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java index 0cd6e298885..8dcc61973ec 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java @@ -33,7 +33,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") /** * A PortType implementation that only allows a user call it twice. This is to test the caching logic * of the intermediary. diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java index 00ae350798b..0d82fff7490 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java @@ -41,7 +41,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class IntermediaryCachingPortTypeImpl extends AbstractClientServerTestBase implements DoubleItPortType { diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java index c37c8b05956..56d64a7b23a 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java @@ -40,7 +40,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class IntermediaryPortTypeImpl extends AbstractClientServerTestBase implements DoubleItPortType { private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/DoubleItPortTypeImpl.java index 6d48c472e93..93968d8923a 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/DoubleItPortTypeImpl.java @@ -25,7 +25,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { public int doubleIt(int numberToDouble) { diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java index 50fbf01d5c8..9435ec7ffd3 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java @@ -35,7 +35,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl extends AbstractBusClientServerTestBase implements DoubleItPortType { private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml index 4e778cec7df..f7570f0265c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml index e98d0c64a3d..b945e536dc4 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml index 31a66832ee7..6354045486f 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml index 280b646eded..d6e61629dbb 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 1135ca64132..af8adcce855 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 @@ -29,7 +29,7 @@ - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml index 9568c75c195..19445d41107 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml index 098939c4cf8..8301e0ee024 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml @@ -26,7 +26,7 @@ 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"> - + 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 89c0fd72b5e..9a22f2668a9 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 @@ -28,7 +28,7 @@ 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.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml index 08847f9c119..26405d07de6 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml index 48b633fc68b..dad3668425d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 24c08277674..9eb44cc59c0 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 @@ -28,7 +28,7 @@ - + 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 14a10529144..3c97677daa9 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 @@ -28,7 +28,7 @@ - + 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 b0b49e45a3d..3984e86e04f 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 @@ -28,7 +28,7 @@ - + - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml index 57806ceba51..37077736471 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml index 1d8a5a0f409..a2654348c01 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 e85618a0f36..2473c9efcd0 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 @@ -37,7 +37,7 @@ - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml index 0bf7aba35e7..d99be76527e 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 22fa12fac84..82d8a16eb82 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 @@ -28,7 +28,7 @@ - + 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 6e22e0147a8..5d6fe1a5598 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 @@ -28,7 +28,7 @@ - + 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 f92fb800840..4ec2f673fdb 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 @@ -28,7 +28,7 @@ - + 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 93165544eee..0a962a88bd5 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 @@ -28,7 +28,7 @@ - + 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 dc8696ade18..81bc142a57a 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 @@ -26,7 +26,7 @@ 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"> - + 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 2848ff75d53..e15a1ea756c 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 @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml index 66f975a5e31..1f0953637c4 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml index 8eb64f20c4a..39b14c61b73 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml index 7cc556e88df..921e4888944 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml index d2c67d08545..ca1e8f1acbc 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml index a46ee0b1498..124a379f3f7 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml index 9716d4e5014..663fb3a010f 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 95d65a00615..0e9efb92d0c 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 @@ -29,7 +29,7 @@ - + diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml index 30c89adcfad..16628b2f25a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509/cxf-client.xml @@ -26,7 +26,7 @@ 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"> - + 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 2a5d30b6503..3d2da922b74 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 @@ -29,7 +29,7 @@ - + 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 f6a7d7e38ee..2eba486d693 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/databinding/src/test/resources/extrajaxbclass.xml b/systests/databinding/src/test/resources/extrajaxbclass.xml index cf68d1f1614..5e24cb00fb6 100644 --- a/systests/databinding/src/test/resources/extrajaxbclass.xml +++ b/systests/databinding/src/test/resources/extrajaxbclass.xml @@ -59,10 +59,10 @@ under the License. - + - + diff --git a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml index fe5902030d2..4409c34ec46 100644 --- a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml @@ -70,7 +70,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml index 74877c058e7..89dc1da7d7b 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml @@ -23,11 +23,6 @@ - diff --git a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml index 2a678fdbcb9..890f01febaa 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml @@ -78,11 +78,11 @@ jaxrs.outInterceptors - org.apache.cxf.interceptor.LoggingOutInterceptor + org.apache.cxf.ext.logging.LoggingOutInterceptor jaxrs.inInterceptors - org.apache.cxf.interceptor.LoggingInInterceptor + org.apache.cxf.ext.logging.LoggingInInterceptor 1 diff --git a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml index 67ead8598d5..0df90f2c848 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml @@ -43,7 +43,7 @@ - + diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-client.xml b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-client.xml index c45945db6f4..cef79fa9d94 100644 --- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-client.xml +++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/failover/cxf-client.xml @@ -33,7 +33,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema - + 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 e67ec32b3ad..397faa49f4a 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 @@ -44,7 +44,7 @@ - + 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 eed3cfe1a9a..be28993a842 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 @@ -44,7 +44,7 @@ - + diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java index e7d39422597..7608dde2e35 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java @@ -32,7 +32,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource 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 aad24594d0b..37098a85258 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 @@ -29,7 +29,7 @@ - + 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 3e72c3af7b0..62248ccc2dd 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 @@ -32,7 +32,7 @@ - + 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 d7003a2620f..1783caeb061 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 @@ -31,7 +31,7 @@ - + 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 dbe01c4a63e..90d52f17362 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 @@ -27,7 +27,7 @@ - + - + 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 0401ab3b5d2..b6eeaa863ac 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 @@ -31,7 +31,7 @@ - + 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 12baaaf297d..0bab198a370 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 @@ -31,7 +31,7 @@ - + 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 54edc220d4d..ea02da1dbb9 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 @@ -29,7 +29,7 @@ - + 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 6060ef9f712..5d8cd55fc86 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 @@ -29,7 +29,7 @@ - + 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 5f49cc1c3bf..c870c7d3d47 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 @@ -28,7 +28,7 @@ - + \ No newline at end of file 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 28bffc07d1c..787a460989b 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 @@ -29,7 +29,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 47847aaab31..d233de8ab70 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 @@ -28,7 +28,7 @@ under the License. - + 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 74415b8426b..d276610847b 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 @@ -28,7 +28,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 4314bc6a227..29efa955c2d 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 @@ -28,7 +28,7 @@ under the License. - + 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 93d38a6e4ec..c59df9bea3c 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 @@ -28,7 +28,7 @@ under the License. - + 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 ebf21f62446..8592b9d3416 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 @@ -28,7 +28,7 @@ under the License. - + 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 41cb110f403..904786f935c 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 @@ -28,7 +28,7 @@ under the License. - + 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 1313eb84cea..35f7be2894c 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 @@ -28,7 +28,7 @@ under the License. - + 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 425b64e5268..26c02453f82 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 @@ -28,7 +28,7 @@ under the License. - + 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 764d135866a..42d6d9b3314 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 @@ -28,7 +28,7 @@ under the License. - + 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 40df2adee7d..6ad540a308c 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 @@ -28,7 +28,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 8a40439199d..308c3d1ce8b 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 @@ -28,7 +28,7 @@ under the License. - + 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 7247d94a4f1..888a0ae4f03 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 @@ -35,7 +35,7 @@ under the License. - + 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 da27918a5eb..02cab1515ce 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 @@ -35,7 +35,7 @@ under the License. - + 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 32c22215637..27c9a8f5277 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 @@ -35,7 +35,7 @@ under the License. - + 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 e33774770c5..b2e75472f91 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 @@ -37,7 +37,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 4ef6cce4c09..88a1593f41c 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 @@ -35,7 +35,7 @@ under the License. - + 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 c14c6fc2f3f..d8399a6d221 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 @@ -35,7 +35,7 @@ under the License. - + 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 c4da67741a8..6871cb47357 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 @@ -35,7 +35,7 @@ under the License. - + 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 968343ab982..26c668d23e3 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 @@ -35,7 +35,7 @@ under the License. - + 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 ddc68d5156e..f5fb8924db5 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 @@ -35,7 +35,7 @@ under the License. - + 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 4f452c83a81..cfe74f2272f 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 @@ -35,7 +35,7 @@ under the License. - + 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 04017bb7c42..69ee3ea05df 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 @@ -35,7 +35,7 @@ under the License. - + 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 f28677360d8..ecdf942d94f 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 @@ -35,7 +35,7 @@ under the License. - + 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 8f766582cea..a18604d1af9 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 @@ -35,7 +35,7 @@ under the License. - + diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-session.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-session.xml index 65dcfbe386c..8b383d81fc2 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-session.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jcache-session.xml @@ -35,7 +35,7 @@ under the License. - + 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 0e167bfa67a..ff207ad5a88 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 @@ -35,7 +35,7 @@ under the License. - + 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 7fe9fceaa3d..5394d566798 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 @@ -35,7 +35,7 @@ under the License. - + diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public-session.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public-session.xml index 0b6471a2247..7e638e740d2 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public-session.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-public-session.xml @@ -35,7 +35,7 @@ under the License. - + 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 48a38ab70b6..dea11d8a033 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 @@ -35,7 +35,7 @@ under the License. - + 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 788366d3bce..af867192464 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 @@ -35,7 +35,7 @@ under the License. - + 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 5473572612d..f595b77a96c 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 @@ -35,7 +35,7 @@ under the License. - + 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 db3f924ccb1..fa5cca49caa 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 @@ -35,7 +35,7 @@ under the License. - + 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 559bc387827..f3474e4e03a 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 @@ -35,7 +35,7 @@ under the License. - + 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 9360d939769..5c0dafed670 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 @@ -28,7 +28,7 @@ - + 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 1b203bc4329..8734b016e4f 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 @@ -35,7 +35,7 @@ under the License. - + 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 fe848d29181..3e4f00c059c 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 @@ -35,7 +35,7 @@ under the License. - + 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 de705d12d57..872eaafeecb 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 @@ -35,7 +35,7 @@ under the License. - + 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 fcaaef7d41f..675d3f3f598 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 @@ -35,7 +35,7 @@ under the License. - + 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 1f7b30804f1..b96ea68dad3 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 @@ -35,7 +35,7 @@ under the License. - + 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 72cb43c3579..6fefcb8fa5b 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 @@ -35,7 +35,7 @@ under the License. - + 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 3e8b49ac0b8..9174286496e 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 @@ -35,7 +35,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 acf409d10b1..8a7b8a2199d 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 @@ -28,7 +28,7 @@ - + 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 4c8f4a83f54..6f2017a161a 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 @@ -37,7 +37,7 @@ under the License. - + diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml index b90f73d9835..18a02bae892 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml @@ -30,7 +30,7 @@ "> - + 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 6a4f6db9db6..9b3b84783cc 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 @@ -37,7 +37,7 @@ under the License. - + 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 b3dc39e4cad..8f1f4561647 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 @@ -35,7 +35,7 @@ under the License. - + 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 098ca4b36dd..d24d876629f 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 @@ -35,7 +35,7 @@ under the License. - + 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 129bd5eb282..4e6ff4671d1 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 @@ -35,7 +35,7 @@ under the License. - + 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 a68f5bc8da9..68c72bd6f80 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 @@ -35,7 +35,7 @@ under the License. - + 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 9207da40ee0..20c8e3ff4aa 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 @@ -35,7 +35,7 @@ under the License. - + 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 03ae318e0e7..5dc29052e75 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 @@ -35,7 +35,7 @@ under the License. - + 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 bc4c6b47d82..86d1b34970c 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 @@ -35,7 +35,7 @@ under the License. - + 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 b1cbf316fb5..1771b3ce11b 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 @@ -35,7 +35,7 @@ under the License. - + 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 ca9fc88a5d8..30fce73ff84 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 @@ -35,7 +35,7 @@ under the License. - + 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 886e0b2af3c..1a14835973b 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 @@ -35,7 +35,7 @@ under the License. - + 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 6ad837dadb5..5f087a41693 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 @@ -35,7 +35,7 @@ under the License. - + 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 43a274b17c5..796309bb052 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 @@ -35,7 +35,7 @@ under the License. - + 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 1301ee9f16e..53b3042fbd1 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 @@ -35,7 +35,7 @@ under the License. - + 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 aed29baf8ae..538d4e35dbb 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 @@ -35,7 +35,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 a56ebd3ea15..5b878489595 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 @@ -29,7 +29,7 @@ under the License. - + 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 419ad4b80be..c310dee6249 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 @@ -28,7 +28,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 d9e9f04548f..210970ad2f1 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 @@ -29,7 +29,7 @@ under the License. - + 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 77fbff55009..baa12b0883a 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 @@ -28,7 +28,7 @@ - + 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 23be9197473..aca1ae467e3 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 @@ -29,7 +29,7 @@ under the License. - + 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 5645b020532..748826807c3 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 @@ -29,7 +29,7 @@ under the License. - + diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java index dca8dd690ec..59d5765d5fc 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java @@ -32,15 +32,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Logger; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingMessage; -import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; +import org.apache.cxf.ext.logging.event.LogEvent; +import org.apache.cxf.ext.logging.event.LogEventSender; import org.apache.cxf.jaxrs.client.ClientConfiguration; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; @@ -48,7 +48,6 @@ import org.apache.cxf.jaxrs.impl.MetadataMap; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.provider.MultipartProvider; -import org.apache.cxf.message.Message; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduit; @@ -255,17 +254,15 @@ private void assertNoDuplicateLogging() { private void configureLogging(final ClientConfiguration config) { final LoggingOutInterceptor out = new LoggingOutInterceptor(); - out.setShowMultipartContent(false); + out.setLogMultipart(false); - final LoggingInInterceptor in = new LoggingInInterceptor() { + final LoggingInInterceptor in = new LoggingInInterceptor(new LogEventSender() { @Override - protected void logging(Logger logger, Message message) { - super.logging(logger, message); - final String id = (String) message.get(LoggingMessage.ID_KEY); - ids.computeIfAbsent(id, key -> new AtomicInteger()).incrementAndGet(); + public void send(LogEvent event) { + ids.computeIfAbsent(event.getMessageId(), key -> new AtomicInteger()).incrementAndGet(); } - }; - in.setShowBinaryContent(false); + }); + in.setLogBinary(false); config.getInInterceptors().add(in); config.getOutInterceptors().add(out); diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxws/JAXWSAsyncClientTest.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxws/JAXWSAsyncClientTest.java index 32806c92acc..f221d0f45a9 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxws/JAXWSAsyncClientTest.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxws/JAXWSAsyncClientTest.java @@ -48,12 +48,12 @@ import jakarta.xml.ws.soap.SOAPBinding; import jakarta.xml.ws.soap.SOAPFaultException; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.AbstractGreeterImpl; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.types.GreetMeResponse; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-chain.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-chain.xml index 857eb1aba82..ca34aa66b15 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-chain.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-chain.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid.xml index 6de6bfbc82e..e14643e480a 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid2.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid2.xml index 1aca21e67f1..116ea11a4c5 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid2.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-invalid2.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml index 1b96177faaf..4cc5c6549d6 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml @@ -29,7 +29,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml index dc19c42849d..fe3678bbe1f 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth.xml index a99d49eb64b..2dbb2aa219a 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-no-auth.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-no-auth.xml index 05ac86838c8..9eb0dada408 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-no-auth.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-no-auth.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-disablecn.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-disablecn.xml index bc640e349ac..79c4a286c8d 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-disablecn.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-disablecn.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-usedefault.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-usedefault.xml index 97442d8e0a3..91bc25eb00e 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-usedefault.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client-usedefault.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client.xml index 2dc090f2dbc..8a804c60d7a 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server-deprecated.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server-deprecated.xml index 2dc2675c408..ae8d7f98456 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server-deprecated.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server-deprecated.xml @@ -29,7 +29,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server.xml index a495e9e9622..cc6df42e85c 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/hostname/hostname-server.xml @@ -29,7 +29,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-config.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-config.xml index 2bab3c9c096..d4a6ccca49b 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-config.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-config.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-empty-config.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-empty-config.xml index d03df98eda2..dc49e068700 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-empty-config.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-empty-config.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-manager-ref.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-manager-ref.xml index 47803c18749..474245dd328 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-manager-ref.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust-manager-ref.xml @@ -27,7 +27,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust.xml index 9e1885b3b19..12c80307817 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/client-trust.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/trust-server.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/trust-server.xml index 38ee8bdfe9e..e2c6ab895c5 100644 --- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/trust-server.xml +++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/trust/trust-server.xml @@ -29,7 +29,7 @@ - + diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java index b3f917a322f..bd700802776 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java @@ -49,12 +49,12 @@ import jakarta.xml.ws.soap.SOAPBinding; import jakarta.xml.ws.soap.SOAPFaultException; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.greeter_control.AbstractGreeterImpl; import org.apache.cxf.greeter_control.Greeter; import org.apache.cxf.greeter_control.types.GreetMeResponse; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java index cd7b3b115f0..b120eb397a4 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java @@ -34,15 +34,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Logger; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingMessage; -import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; +import org.apache.cxf.ext.logging.event.LogEvent; +import org.apache.cxf.ext.logging.event.LogEventSender; import org.apache.cxf.jaxrs.client.ClientConfiguration; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; @@ -50,7 +50,6 @@ import org.apache.cxf.jaxrs.impl.MetadataMap; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.provider.MultipartProvider; -import org.apache.cxf.message.Message; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduit; @@ -296,17 +295,15 @@ private void assertNoDuplicateLogging() { private void configureLogging(final ClientConfiguration config) { final LoggingOutInterceptor out = new LoggingOutInterceptor(); - out.setShowMultipartContent(false); + out.setLogMultipart(false); - final LoggingInInterceptor in = new LoggingInInterceptor() { + final LoggingInInterceptor in = new LoggingInInterceptor(new LogEventSender() { @Override - protected void logging(Logger logger, Message message) { - super.logging(logger, message); - final String id = (String) message.get(LoggingMessage.ID_KEY); - ids.computeIfAbsent(id, key -> new AtomicInteger()).incrementAndGet(); + public void send(LogEvent event) { + ids.computeIfAbsent(event.getMessageId(), key -> new AtomicInteger()).incrementAndGet(); } - }; - in.setShowBinaryContent(false); + }); + in.setLogBinary(false); config.getInInterceptors().add(in); config.getOutInterceptors().add(out); diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml index bc01f38d785..f78a316ca3b 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-noconfig.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-noconfig.xml index eeaf9501477..f2fd1d1f3b9 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-noconfig.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-noconfig.xml @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml index 5d8531a8156..1b8428dbccf 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv12.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv13.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv13.xml index e33bd29184a..a7fc673772d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv13.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-tlsv13.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml index 6f807be4799..eda8997a979 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-dhe-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-dhe-client.xml index dc0640fda29..f1ed0b9f941 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-dhe-client.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-dhe-client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml index 2cef9cb8af0..eb9a3406214 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml @@ -28,7 +28,7 @@ - + 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 d898e832892..51e2bd4cef9 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-chain.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-chain.xml index 857eb1aba82..ca34aa66b15 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-chain.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-chain.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid.xml index 6de6bfbc82e..e14643e480a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid2.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid2.xml index 1aca21e67f1..116ea11a4c5 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid2.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth-invalid2.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + 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 0cba9cbe3aa..d4a9d7e6a93 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth.xml index a99d49eb64b..2dbb2aa219a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-no-auth.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-no-auth.xml index 05ac86838c8..9eb0dada408 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-no-auth.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-no-auth.xml @@ -27,7 +27,7 @@ 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.org/policy http://cxf.apache.org/schemas/policy.xsd"> - + 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 7fa53efa1ae..260f0ed4f52 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 @@ -41,7 +41,7 @@ under the License. - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-disablecn.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-disablecn.xml index bc640e349ac..79c4a286c8d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-disablecn.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-disablecn.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-usedefault.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-usedefault.xml index 97442d8e0a3..91bc25eb00e 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-usedefault.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client-usedefault.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client.xml index 2dc090f2dbc..8a804c60d7a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/hostname/hostname-client.xml @@ -28,7 +28,7 @@ - + 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 e0eec826cc7..de9db900d3f 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 @@ -29,7 +29,7 @@ - + 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 67b59f4714c..7e7dcd16d67 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-config.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-config.xml index 2bab3c9c096..d4a6ccca49b 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-config.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-config.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-empty-config.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-empty-config.xml index d03df98eda2..dc49e068700 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-empty-config.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-empty-config.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-manager-ref.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-manager-ref.xml index 47803c18749..474245dd328 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-manager-ref.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-manager-ref.xml @@ -27,7 +27,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust.xml index 9e1885b3b19..12c80307817 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust.xml @@ -28,7 +28,7 @@ - + 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 dec364771f7..2c3e4bb2ecd 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml index cdb9604e02c..f1a5526b5f0 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml +++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf1226/beans.xml @@ -24,8 +24,8 @@ 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"> - - + + 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 0c2d105cf9c..023bb0aac42 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 @@ -24,8 +24,8 @@ 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"> - - + + 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 f41331e10f1..e1395d4edcf 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml index 2f0442aa5f9..1fcd81611a7 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/addr.xml @@ -23,8 +23,8 @@ 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"> - - + + diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml index a0c661229bf..0a7f9efb57d 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml @@ -21,8 +21,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - + + diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/DoubleItImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/DoubleItImpl.java index 097ea19f177..0bb5bbd732a 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/DoubleItImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/DoubleItImpl.java @@ -26,7 +26,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItImpl implements DoubleItPortType { public int doubleIt(int numberToDouble) throws DoubleItFault { diff --git a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml index 0dfd1d64de5..c35d0370a84 100644 --- a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml +++ b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml @@ -31,7 +31,7 @@ - + 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 bc31285fab2..d7b0f74a01e 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 @@ -35,7 +35,7 @@ under the License. - + 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 5d0557d533c..ee8a6c5023d 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 @@ -35,7 +35,7 @@ under the License. - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml index 162a04e6c51..3a1818957f0 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/gzip-enabled.xml @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml index 514038f02b8..228f99f8230 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml index 1ee90cfbae4..1ebf74b9da2 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml index 34532870a47..2b7dc790228 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml @@ -45,7 +45,7 @@ - + @@ -55,7 +55,6 @@ - @@ -63,7 +62,7 @@ - + @@ -73,7 +72,6 @@ - \ No newline at end of file diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml index 441b1074570..32a01afaa03 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors_provider.xml @@ -45,7 +45,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -69,7 +69,7 @@ - + \ No newline at end of file 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 81287958af3..04dca130a55 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 @@ -35,7 +35,7 @@ under the License. - + 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 bbbd7a565fe..58a5c58232e 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 @@ -35,7 +35,7 @@ - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml index f8728c59fd9..8ae5a19a66a 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + 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 d0806b69814..86629d742ce 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 @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml index 7bfe80403a5..2f1b28bea5f 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-server.xml @@ -27,7 +27,7 @@ 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/spring-beans.xsd"> - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml index bb3bb7df60d..8c33b1bf5e5 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/twoway-endpoint-specific.xml @@ -52,8 +52,8 @@ - - + + diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml index a7128d04e22..137d453bb46 100644 --- a/systests/ws-security-examples/pom.xml +++ b/systests/ws-security-examples/pom.xml @@ -159,6 +159,12 @@ cxf-services-sts-core ${project.version} + + org.apache.cxf + cxf-rt-features-logging + ${project.version} + test + org.apache.cxf cxf-testutils diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java index 5c2ed6266e9..8dc8776ae88 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java @@ -31,7 +31,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index fba26f87011..81ee31a0316 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -28,7 +28,7 @@ - + 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 b374360e2a9..0f753c0a5a1 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 @@ -30,7 +30,7 @@ - + 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 ce6ed8a5385..b70205c48f7 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml index 3b95b5b2b35..e278fd6fb51 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml @@ -28,7 +28,7 @@ - + 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 131a4cb2844..602d79f48ea 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 @@ -30,7 +30,7 @@ - + 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 511c6fc582c..16de664dc30 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 @@ -30,7 +30,7 @@ - + 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 5a5ebb76d5e..0c7cb6e796f 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 @@ -27,7 +27,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml index 0504d70aec0..fbf96acb5b7 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml @@ -28,7 +28,7 @@ - + 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 093a036a69a..5cd91ac40ea 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 @@ -30,7 +30,7 @@ - + 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 4d946a9f99e..767263ff52a 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml index 98715f0d91a..20005edb250 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml @@ -28,7 +28,7 @@ - + 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 8b959ab760e..261e754c515 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 @@ -30,7 +30,7 @@ - + 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 4627ee4e0ed..03f317eb288 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java index baaf08162c1..7ef833adfc9 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt2Impl.java @@ -26,7 +26,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType2") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleIt2Impl implements DoubleItPortType2 { public int doubleIt(int numberToDouble) throws DoubleItFault { diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java index 17e5b2eff13..0f26fa71a56 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java @@ -30,7 +30,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItSwaPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleIt3Impl implements DoubleItSwaPortType { @Override diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImplContinuation.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImplContinuation.java index 5dd5b2d64be..0c71362ed85 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImplContinuation.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImplContinuation.java @@ -32,7 +32,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItImplContinuation implements DoubleItPortType { diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItOneWayImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItOneWayImpl.java index 1e4a97a20a9..ca76f286abf 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItOneWayImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItOneWayImpl.java @@ -25,7 +25,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItOneWayPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItOneWayImpl implements DoubleItOneWayPortType { @Override diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java index c18fb5d36d7..98e94d27d1f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java @@ -32,7 +32,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImpl.java index 66472a391b6..f180ac0918f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImpl.java @@ -30,7 +30,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java index 2f348814fe1..7408e6e21bc 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java @@ -35,7 +35,7 @@ portName = "DoubleItSoap11NoPolicyBinding", name = "DoubleItSoap11NoPolicyBinding", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItPortTypeImplJavaFirst implements DoubleItPortType { @Resource WebServiceContext wsContext; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/DoubleIt4Impl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/DoubleIt4Impl.java index 37ef1ba6823..34fe53726fd 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/DoubleIt4Impl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/DoubleIt4Impl.java @@ -32,7 +32,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItMtomPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleIt4Impl implements DoubleItMtomPortType { @Override diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java index 1fed98f3d3c..d9bb5fda07a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java @@ -37,7 +37,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItBSTImpl implements DoubleItPortType { @Resource diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java index d7bc7c4498d..d9a50fab0fa 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java @@ -36,7 +36,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") public class DoubleItIntermediaryImpl extends AbstractBusClientServerTestBase implements DoubleItPortType { private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java index b0cc4ee309c..694dc5d065f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java @@ -29,7 +29,7 @@ @WebService(targetNamespace = "http://www.example.org/contract/DoubleIt", serviceName = "DoubleItService", endpointInterface = "org.example.contract.doubleit.DoubleItPortType") -@Features(features = "org.apache.cxf.feature.LoggingFeature") +@Features(features = "org.apache.cxf.ext.logging.LoggingFeature") @EndpointProperties({ @EndpointProperty(key = SecurityConstants.ENCRYPT_USERNAME, value = "alice"), diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml index 2170832d176..6a67b4d325b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml @@ -28,7 +28,7 @@ - + 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 6c2aa57af5a..ca91f95bea1 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 @@ -31,7 +31,7 @@ - + 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 8e184dcd75e..4ff799bafa2 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 @@ -31,7 +31,7 @@ - + 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 f10bb745be7..47f9dd5a7a2 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml index 4875e6ab9db..b16921b1858 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml @@ -28,7 +28,7 @@ - + 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 1594ed50661..426cd3f7160 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 @@ -30,7 +30,7 @@ - + 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 d69b6c78af1..2fd73161957 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/client.xml index a6066fde0ed..250c3d76eb9 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/client.xml @@ -28,7 +28,7 @@ - + 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 9b3248525c5..33653c1dcd0 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 @@ -30,7 +30,7 @@ - + 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 ee065afd7af..2e89a7a4fd8 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml index 84ec7c297a5..c6815f36a86 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml @@ -28,7 +28,7 @@ - + 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 5371233a125..d8a875e7e30 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 @@ -30,7 +30,7 @@ - + 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 27f9bab6e0f..c9230b965c6 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml index ea6c8ca3bcb..11f7cc42fdf 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/client.xml @@ -28,7 +28,7 @@ - + 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 694d52c7d07..599b354d511 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml index 5ec6972df2b..75b3574dff4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client.xml @@ -28,7 +28,7 @@ - + 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 8177e738f32..7ae0fd66757 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 @@ -30,7 +30,7 @@ - + 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 776bd5f1378..716683c20b6 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml index 49f4c53c51a..7f4559aff6e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml index 89ea5e9ba2f..7aacc96ac14 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml @@ -28,7 +28,7 @@ - + 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 2bbaf0410bc..4b1d0cc6e6b 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 @@ -30,7 +30,7 @@ - + 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 c3ae0eedbaf..8f0ecd70656 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml index 204aaca759e..c98436a1d7e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml index 7943bebc409..a3bd9475c53 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-client.xml @@ -28,7 +28,7 @@ - + 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 b2f73db5cf0..88459616f04 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 @@ -30,7 +30,7 @@ - + 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 1781b313c61..ea4670fd2f2 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 @@ -30,7 +30,7 @@ - + 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 3a24fec2c00..75de417a301 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 @@ -30,7 +30,7 @@ - + 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 76bd2c30475..90f25d46228 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml index f5e176f993e..67312e015af 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client.xml @@ -28,7 +28,7 @@ - + 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 a27ddb2405f..32184f1c06c 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml index 6898e946728..996c9433be1 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml @@ -28,7 +28,7 @@ - + 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 2f8922e2c62..e0a6be33624 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 @@ -30,7 +30,7 @@ - + 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 c2a7a515746..902da535eb0 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml index bd40a88a225..bef5a7409fe 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml @@ -28,7 +28,7 @@ - + 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 74388f9edc4..7f5a37367f0 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 @@ -31,7 +31,7 @@ - + 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 add9e621632..162d07aea0b 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml index ac0b6c11c57..145010a9db8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml @@ -28,7 +28,7 @@ - + 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 e93749c6137..e5c8792ec15 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 @@ -30,7 +30,7 @@ - + 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 06fe60a546a..28bc9fb78d6 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 @@ -30,7 +30,7 @@ - + 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 b9ba11807f7..05d23961c66 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client-bus.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client-bus.xml index eb97636ae9a..79e583de566 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client-bus.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client-bus.xml @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml index d6576a5d7a4..f9476f3c517 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml @@ -28,7 +28,7 @@ - + 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 76751ea5acd..191847f30ee 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 @@ -29,7 +29,7 @@ - + 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 b58c25edff0..2768d5dd083 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 @@ -22,7 +22,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/client.xml index 139d8a432c6..85aa4abfbfc 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/client.xml @@ -28,7 +28,7 @@ - + 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 3465cfab5ee..079ac303437 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 @@ -30,7 +30,7 @@ - + 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 582c8b167bc..8286a41c5a1 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 @@ -30,7 +30,7 @@ - + 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 25e82f7a9e0..4744c0025a5 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 @@ -21,7 +21,7 @@ - + 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 ee33dbbcfd5..c29eb012a7b 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 @@ -21,7 +21,7 @@ - + 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 58150a2c8f7..e740c606fb4 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 @@ -29,7 +29,7 @@ - + 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 ca20bfc20dc..6d4f7fe73d4 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 @@ -31,7 +31,7 @@ - + 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 5ef42d5e82a..f695d910f16 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 @@ -31,7 +31,7 @@ - + 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 3bdf326df13..cfe86f1e2ae 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 @@ -29,7 +29,7 @@ - + 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 002b4653728..698f09d953b 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 @@ -29,7 +29,7 @@ - + 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 365e829556f..c62aa24a84a 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 @@ -31,7 +31,7 @@ - + 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 35badba0ef4..45e0f9ac96f 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/client.xml index 86f6c2cbc50..cd53868d9ca 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml index 2a4f95036bf..08ef164f221 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml @@ -28,7 +28,7 @@ - + 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 56c44ab7948..29273499327 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 @@ -31,7 +31,7 @@ - + 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 92a941ac7eb..675a45de02c 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 @@ -31,7 +31,7 @@ - + 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 99df1130a67..399d1063bac 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 @@ -31,7 +31,7 @@ - + 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 8be85bcbe27..498aa294f7b 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml index f1946ad4dc9..98569d0013f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml index d262bf0d0f5..501235e62cf 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml @@ -28,7 +28,7 @@ - + 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 adc31df8c75..c65071d24ff 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 @@ -30,7 +30,7 @@ - + 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 bb317235a43..76918509e7a 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 @@ -30,7 +30,7 @@ - + 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 dd305768024..57dbb669f4c 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 @@ -30,7 +30,7 @@ - + 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 4b8a8b8adfb..e82095eca57 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml index 18ec001177b..fc72f6faea3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml @@ -28,7 +28,7 @@ - + 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 01d9581df54..9ec62c82fc6 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 @@ -30,7 +30,7 @@ - + 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 98a2ee0b7e0..091f4ed3a8c 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml index 8dac812302b..62dd6a218d1 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-remote-wsdl.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-remote-wsdl.xml index b85ea26204a..e3d966851fc 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-remote-wsdl.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-remote-wsdl.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml index 97d416d3d9a..bc5f9e37555 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml index 884d795b78b..f9b2d4337c5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml @@ -28,7 +28,7 @@ - + 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 5b22a3d18ff..1606e002b60 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 @@ -30,7 +30,7 @@ - + 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 50a330f5fc4..29a15233479 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 @@ -30,7 +30,7 @@ - + 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 a1deddba862..3f552f6e404 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 @@ -30,7 +30,7 @@ - + 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 48842318cfa..55d64dffa2f 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 @@ -30,7 +30,7 @@ - + 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 90aedb35f97..f4cf20cfced 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml index e9d82572250..6b192036142 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml @@ -28,7 +28,7 @@ - + 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 a1fd105f38c..98702b50bc9 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 @@ -29,7 +29,7 @@ - + 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 b4ddce8af4e..0c12e55c013 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 @@ -30,7 +30,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml index 1eae51cd9c4..c2c88188123 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_customAlgorithmSuite.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_customAlgorithmSuite.xml index e796a255a15..5c481eec0e6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_customAlgorithmSuite.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_customAlgorithmSuite.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml index 7e54606a681..e95b3d4f5f7 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml index 111f2deb4cc..42463753b7e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_unauthorized.xml @@ -28,7 +28,7 @@ - + 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 5693d1bfac2..d4fb525e5d0 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 @@ -31,7 +31,7 @@ - + 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 980e4f1e0b8..048302bb24a 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 @@ -50,7 +50,7 @@ - + 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 12bb6dbf739..dac348157a3 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 @@ -50,7 +50,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml index dabd4c6cd1f..bf52655718b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml @@ -31,7 +31,7 @@ - + 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 7d8f326f5fc..753c7072732 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 @@ -31,7 +31,7 @@ - + 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 b8041f6c171..879907468ab 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml index 60a0e090111..bef86046504 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml @@ -31,7 +31,7 @@ - + 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 9a50de595a5..4da1754ce81 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml index a52af9df3ca..77d4bab14cd 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml index da7b8987f65..508015ab4a0 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml @@ -28,7 +28,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server.xml index 593a34a84a6..945e8302c97 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server.xml @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml index 3c8abf702b4..d2836b15f9d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml @@ -29,7 +29,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary-client.xml index 7cc1e210825..d9bff3e5560 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary-client.xml @@ -28,7 +28,7 @@ - + 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 b8c1f760100..db02c5e9172 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml index 8fa42899d5f..bde10560657 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml @@ -28,7 +28,7 @@ - + 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 14a57ea9683..cc2f1749eb2 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 @@ -31,7 +31,7 @@ - + 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 88e25d780ac..30beb9d0f9b 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 @@ -31,7 +31,7 @@ - + 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 6914152e469..9e34f961290 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 @@ -30,7 +30,7 @@ - + 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 5b3ecf109f1..1e46f2ca8e0 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 @@ -31,7 +31,7 @@ - + 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 8de6756b8c3..13a4a7fb2ed 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 @@ -31,7 +31,7 @@ - + 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 e45c99606e3..b6af11df68c 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 @@ -31,7 +31,7 @@ - + diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml index 0fdfe04a807..23edd4d69cd 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml @@ -27,8 +27,8 @@ - - + + 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 da4bee07918..695ad8df5e5 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 @@ -29,7 +29,7 @@ - + diff --git a/systests/ws-specs/src/test/resources/service_listing/WEB-INF/beans.xml b/systests/ws-specs/src/test/resources/service_listing/WEB-INF/beans.xml index 5070c42a8fe..6f160b0e80a 100644 --- a/systests/ws-specs/src/test/resources/service_listing/WEB-INF/beans.xml +++ b/systests/ws-specs/src/test/resources/service_listing/WEB-INF/beans.xml @@ -24,7 +24,7 @@ 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"> - +