You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2016/11/22 08:12:34 UTC

[1/2] cxf git commit: [CXF-7145]synchronized store and getMessages of JmsPullPoint would cause deadlock

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dbc867f98 -> 7e57ca653


[CXF-7145]synchronized store and getMessages of JmsPullPoint would cause deadlock


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/574090d1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/574090d1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/574090d1

Branch: refs/heads/3.1.x-fixes
Commit: 574090d1180ae3718ffe1ab9dbbb6f49ad67b5a2
Parents: 979fe8e
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Nov 22 16:10:36 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Nov 22 16:10:36 2016 +0800

----------------------------------------------------------------------
 .../org/apache/cxf/wsn/jms/JmsPullPoint.java    | 39 +++++++++-----------
 1 file changed, 18 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/574090d1/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
index 92d50ae..b56fe92 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
@@ -72,7 +72,7 @@ public class JmsPullPoint extends AbstractPullPoint {
         }
     }
 
-    protected void initSession() throws JMSException {
+    protected synchronized void initSession() throws JMSException {
         if (session == null) {
             session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
             queue = session.createQueue(getName());
@@ -80,9 +80,21 @@ public class JmsPullPoint extends AbstractPullPoint {
             consumer = session.createConsumer(queue);
         }
     }
+    
+    protected synchronized void closeSession() {
+        if (session != null) {
+            try {
+                session.close();
+            } catch (JMSException inner) {
+                LOGGER.log(Level.FINE, "Error closing session", inner);
+            } finally {
+                session = null;
+            }
+        }
+    }
 
     @Override
-    protected synchronized void store(NotificationMessageHolderType messageHolder) {
+    protected void store(NotificationMessageHolderType messageHolder) {
         try {
             initSession();
             Notify notify = new Notify();
@@ -93,22 +105,15 @@ public class JmsPullPoint extends AbstractPullPoint {
             producer.send(message);
         } catch (JMSException e) {
             LOGGER.log(Level.WARNING, "Error storing message", e);
-            if (session != null) {
-                try {
-                    session.close();
-                } catch (JMSException inner) {
-                    LOGGER.log(Level.FINE, "Error closing session", inner);
-                } finally {
-                    session = null;
-                }
-            }
+            closeSession();
+            
         } catch (JAXBException e) {
             LOGGER.log(Level.WARNING, "Error storing message", e);
         }
     }
 
     @Override
-    protected synchronized List<NotificationMessageHolderType> getMessages(int max) 
+    protected List<NotificationMessageHolderType> getMessages(int max) 
         throws ResourceUnknownFault, UnableToGetMessagesFault {
         try {
             if (max == 0) {
@@ -135,15 +140,7 @@ public class JmsPullPoint extends AbstractPullPoint {
             return messages;
         } catch (JMSException e) {
             LOGGER.log(Level.INFO, "Error retrieving messages", e);
-            if (session != null) {
-                try {
-                    session.close();
-                } catch (JMSException inner) {
-                    LOGGER.log(Level.FINE, "Error closing session", inner);
-                } finally {
-                    session = null;
-                }
-            }
+            closeSession();
             UnableToGetMessagesFaultType fault = new UnableToGetMessagesFaultType();
             throw new UnableToGetMessagesFault("Unable to retrieve messages", fault, e);
         } catch (JAXBException e) {


[2/2] cxf git commit: Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes

Posted by ff...@apache.org.
Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7e57ca65
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7e57ca65
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7e57ca65

Branch: refs/heads/3.1.x-fixes
Commit: 7e57ca6533d63c3b279a40ef8d247cb0b02099c9
Parents: 574090d dbc867f
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Nov 22 16:11:39 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Nov 22 16:11:39 2016 +0800

----------------------------------------------------------------------
 .gitmergeinfo                                   |  2 +
 .../src/main/resources/etc/https-cfg-client.xml |  2 +-
 .../main/resources/etc/https-cfg-service.xml    |  2 +-
 .../src/main/resources/etc/policy-asym.xml      |  2 +-
 .../src/main/resources/etc/policy-sym.xml       |  2 +-
 .../src/main/resources/etc/policy-symsc.xml     |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 core/src/main/resources/META-INF/cxf/cxf.xml    |  2 +-
 .../test/java/org/apache/cxf/bus/spring/bus.xml |  2 +-
 .../org/apache/cxf/bus/spring/customerBus.xml   |  2 +-
 .../org/apache/cxf/bus/spring/customerBus2.xml  |  2 +-
 .../java/org/apache/cxf/bus/spring/init.xml     |  2 +-
 .../org/apache/cxf/bus/spring/lazyInitBus.xml   |  2 +-
 .../cxf/bus/spring/resources/bus-overwrite.xml  |  2 +-
 .../java/org/apache/cxf/bus/spring/test.xml     |  2 +-
 .../org/apache/cxf/bus/spring/testjsr250.xml    |  2 +-
 .../cxf/configuration/spring/test-beans.xml     |  2 +-
 .../configuration/spring/test-jaxb-beans.xml    |  2 +-
 .../src/main/resources/client.xml               |  2 +-
 .../src/main/resources/server.xml               |  2 +-
 .../src/main/resources/client-beans.xml         |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../release/samples/in_jvm_transport/coloc.xml  |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../src/main/resources/client-beans.xml         |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ServerConfig.xml         |  2 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |  2 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |  2 +-
 .../src/main/resources/context.xml              |  2 +-
 .../src/main/webapp/WEB-INF/context.xml         |  2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |  2 +-
 .../resources/WEB-INF/applicationContext.xml    | 42 +++++++++++
 .../src/main/webapp/WEB-INF/beans.xml           |  4 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../resources/client-applicationContext.xml     |  4 +-
 .../resources/server-applicationContext.xml     |  4 +-
 .../src/main/resources/cxf.xml                  |  2 +-
 .../src/main/resources/cxf.xml                  |  2 +-
 .../src/main/webapp/WEB-INF/spring-servlet.xml  |  2 +-
 .../src/main/webapp/WEB-INF/oauth-beans.xml     |  2 +-
 .../src/main/webapp/WEB-INF/security-beans.xml  |  7 ++
 .../src/main/webapp/WEB-INF/spring-servlet.xml  |  2 +-
 .../src/main/resources/client-beans.xml         |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../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 +-
 .../ws_addressing/src/main/resources/client.xml |  2 +-
 .../ws_addressing/src/main/resources/server.xml |  2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |  2 +-
 .../ws_policy/src/main/resources/client.xml     |  2 +-
 .../ws_policy/src/main/resources/server.xml     |  2 +-
 .../samples/ws_rm/src/main/resources/client.xml |  2 +-
 .../samples/ws_rm/src/main/resources/server.xml |  2 +-
 .../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 +-
 .../ws_security/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 +-
 .../resources/client-applicationContext.xml     |  2 +-
 .../wsdl_first/src/main/resources/cxf.xml       |  2 +-
 .../resources/server-applicationContext.xml     |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../src/main/resources/server-beans.xml         |  2 +-
 .../src/main/resources/InsecureClient.xml       |  2 +-
 .../src/main/resources/SecureClient.xml         |  2 +-
 .../src/main/resources/ServerConfig.xml         |  2 +-
 .../release/samples/wsdl_first_xmlbeans/cxf.xml |  2 +-
 .../main/java/demo/hw/client/client-beans.xml   |  2 +-
 .../main/java/demo/hw/server/server-beans.xml   |  2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |  2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |  2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |  2 +-
 parent/pom.xml                                  |  2 +-
 .../cxf/binding/coloc/blueprint/Activator.java  | 22 +++---
 .../cxf/binding/object/blueprint/Activator.java | 22 +++---
 .../cxf/binding/soap/blueprint/Activator.java   | 20 +++---
 .../resources/META-INF/cxf/java2wsbeans.xml     |  2 +-
 .../cxf/aegis/type/aegisOptionsTestBeans.xml    |  2 +-
 .../resources/META-INF/cxf/java2wsbeans.xml     |  2 +-
 .../resources/META-INF/cxf/java2wsbeans.xml     |  2 +-
 .../resources/META-INF/cxf/java2wsbeans.xml     |  2 +-
 .../test/java/org/apache/cxf/xmlbeans/cxf.xml   |  2 +-
 .../test/java/org/apache/cxf/xmlbeans/cxf2.xml  |  2 +-
 .../cxf/clustering/blueprint/Activator.java     | 20 +++---
 .../apache/cxf/jaxrs/blueprint/Activator.java   | 20 +++---
 .../org/apache/cxf/jaxrs/spring/servers.xml     |  2 +-
 .../org/apache/cxf/jaxrs/spring/servers2.xml    |  2 +-
 .../apache/cxf/jaxws/blueprint/Activator.java   | 20 +++---
 .../META-INF/cxf/cxf-extension-jaxws.xml        |  2 +-
 .../apache/cxf/jaxws/configured-endpoints.xml   |  2 +-
 .../apache/cxf/jaxws/dispatch/bus-dispatch.xml  |  2 +-
 .../java/org/apache/cxf/jaxws/schemaFirst.xml   |  2 +-
 ...chemavalidationtype-configured-endpoints.xml |  2 +-
 .../org/apache/cxf/jaxws/soapServiceConfig.xml  |  2 +-
 .../java/org/apache/cxf/jaxws/spring/child.xml  |  2 +-
 .../org/apache/cxf/jaxws/spring/clients.xml     |  2 +-
 .../org/apache/cxf/jaxws/spring/cxf3959a.xml    |  2 +-
 .../org/apache/cxf/jaxws/spring/cxf3959b.xml    |  2 +-
 .../org/apache/cxf/jaxws/spring/cxf3959c.xml    |  2 +-
 .../org/apache/cxf/jaxws/spring/endpoints.xml   |  2 +-
 .../org/apache/cxf/jaxws/spring/endpoints2.xml  |  2 +-
 .../org/apache/cxf/jaxws/spring/endpoints3.xml  |  2 +-
 .../org/apache/cxf/jaxws/spring/servers.xml     |  2 +-
 .../java/org/apache/cxf/jaxws/ws/server.xml     |  2 +-
 .../cxf/frontend/blueprint/Activator.java       | 20 +++---
 .../org/apache/cxf/frontend/spring/clients.xml  |  2 +-
 .../org/apache/cxf/frontend/spring/rountrip.xml |  2 +-
 .../org/apache/cxf/frontend/spring/servers.xml  |  2 +-
 .../src/test/resources/AegisBeans.xml           |  2 +-
 .../src/test/resources/AnyBeans.xml             |  2 +-
 .../resources/DocLitBareClientTestBeans.xml     |  2 +-
 .../resources/DocLitWrappedClientTestBeans.xml  |  2 +-
 .../test/resources/GreeterClientTestBeans.xml   |  2 +-
 .../test/resources/HelloWorldDocLitBeans.xml    |  2 +-
 .../test/resources/HelloWorldGreeterBeans.xml   |  2 +-
 .../src/test/resources/MtoMBeans.xml            |  2 +-
 .../src/test/resources/RPCClientTestBeans.xml   |  2 +-
 .../test/resources/XMLHttpRequestTestBeans.xml  |  2 +-
 .../src/test/resources/attributeTestBeans.xml   |  2 +-
 .../test/resources/serializationTestBeans.xml   |  2 +-
 .../test/resources/managed-spring-twobuses.xml  |  2 +-
 .../test/resources/managed-spring-twobuses2.xml |  2 +-
 .../src/test/resources/managed-spring.xml       |  2 +-
 .../src/test/resources/managed-spring2.xml      |  2 +-
 .../src/test/resources/managed-spring3.xml      |  2 +-
 .../src/test/resources/no-connector-spring.xml  |  2 +-
 .../cxf/jaxrs/client/blueprint/Activator.java   | 20 +++---
 .../apache/cxf/jaxrs/client/spring/clients.xml  |  2 +-
 .../apache/cxf/jaxrs/provider/atom/servers.xml  |  2 +-
 .../oauth2/client/ClientCodeRequestFilter.java  |  7 +-
 .../grants/code/JPACMTCodeDataProvider.xml      |  6 +-
 .../oidc/idp/JPAOidcUserSubjectCMTTest.xml      |  6 +-
 .../transport/http_jetty/invalid-engines.xml    |  2 +-
 .../http_jetty/server-engine-factory.xml        |  2 +-
 .../transport/http_jetty/spring/beans-props.xml |  2 +-
 .../cxf/transport/http_jetty/spring/beans.xml   |  2 +-
 .../http_jetty/spring/invalid-beans.xml         |  2 +-
 .../netty/client/integration/ServerConfig.xml   |  2 +-
 .../http/netty/server/blueprint/Activator.java  | 22 +++---
 .../server/integration/ApplicationContext.xml   |  2 +-
 .../netty/server/integration/ServerConfig.xml   |  2 +-
 .../http/netty/server/spring/beans-props.xml    |  2 +-
 .../http/netty/server/spring/beans.xml          |  2 +-
 .../http/netty/server/spring/invalid-beans.xml  |  2 +-
 .../transport/http_undertow/invalid-engines.xml | 28 ++++++++
 .../http_undertow/server-engine-factory.xml     | 28 ++++++++
 .../http_undertow/spring/beans-props.xml        | 74 ++++++++++++++++++++
 .../transport/http_undertow/spring/beans.xml    | 61 ++++++++++++++++
 .../http_undertow/spring/invalid-beans.xml      | 27 +++++++
 .../main/resources/META-INF/cxf/cxf-servlet.xml |  2 +-
 .../cxf/transport/http/spring/conduit-bean.xml  |  2 +-
 .../http/spring/conduit-tlsrefs-bean.xml        |  2 +-
 .../transport/jms/ConnectionFactoryFeature.java | 31 +++++---
 .../cxf/ws/addressing/blueprint/Activator.java  | 22 +++---
 .../cxf/ws/policy/blueprint/Activator.java      | 32 +++++----
 .../apache/cxf/ws/policy/disable-policy-bus.xml |  2 +-
 .../apache/cxf/ws/policy/ignorable-policy.xml   |  2 +-
 .../apache/cxf/ws/policy/ignorable-policy2.xml  |  2 +-
 .../org/apache/cxf/ws/policy/policy-bus.xml     |  2 +-
 .../org/apache/cxf/ws/policy/spring/beans.xml   |  2 +-
 .../policy/PolicyEngineImplInitTest-context.xml |  2 +-
 .../apache/cxf/ws/rm/blueprint/Activator.java   | 24 ++++---
 .../org/apache/cxf/ws/rm/custom-rmmanager.xml   |  2 +-
 .../java/org/apache/cxf/ws/rm/exactly-once.xml  |  2 +-
 .../test/java/org/apache/cxf/ws/rm/feature.xml  |  2 +-
 .../apache/cxf/ws/rm/managed-manager-bean.xml   |  2 +-
 .../java/org/apache/cxf/ws/rm/manager-bean.xml  |  2 +-
 .../cxf/ws/rm/persistence/jdbc/txstore-bean.xml |  2 +-
 .../jdbc/txstore-custom-error-bean.xml          |  2 +-
 .../jdbc/txstore-custom-error-bean2.xml         |  2 +-
 .../ws/rm/persistence/jdbc/txstore-ds-bean.xml  |  2 +-
 .../ws/rm/persistence/jdbc/txstore-ds-bean2.xml |  2 +-
 .../java/org/apache/cxf/ws/rm/rmmanager.xml     |  2 +-
 .../AsymmetricBindingHandler.java               | 10 +--
 .../policyhandlers/SymmetricBindingHandler.java |  8 +--
 .../systest/sts/asymmetric_encr/cxf-client.xml  |  2 +-
 .../cxf/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 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |  2 +-
 .../systest/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 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml      |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml     |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml    |  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  2 +-
 .../cxf/systest/sts/caching/cxf-service.xml     |  2 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |  2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |  2 +-
 .../cxf/systest/sts/claims/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/claims/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/claims/stax-cxf-service.xml |  2 +-
 .../cxf/systest/sts/cross_domain/cxf-client.xml |  2 +-
 .../systest/sts/cross_domain/cxf-service.xml    |  2 +-
 .../systest/sts/cross_domain/cxf-sts-saml1.xml  |  2 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |  2 +-
 .../sts/custom_onbehalfof/cxf-client.xml        |  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml       |  2 +-
 .../systest/sts/custom_onbehalfof/cxf-sts.xml   |  2 +-
 .../systest/sts/deployment/cxf-sts-common.xml   |  2 +-
 .../cxf/systest/sts/deployment/cxf-sts.xml      |  2 +-
 .../cxf/systest/sts/deployment/stax-cxf-sts.xml |  2 +-
 .../sts/distributed_caching/cxf-client.xml      |  2 +-
 .../sts/distributed_caching/cxf-service.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 +-
 .../apache/cxf/systest/sts/jwt/cxf-service.xml  |  2 +-
 .../sts/kerberos/cxf-intermediary-client.xml    |  2 +-
 .../kerberos/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-service.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 +-
 .../apache/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 +-
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/secure_conv/cxf-service.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 +-
 .../cxf/systest/sts/soap12/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  2 +-
 .../sts/sts_sender_vouches/cxf-service.xml      |  2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |  2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml     |  2 +-
 .../systest/sts/transformation/cxf-client.xml   |  2 +-
 .../systest/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 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  2 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  2 +-
 .../cxf/systest/sts/bearer/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/bearer/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |  2 +-
 .../systest/sts/bearer/cxf-unsigned-client.xml  |  2 +-
 .../cxf/systest/sts/delegation/cxf-client.xml   |  2 +-
 .../sts/delegation/cxf-sts-transport.xml        |  2 +-
 .../systest/sts/deployment/cxf-transport.xml    |  2 +-
 .../systest/sts/deployment/cxf-ut-encrypted.xml |  2 +-
 .../cxf/systest/sts/deployment/cxf-ut.xml       |  2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml     |  2 +-
 .../sts/deployment/stax-cxf-transport.xml       |  2 +-
 .../sts/deployment/stax-cxf-ut-encrypted.xml    |  2 +-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |  2 +-
 .../cxf/systest/sts/deployment/sts/cxf-sts.xml  |  2 +-
 .../cxf/systest/sts/deployment/sts/realms.xml   |  2 +-
 .../cxf-bad-client.xml                          |  2 +-
 .../intermediary_transformation/cxf-client.xml  |  2 +-
 .../cxf-intermediary-caching.xml                |  2 +-
 .../cxf-intermediary.xml                        |  2 +-
 .../intermediary_transformation/cxf-service.xml |  2 +-
 .../cxf/systest/sts/issuer/cxf-client.xml       |  2 +-
 .../sts/issuer/cxf-issuer-sts-transport.xml     |  2 +-
 .../cxf/systest/sts/issuer/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/issueunit/cxf-client.xml    |  2 +-
 .../apache/cxf/systest/sts/jaas/cxf-client.xml  |  2 +-
 .../apache/cxf/systest/sts/jaas/cxf-service.xml |  2 +-
 .../cxf/systest/sts/jaas/cxf-service2.xml       |  2 +-
 .../cxf/systest/sts/jaas/cxf-sts-client.xml     |  2 +-
 .../apache/cxf/systest/sts/rest/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 +-
 .../sts/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/stsclient/cxf-service.xml   |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |  2 +-
 .../cxf/systest/sts/symmetric/cxf-service.xml   |  2 +-
 .../systest/sts/symmetric/cxf-stax-service.xml  |  2 +-
 .../cxf/systest/sts/template/cxf-client.xml     |  2 +-
 .../cxf/systest/sts/template/cxf-service.xml    |  2 +-
 .../systest/sts/template/cxf-stax-service.xml   |  2 +-
 .../systest/sts/transport/cxf-bad-client.xml    |  2 +-
 .../cxf/systest/sts/transport/cxf-client.xml    |  2 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |  2 +-
 .../systest/sts/transport/cxf-stax-service.xml  |  2 +-
 .../systest/sts/username_actas/cxf-client.xml   |  2 +-
 .../systest/sts/username_actas/cxf-service.xml  |  2 +-
 .../systest/sts/username_actas/cxf-service2.xml |  2 +-
 .../sts/username_onbehalfof/cxf-client.xml      |  2 +-
 .../sts/username_onbehalfof/cxf-service.xml     |  2 +-
 .../sts/username_onbehalfof/cxf-service2.xml    |  2 +-
 .../systest/sts/x509/cxf-asymmetric-service.xml |  2 +-
 .../apache/cxf/systest/sts/x509/cxf-client.xml  |  2 +-
 .../apache/cxf/systest/sts/x509/cxf-service.xml |  2 +-
 .../cxf/systest/sts/x509/cxf-stax-service.xml   |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |  2 +-
 .../src/main/webapp/WEB-INF/xkms-endpoint.xml   |  2 +-
 .../main/webapp/WEB-INF/xkms-key-handlers.xml   |  2 +-
 .../webapp/src/main/webapp/WEB-INF/beans.xml    |  2 +-
 .../java/org/apache/cxf/systest/source/cxf.xml  |  2 +-
 .../org/apache/cxf/systest/xmlbeans/cxf.xml     |  2 +-
 .../apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml |  2 +-
 .../src/test/resources/aegisJaxWsBeans.xml      |  2 +-
 .../test/resources/aegisSportsServiceBeans.xml  |  2 +-
 .../src/test/resources/aegisWSDLNSBeans.xml     |  2 +-
 .../src/test/resources/extrajaxbclass.xml       |  2 +-
 .../src/test/resources/jaxbCustomValidators.xml |  2 +-
 .../src/test/resources/mtomTestBeans.xml        |  2 +-
 .../src/test/resources/webapp/WEB-INF/beans.xml |  4 +-
 .../http/resources/BethalClientBeans.xml        |  2 +-
 .../systest/http/resources/SessionServer.xml    |  2 +-
 .../http/resources/SessionServer_Windows.xml    |  2 +-
 .../systest/http/resources/jaxws-publish.xml    |  2 +-
 .../cxf/systest/http/resources/jaxws-server.xml |  2 +-
 .../cxf/systest/http/resources/pkcs12.xml       |  2 +-
 .../http/resources/resource-key-spec-url.xml    |  2 +-
 .../http/resources/resource-key-spec.xml        |  2 +-
 .../cxf/systest/jaxrs/jms/jms_server_config.xml |  2 +-
 .../jaxrs/security/jaxrs-https-client1.xml      |  2 +-
 .../jaxrs/security/jaxrs-https-client2.xml      |  2 +-
 .../jaxrs/security/jaxrs-https-client3.xml      |  2 +-
 .../jaxrs/security/jaxrs-https-client4.xml      |  2 +-
 .../jaxrs/security/jaxrs-https-client5.xml      |  2 +-
 .../jaxrs/security/jaxrs-https-client_old.xml   |  2 +-
 .../jaxrs/security/jaxrs-https-server.xml       |  2 +-
 .../src/test/resources/jaxrs/WEB-INF/beans.xml  |  2 +-
 .../resources/jaxrs_async/WEB-INF/beans.xml     |  2 +-
 .../test/resources/jaxrs_atom/WEB-INF/beans.xml |  4 +-
 .../test/resources/jaxrs_cors/WEB-INF/beans.xml |  2 +-
 .../jaxrs_databinding/WEB-INF/beans.xml         |  4 +-
 .../resources/jaxrs_dispatch/WEB-INF/beans.xml  |  4 +-
 .../jaxrs_dispatch_simple/WEB-INF/beans.xml     |  4 +-
 .../jaxrs_jaas_security/WEB-INF/beans.xml       |  2 +-
 .../jaxrs_jackson_provider/WEB-INF/beans.xml    |  2 +-
 .../jaxrs_logging_atompull/WEB-INF/beans.xml    |  4 +-
 .../jaxrs_logging_atompush/WEB-INF/beans.xml    |  4 +-
 .../jaxrs_many_destinations/WEB-INF/beans.xml   |  4 +-
 .../resources/jaxrs_proxy/WEB-INF/beans.xml     |  4 +-
 .../resources/jaxrs_security/WEB-INF/beans.xml  |  4 +-
 .../jaxrs_security_cglib/WEB-INF/beans.xml      |  4 +-
 .../WEB-INF/beans.xml                           |  4 +-
 .../jaxrs_simple_security/WEB-INF/beans.xml     |  4 +-
 .../resources/jaxrs_soap_rest/WEB-INF/beans.xml |  2 +-
 .../resources/jaxrs_spring/WEB-INF/beans.xml    |  2 +-
 .../jaxrs_spring_discovery/WEB-INF/beans.xml    |  2 +-
 .../jaxrs_spring_providers/WEB-INF/beans.xml    |  2 +-
 .../jaxrs_spring_validation/WEB-INF/beans.xml   |  2 +-
 .../resources/jaxrs_uriinfo/WEB-INF/beans.xml   |  4 +-
 .../resources/jaxrs_websocket/WEB-INF/beans.xml |  4 +-
 .../jaxrs_websocket/beans-embedded.xml          |  4 +-
 .../jaxrs_websocket/beans-embedded2.xml         |  4 +-
 .../jaxrs/discovery/jaxrs-http-client.xml       |  2 +-
 .../servlet_as_filter/WEB-INF/beans.xml         |  2 +-
 .../cxf/systest/dispatch/client-config.xml      |  2 +-
 .../org/apache/cxf/systest/handlers/beans.xml   |  2 +-
 .../handlers/beans_autoRewriteSoapAddress.xml   |  2 +-
 .../beans_no_autoRewriteSoapAddress.xml         |  2 +-
 .../cxf/systest/handlers/soap_fault_beans.xml   |  2 +-
 .../cxf/systest/jaxws/fault-stack-trace.xml     |  2 +-
 .../systest/jaxws/beanpostprocessor/context.xml |  2 +-
 .../beanpostprocessor/customized-context.xml    |  2 +-
 .../cxf/systest/jaxws/springWebService.xml      |  2 +-
 .../java/org/apache/cxf/systest/jibx/cxf.xml    |  2 +-
 .../jaxrs_databinding/WEB-INF/beans.xml         |  4 +-
 .../kerberos/jaxrs/kerberos/kerberosClient.xml  |  2 +-
 systests/kerberos/src/test/resources/ldap.xml   |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  |  2 +-
 .../systest/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 +-
 .../cxf/systest/kerberos/wssec/sts/cxf-sts.xml  |  2 +-
 .../systest/kerberos/wssec/sts/stax-cxf-sts.xml |  2 +-
 .../http/resources/BethalClientBeans.xml        |  2 +-
 .../systest/http/resources/SessionServer.xml    |  2 +-
 .../http/resources/SessionServer_Windows.xml    |  2 +-
 .../systest/http/resources/jaxws-publish.xml    |  2 +-
 .../cxf/systest/http/resources/jaxws-server.xml |  2 +-
 .../cxf/systest/http/resources/pkcs12.xml       |  2 +-
 .../http/resources/resource-key-spec-url.xml    |  2 +-
 .../http/resources/resource-key-spec.xml        |  2 +-
 .../jaxrs/oauth/server/WEB-INF/oauth-beans.xml  |  2 +-
 .../cxf/systest/jaxrs/security/jcs/client.xml   | 38 ++++++++++
 .../systest/jaxrs/security/jcs/jcs-server.xml   | 48 +++++++++++++
 .../security/jose/jwejws/algorithms-server.xml  |  2 +-
 .../jaxrs/security/jose/jwejws/client.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/jwt/algorithms-server.xml     |  2 +-
 .../security/jose/jwt/authn-authz-server.xml    |  2 +-
 .../systest/jaxrs/security/jose/jwt/client.xml  |  2 +-
 .../security/jose/jwt/properties-server.xml     |  2 +-
 .../jaxrs/security/oauth2/filters/client.xml    |  2 +-
 .../security/oauth2/filters/filters-server.xml  |  4 +-
 .../oauth2/filters/filters-serverJwt.xml        |  4 +-
 .../security/oauth2/filters/oauth20-server.xml  |  4 +-
 .../oauth2/filters/oauth20-serverJwt.xml        |  4 +-
 .../jaxrs/security/oauth2/grants/client.xml     |  2 +-
 .../oauth2/grants/grants-negative-server.xml    |  4 +-
 .../security/oauth2/grants/grants-server.xml    |  4 +-
 .../oauth2/grants/introspection-server.xml      |  4 +-
 .../jaxrs/security/oauth2/grants/server.xml     |  4 +-
 .../cxf/systest/jaxrs/security/oidc/client.xml  |  2 +-
 .../jaxrs/security/oidc/filters/client.xml      |  2 +-
 .../security/oidc/filters/filters-server.xml    |  4 +-
 .../jaxrs/security/oidc/filters/oidc-server.xml |  4 +-
 .../security/oidc/oidc-negative-server.xml      |  4 +-
 .../jaxrs/security/oidc/oidc-server-dynreg.xml  |  4 +-
 .../systest/jaxrs/security/oidc/oidc-server.xml |  4 +-
 .../jaxrs/security/oidc/userinfo-server.xml     |  4 +-
 .../cxf/systest/jaxrs/security/saml/client.xml  |  2 +-
 .../jaxrs/security/saml/secureServer.xml        |  2 +-
 .../cxf/systest/jaxrs/security/saml/server.xml  |  2 +-
 .../systest/jaxrs/security/samlsso/client.xml   |  2 +-
 .../jaxrs/security/samlsso/metadata-server.xml  |  2 +-
 .../cxf/systest/jaxrs/security/xml/client.xml   |  2 +-
 .../cxf/systest/jaxrs/security/xml/server.xml   |  2 +-
 .../systest/jaxrs/security/xml/stax-server.xml  |  2 +-
 .../org/apache/cxf/systest/jms/JMSClients.xml   |  2 +-
 .../jms/continuations/jms_test_config.xml       |  2 +-
 .../java/org/apache/cxf/systest/jms/gzipBus.xml |  2 +-
 .../org/apache/cxf/systest/jms/soap12Bus.xml    |  2 +-
 .../cxf/systest/http_undertow/SessionServer.xml | 46 ++++++++++++
 .../systest/http_undertow/continuations/cxf.xml | 24 +++++++
 .../http_undertow/continuations/cxf_https.xml   | 36 ++++++++++
 .../continuations/jaxws-server.xml              | 47 +++++++++++++
 .../apache/cxf/systest/http_undertow/cxf.xml    | 24 +++++++
 .../http_undertow/server-lifecycle-beans.xml    | 47 +++++++++++++
 .../apache/cxf/systest/http_undertow/server.xml | 27 +++++++
 .../systest/http_undertow/undertow-engine.xml   | 45 ++++++++++++
 .../http_undertow/undertowBasicAuthServer.xml   | 29 ++++++++
 .../http_undertow/undertowDigestServer.xml      | 29 ++++++++
 .../cxf/https/ssl3/sslv3-client-allow.xml       |  2 +-
 .../org/apache/cxf/https/ssl3/sslv3-client.xml  |  2 +-
 .../org/apache/cxf/https/ssl3/sslv3-server.xml  |  2 +-
 .../test/resources/digestauth/WEB-INF/beans.xml |  2 +-
 .../apache/cxf/systest/http/SessionServer.xml   |  2 +-
 .../systest/http_jetty/continuations/cxf.xml    |  2 +-
 .../http_jetty/continuations/cxf_https.xml      |  2 +-
 .../http_jetty/continuations/jaxws-server.xml   |  2 +-
 .../http_jetty/continuations/jetty-engine.xml   |  2 +-
 .../org/apache/cxf/systest/http_jetty/cxf.xml   |  2 +-
 .../cxf/systest/http_jetty/jetty-engine.xml     |  2 +-
 .../systest/http_jetty/jettyBasicAuthServer.xml |  2 +-
 .../systest/http_jetty/jettyDigestServer.xml    |  2 +-
 .../http_jetty/server-lifecycle-beans.xml       |  2 +-
 .../apache/cxf/systest/http_jetty/server.xml    |  2 +-
 .../ciphersuites-client-expired-cert.xml        |  2 +-
 .../ciphersuites-client-noconfig.xml            |  2 +-
 .../ciphersuites/ciphersuites-client-tlsv12.xml |  2 +-
 .../https/ciphersuites/ciphersuites-client.xml  |  2 +-
 .../ciphersuites-explicit-client.xml            |  2 +-
 .../ciphersuites/ciphersuites-null-client.xml   |  2 +-
 .../ciphersuites/ciphersuites-rc4-client.xml    |  2 +-
 .../https/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 +-
 .../systest/https/clientauth/client-no-auth.xml |  2 +-
 .../systest/https/conduit/BethalClientBeans.xml |  2 +-
 .../https/conduit/jaxws-publish-callback.xml    |  2 +-
 .../cxf/systest/https/conduit/jaxws-publish.xml |  2 +-
 .../cxf/systest/https/conduit/jaxws-server.xml  |  2 +-
 .../https/conduit/jaxws-tlsrefs-publish.xml     |  2 +-
 .../apache/cxf/systest/https/conduit/pkcs12.xml |  2 +-
 .../https/conduit/resource-key-spec-url.xml     |  2 +-
 .../systest/https/conduit/resource-key-spec.xml |  2 +-
 .../constraints/jaxws-server-constraints.xml    |  2 +-
 .../systest/https/hostname/hostname-client.xml  |  2 +-
 .../systest/https/hostname/hostname-server.xml  |  2 +-
 .../cxf/systest/https/trust/client-trust.xml    |  2 +-
 .../cxf/systest/https/trust/trust-server.xml    |  2 +-
 .../apache/cxf/systest/servlet/cxf-jaxrs.xml    |  2 +-
 .../apache/cxf/systest/servlet/cxf-servlet.xml  |  2 +-
 .../cxf/systest/servlet/spring-auto-launch.xml  |  2 +-
 .../apache/cxf/systest/servlet/spring-error.xml |  2 +-
 .../apache/cxf/systest/servlet/spring-js.xml    |  2 +-
 .../org/apache/cxf/systest/servlet/spring.xml   |  2 +-
 .../test/resources/resolver/WEB-INF/beans.xml   |  2 +-
 .../test/java/org/apache/cxf/cxf1226/beans.xml  |  2 +-
 .../test/java/org/apache/cxf/cxf1332/beans.xml  |  2 +-
 .../systest/beanincreationexception/beans.xml   |  2 +-
 .../java/org/apache/cxf/systest/bus/basic.xml   |  2 +-
 .../java/org/apache/cxf/systest/bus/servlet.xml |  2 +-
 .../clustering/circuit_breaker_failover.xml     | 58 +++++++++++++++
 .../apache/cxf/systest/clustering/failover.xml  |  2 +-
 .../clustering/failover_address_override.xml    |  2 +-
 .../cxf/systest/clustering/load_distributor.xml |  2 +-
 .../load_distributor_address_override.xml       |  2 +-
 .../apache/cxf/systest/clustering/targets.xml   |  2 +-
 .../org/apache/cxf/systest/coloc/coloc_rpc.xml  |  2 +-
 .../java/org/apache/cxf/systest/coloc/cxf.xml   |  2 +-
 .../corba/corba_binding_factory_configurer.xml  |  2 +-
 .../cxf/systest/corba/hello_world_client.xml    |  2 +-
 .../cxf/systest/corba/hello_world_server.xml    |  2 +-
 .../apache/cxf/systest/factory_pattern/cxf.xml  |  2 +-
 .../systest/factory_pattern/cxf_multiplex.xml   |  2 +-
 .../org/apache/cxf/systest/interceptor/addr.xml |  2 +-
 .../apache/cxf/systest/interceptor/no-addr.xml  |  2 +-
 .../org/apache/cxf/systest/lifecycle/cxf.xml    |  2 +-
 .../cxf/systest/management/counter-spring.xml   |  2 +-
 .../cxf/systest/management/managed-bus.xml      |  2 +-
 .../cxf/systest/management/managed-spring.xml   |  2 +-
 .../cxf/systest/management/persistent-id.xml    |  2 +-
 .../apache/cxf/systest/outofband/header/cxf.xml |  2 +-
 .../type_test/databinding-schema-validation.xml |  2 +-
 .../src/test/resources/crossSchemaBeans.xml     |  2 +-
 .../apache/cxf/systest/ws/rm/atleastonce.xml    |  2 +-
 .../cxf/systest/ws/rm/atmostonce-inorder.xml    |  2 +-
 .../org/apache/cxf/systest/ws/rm/atmostonce.xml |  2 +-
 .../org/apache/cxf/systest/ws/rm/decoupled.xml  |  2 +-
 .../apache/cxf/systest/ws/rm/decoupled_bare.xml |  2 +-
 .../org/apache/cxf/systest/ws/rm/deferred.xml   |  2 +-
 .../ws/rm/exactlyonce-inorder-decoupled.xml     |  2 +-
 .../cxf/systest/ws/rm/exactlyonce-inorder.xml   |  2 +-
 .../apache/cxf/systest/ws/rm/exactlyonce.xml    |  2 +-
 .../cxf/systest/ws/rm/expire-fast-seq.xml       |  2 +-
 .../apache/cxf/systest/ws/rm/gzip-enabled.xml   |  2 +-
 .../cxf/systest/ws/rm/inactivity-timeout.xml    |  2 +-
 .../org/apache/cxf/systest/ws/rm/inorder.xml    |  2 +-
 .../org/apache/cxf/systest/ws/rm/limit-seqs.xml |  2 +-
 .../apache/cxf/systest/ws/rm/managed-client.xml |  2 +-
 .../apache/cxf/systest/ws/rm/managed-server.xml |  2 +-
 .../cxf/systest/ws/rm/message-loss-server.xml   |  2 +-
 .../apache/cxf/systest/ws/rm/message-loss.xml   |  2 +-
 .../org/apache/cxf/systest/ws/rm/no-offer.xml   |  2 +-
 .../ws/rm/persistent-message-loss-server.xml    |  2 +-
 .../org/apache/cxf/systest/ws/rm/persistent.xml |  2 +-
 .../apache/cxf/systest/ws/rm/rminterceptors.xml |  2 +-
 .../systest/ws/rm/rminterceptors_provider.xml   |  2 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml     |  2 +-
 .../cxf/systest/ws/rm/sec/server-policy.xml     |  2 +-
 .../org/apache/cxf/systest/ws/rm/seqlength1.xml |  2 +-
 .../apache/cxf/systest/ws/rm/seqlength10.xml    |  2 +-
 .../org/apache/cxf/systest/ws/rm/suppressed.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 +-
 .../cxf/systest/ws/rm/terminate-on-shutdown.xml |  2 +-
 .../systest/ws/rm/twoway-endpoint-specific.xml  |  2 +-
 .../cxf/systest/ws/rm/wsrm-policy-resolve.xml   |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  |  2 +-
 .../cxf/systest/wssec/examples/saml/server.xml  |  2 +-
 .../systest/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 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  2 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |  2 +-
 .../systest/wssec/examples/x509/stax-server.xml |  2 +-
 .../org/apache/cxf/systest/ws/action/client.xml |  2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |  2 +-
 .../cxf/systest/ws/action/signature-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 +-
 .../apache/cxf/systest/ws/bindings/client.xml   |  2 +-
 .../apache/cxf/systest/ws/bindings/server.xml   |  2 +-
 .../cxf/systest/ws/bindings/stax-server.xml     |  2 +-
 .../org/apache/cxf/systest/ws/cache/client.xml  |  2 +-
 .../org/apache/cxf/systest/ws/cache/server.xml  |  2 +-
 .../cxf/systest/ws/coverage_checker/client.xml  |  2 +-
 .../cxf/systest/ws/coverage_checker/server.xml  |  2 +-
 .../systest/ws/coverage_checker/stax-server.xml |  2 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  2 +-
 .../cxf/systest/ws/fault/modified-server.xml    |  2 +-
 .../org/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 +-
 .../org/apache/cxf/systest/ws/https/client.xml  |  2 +-
 .../org/apache/cxf/systest/ws/https/server.xml  |  2 +-
 .../apache/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 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  |  2 +-
 .../org/apache/cxf/systest/ws/parts/server.xml  |  2 +-
 .../apache/cxf/systest/ws/parts/stax-server.xml |  2 +-
 .../org/apache/cxf/systest/ws/policy/client.xml |  2 +-
 .../cxf/systest/ws/policy/javafirstclient.xml   |  2 +-
 .../cxf/systest/ws/policy/javafirstserver.xml   |  2 +-
 .../org/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 +-
 .../apache/cxf/systest/ws/saml/stax-server.xml  |  2 +-
 .../systest/ws/saml/subjectconf/client-auth.xml |  2 +-
 .../ws/saml/subjectconf/client-noauth.xml       |  2 +-
 .../cxf/systest/ws/saml/subjectconf/server.xml  |  2 +-
 .../systest/ws/saml/subjectconf/stax-server.xml |  2 +-
 .../apache/cxf/systest/ws/security/client.xml   |  2 +-
 .../cxf/systest/ws/security/handler/client.xml  |  2 +-
 .../cxf/systest/ws/security/handler/server.xml  |  2 +-
 .../cxf/systest/ws/security/https_config.xml    |  2 +-
 .../systest/ws/security/https_config_client.xml |  2 +-
 .../apache/cxf/systest/ws/security/server.xml   |  2 +-
 .../cxf/systest/ws/security/stax-server.xml     |  2 +-
 .../org/apache/cxf/systest/ws/swa/client.xml    |  2 +-
 .../apache/cxf/systest/ws/swa/policy-client.xml |  2 +-
 .../apache/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 +-
 .../apache/cxf/systest/ws/tokens/bst-server.xml |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml |  2 +-
 .../cxf/systest/ws/tokens/endorsing-client.xml  |  2 +-
 .../cxf/systest/ws/tokens/endorsing-server.xml  |  2 +-
 .../org/apache/cxf/systest/ws/tokens/server.xml |  2 +-
 .../systest/ws/tokens/stax-endorsing-server.xml |  2 +-
 .../cxf/systest/ws/tokens/stax-server.xml       |  2 +-
 .../apache/cxf/systest/ws/tokens/tls-client.xml |  2 +-
 .../apache/cxf/systest/ws/tokens/tls-server.xml |  2 +-
 .../cxf/systest/ws/tokens/tls-stax-server.xml   |  2 +-
 .../apache/cxf/systest/ws/ut/client-derived.xml |  2 +-
 .../org/apache/cxf/systest/ws/ut/client.xml     |  2 +-
 .../apache/cxf/systest/ws/ut/policy-client.xml  |  2 +-
 .../apache/cxf/systest/ws/ut/policy-server.xml  |  2 +-
 .../apache/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 +-
 .../apache/cxf/systest/ws/wssc/unit-server.xml  |  2 +-
 .../apache/cxf/systest/ws/wssec10/client.xml    |  2 +-
 .../systest/ws/wssec10/client_restricted.xml    |  2 +-
 .../wssec10/client_restricted_unauthorized.xml  |  2 +-
 .../apache/cxf/systest/ws/wssec10/server.xml    |  2 +-
 .../systest/ws/wssec10/server_restricted.xml    |  2 +-
 .../ws/wssec10/server_restricted_authorized.xml |  2 +-
 .../wssec10/server_restricted_authorized_2.xml  |  2 +-
 .../cxf/systest/ws/wssec10/stax-server.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 +-
 .../cxf/systest/ws/x509/intermediary-client.xml |  2 +-
 .../apache/cxf/systest/ws/x509/intermediary.xml |  2 +-
 .../apache/cxf/systest/ws/x509/jaxws-client.xml |  2 +-
 .../org/apache/cxf/systest/ws/x509/server.xml   |  2 +-
 .../apache/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 +-
 .../apache/cxf/systest/ws/xkms/stax-server.xml  |  2 +-
 .../apache/cxf/systest/ws/xkms/xkms-server.xml  |  2 +-
 .../cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml |  2 +-
 .../cxf/systest/ws/addressing/cxf-hpux.xml      |  2 +-
 .../apache/cxf/systest/ws/addressing/cxf.xml    |  2 +-
 .../cxf/systest/ws/addressing/jms_decoupled.xml |  2 +-
 .../apache/cxf/systest/ws/addressing/server.xml |  2 +-
 .../cxf/systest/ws/addressing/spring/spring.xml |  2 +-
 .../systest/ws/addressing/wsa_interceptors.xml  |  2 +-
 .../cxf/systest/ws/policy/addr-anon-client.xml  |  2 +-
 .../cxf/systest/ws/policy/addr-anon-server.xml  |  2 +-
 .../ws/policy/addr-inline-policy-old.xml        |  2 +-
 .../systest/ws/policy/addr-inline-policy.xml    |  2 +-
 .../cxf/systest/ws/policy/addr-optional.xml     |  2 +-
 .../cxf/systest/ws/policy/addr-wsdl11.xml       |  2 +-
 .../org/apache/cxf/systest/ws/policy/addr.xml   |  2 +-
 .../apache/cxf/systest/ws/policy/addr0705.xml   |  2 +-
 .../cxf/systest/ws/policy/http-addr-server.xml  |  2 +-
 .../cxf/systest/ws/policy/http-server.xml       |  2 +-
 .../org/apache/cxf/systest/ws/policy/http.xml   |  2 +-
 .../ws/policy/http_client_policy_feature.xml    |  2 +-
 .../org/apache/cxf/systest/ws/policy/rm.xml     |  2 +-
 .../cxf/systest/ws/policy/rm10wsdl_server.xml   |  2 +-
 .../cxf/systest/ws/policy/rm12wsdl_server.xml   |  2 +-
 .../org/apache/cxf/systest/ws/policy/rmwsdl.xml |  2 +-
 .../java2ws/src/main/webapp/WEB-INF/beans.xml   |  2 +-
 .../src/main/java/META-INF/cxf/java2wsbeans.xml |  2 +-
 .../test/resources/revisedAegisDefaultBeans.xml |  2 +-
 711 files changed, 1672 insertions(+), 841 deletions(-)
----------------------------------------------------------------------