http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
index 2dcb983..82eb85a 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.bearer.Server}/doubleit/services/doubleittransportsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
         <jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
index 462836b..b1d0afc 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.bearer.StaxServer}/doubleit/services/doubleittransportsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
         <jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
----------------------------------------------------------------------
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 f32f61c..416374e 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
----------------------------------------------------------------------
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 e04d1b5..ef5a896 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
----------------------------------------------------------------------
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 339e188..4c18477 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
index e14e9a6..f7ca503 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
index f7d0bf5..0d2c971 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
index 263ef57..28f7062 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
----------------------------------------------------------------------
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 1916720..755d4a0 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
index 840db55..3893d21 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
index 7cf8a28..b8cb139 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
index 564d5dc..1066996 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
----------------------------------------------------------------------
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 94bd41d..8974bda 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
----------------------------------------------------------------------
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 7d3a8dc..64529a0 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/cxf-sts.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
index 56cfda7..88f1247 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     
     <!-- Realms -->
     <bean id="realmA" class="org.apache.cxf.sts.token.realm.RealmProperties">

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
----------------------------------------------------------------------
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 65606fb..2a2ec36 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
----------------------------------------------------------------------
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 a5debb0..02c9d4f 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
----------------------------------------------------------------------
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 1dd3f7b..1913907 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
----------------------------------------------------------------------
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 ce57cf6..abd9fe8 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
----------------------------------------------------------------------
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 2dc180b..f90b354 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <cxf:bus>
         <cxf:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
index 2987caa..d248519 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
index 5f67742..464f304 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.3.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation="    
     http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd  
       http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/sc
 hemas/configuration/http-jetty.xsd         
http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
index 3f4d5c0..2810e36 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
            http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.apache.org/transports/http-jetty/configuration             
http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml1" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" 
depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.issuer.Server}/doubleit/services/doubleittransportsaml1";
 wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
         <jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
----------------------------------------------------------------------
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 fb8b505..d228efe 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
----------------------------------------------------------------------
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 4ff0de8..a809c4f 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index b686fc0..adfbcb6 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     
    <bean id="roleClaimsCallbackHandler" 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
index d56bda2..5beba4f 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.1.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     
     <!-- JAX-WS service -->

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
index ae519de..a7aa16a 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.3.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="             
http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd   
          http://cxf.apache.org/configuration/security             
http://cxf.apache.org/schemas/configuration/security.xsd             
http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd 
      http://cxf.apache.org/jaxrs             
http://cxf.apache.org/schemas/jaxrs.xsd      
http://cxf.apache.org/transports/http/configuration             
http://cxf.apache.org/schemas/configuration/http-conf.xsd             
http://cxf.ap
 ache.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-4.1.xsd";>
     
     <http:conduit name="https://localhost.*";>
         <http:tlsClientParameters disableCNCheck="true">

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
index 1b76f04..4aebd38 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.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";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd";>
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f8c16/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
----------------------------------------------------------------------
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 c18ad2e..ad5fe8e 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="         
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-4.3.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/conf
 iguration         http://cxf.apache.org/schemas/configuration/http-jetty.xsd   
      http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd 
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:sec="http://cxf.apache.org/configuration/security"; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; 
xmlns:test="http://apache.org/hello_world_soap_http"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:util="http://www.springframework.org/schema/util"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="         
http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd       
  http://www.springframework.org/schema/beans         
http://www.springframework.org/schema/beans/spring-beans-4.1.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/conf
 iguration         http://cxf.apache.org/schemas/configuration/http-jetty.xsd   
      http://www.springframework.org/schema/util         
http://www.springframework.org/schema/util/spring-util-4.3.xsd 
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd";>
     
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     

Reply via email to