http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
index e9e4734..fcefef7 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsa="http://cxf.apache.org/ws/addressing"; 
xmlns:wsp2006="http://www.w3.org/2006/07/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsa="http://cxf.apache.org/ws/addressing"; 
xmlns:wsp2006="http://www.w3.org/2006/07/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
index b3ddebb..649f1eb 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsa="http://cxf.apache.org/ws/addressing"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsa="http://cxf.apache.org/ws/addressing"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
index beaa9fb..a179ae1 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
index 046c92b..9531eeb 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
index e130333..66175e1 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
index 5f87f43..f51341f 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-addr-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-addr-server.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-addr-server.xml
index e61466c..decd623 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-addr-server.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-addr-server.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
     <bean id="org.apache.cxf.ws.policy.PolicyEngine" 
class="org.apache.cxf.ws.policy.PolicyEngineImpl">
         <property name="bus" ref="cxf"/>
         <property name="enabled" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
index e773a68..cb06355 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
     <bean id="org.apache.cxf.ws.policy.PolicyEngine" 
class="org.apache.cxf.ws.policy.PolicyEngineImpl">
         <property name="bus" ref="cxf"/>
         <property name="enabled" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
index b6433f1..5b8b09c 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schema/transports/http.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean id="org.apache.cxf.ws.policy.PolicyEngine" 
class="org.apache.cxf.ws.policy.PolicyEngineImpl">
         <property name="bus" ref="cxf"/>
         <property name="enabled" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
index d72e539..5f7b553 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http_client_policy_feature.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:cxf="http://cxf.apache.org/core"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:client name="{http://cxf.apache.org/greeter_control}GreeterPort"; 
createdFromAPI="true">
         <jaxws:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
index c3f6ce2..b12b9c3 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; 
xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; 
xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
index 247e6a0..de1bccc 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; 
xsi:schemaLocation=" http://www.w3.org/ns/ws-policy 
http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; 
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; 
xsi:schemaLocation=" http://www.w3.org/ns/ws-policy 
http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";
 >
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
index 5148ffa..0c6f6ae 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:p="http://cxf.apache.org/policy"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" 
http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd 
http://cxf.apache.org/ws/addressing 
http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws 
http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/policy 
http://cxf.apache.org/schemas/policy.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
index c067794..de3c9dd 100644
--- 
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
+++ 
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
@@ -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:http="http://cxf.apache.org/transports/http/configuration"; 
xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xsi:schemaLocation=" http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <http:conduit 
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
         <http:client 
DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml 
b/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
index 3cc175e..e6eb3a2 100644
--- a/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.xml
+++ b/systests/wsdl_maven/java2ws/src/main/webapp/WEB-INF/beans.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"; xsi:schemaLocation="         
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd         
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation="         
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd         
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
     <jaxws:endpoint id="helloWorld" 
implementor="net.lr.java2wstest.HelloWorldImpl" address="/HelloWorld"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/tools/javato/ws/src/main/java/META-INF/cxf/java2wsbeans.xml
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/META-INF/cxf/java2wsbeans.xml 
b/tools/javato/ws/src/main/java/META-INF/cxf/java2wsbeans.xml
index c658b70b..c467872 100644
--- a/tools/javato/ws/src/main/java/META-INF/cxf/java2wsbeans.xml
+++ b/tools/javato/ws/src/main/java/META-INF/cxf/java2wsbeans.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"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean id="JaxwsServiceBuilderBean" 
class="org.apache.cxf.jaxws.JaxwsServiceBuilder" scope="prototype"/>
     <bean id="SimpleServiceBuilderBean" 
class="org.apache.cxf.simple.SimpleServiceBuilder" scope="prototype"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/123ef5ed/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml 
b/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml
index b87df2d..7eb44e1 100644
--- a/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml
+++ b/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.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"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd";>
     <bean id="AegisDatabindingBean" 
class="org.apache.cxf.aegis.databinding.AegisDatabinding">
         <property name="configuration">
             <bean class="org.apache.cxf.aegis.type.TypeCreationOptions">

Reply via email to