This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7a4d050312ad6b84f40cd91ca46e0c5f576f2e7a
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Feb 13 12:05:25 2018 +0000

    Removed Sun xmlns:jaxws namespace where it's not needed
    
    (cherry picked from commit 1b0714bd091d731a9c02a2b451192a3f6765161a)
    
    # Conflicts:
    #   
distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
    #   
rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
    #   
rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
    #   
rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
    #   
rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
    #   
rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
    #   
systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
    #   
systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
    #   
systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
    #   
systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
    #   
systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
    #   
systests/transports/src/test/java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java
    #   
systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.xml
---
 .../samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml      | 2 +-
 .../test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml | 2 +-
 .../transport/http_jetty/server-engine-factory-jetty9-connector.xml   | 2 +-
 .../org/apache/cxf/transport/http_jetty/server-engine-factory.xml     | 2 +-
 .../java/org/apache/cxf/transport/http_undertow/invalid-engines.xml   | 2 +-
 .../org/apache/cxf/transport/http_undertow/server-engine-factory.xml  | 2 +-
 .../src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf     | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf    | 1 -
 .../java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf     | 1 -
 .../apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf   | 1 -
 .../java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf  | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf  | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf   | 1 -
 .../test/java/org/apache/cxf/systest/http/resources/SessionServer.xml | 2 +-
 .../org/apache/cxf/systest/http/resources/SessionServer_Windows.xml   | 2 +-
 .../src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf     | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf    | 1 -
 .../java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf     | 1 -
 .../apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf   | 1 -
 .../java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf  | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf  | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf    | 1 -
 .../src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf   | 1 -
 .../test/java/org/apache/cxf/systest/http/resources/SessionServer.xml | 2 +-
 .../org/apache/cxf/systest/http/resources/SessionServer_Windows.xml   | 2 +-
 .../src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf    | 1 -
 .../org/apache/cxf/systest/http_undertow/undertow-engine.xml          | 2 +-
 .../java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java    | 4 ++--
 .../src/test/resources/org/apache/cxf/systest/http/Abost.cxf          | 1 -
 .../org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf         | 1 -
 .../test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf  | 1 -
 .../src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf         | 1 -
 .../src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf       | 1 -
 .../src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf        | 1 -
 .../test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.xml | 2 +-
 .../test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf    | 1 -
 .../org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf       | 1 -
 .../src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf | 1 -
 .../test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf    | 1 -
 .../test/resources/org/apache/cxf/systest/https/conduit/Mortimer.cxf  | 1 -
 .../test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf    | 1 -
 .../test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf    | 1 -
 50 files changed, 14 insertions(+), 51 deletions(-)

diff --git 
a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
 
b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
index bcb55c7..f69f50e 100644
--- 
a/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
+++ 
b/distribution/src/main/release/samples/oauth/server/src/main/webapp/WEB-INF/oauth-beans.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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://java.sun.com/xml/ns/jaxws"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; 
xsi:schemaLocation="http://cxf.apache. [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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:jaxrs="http://cxf.apache.org/jaxrs"; 
xsi:schemaLocation="http://cxf.apache.org/configuration/security                
      [...]
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
     <!-- Publish OAuth endpoints-->
diff --git 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
index ead3647..23d9ecb 100644
--- 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
+++ 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/secu [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.or [...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="1234">
             <httpj:tlsServerParameters>
diff --git 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
index 84998cb..ef17fde 100644
--- 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.xml
+++ 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory-jetty9-connector.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="1234">
             <httpj:connector>
diff --git 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
index f10752e..f8e3bc3 100644
--- 
a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.xml
+++ 
b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/server-engine-factory.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="1234">
             <httpj:tlsServerParameters>
diff --git 
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
 
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
index 80252e6..7079b42 100644
--- 
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
+++ 
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/invalid-engines.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/s [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
xmlns:beans="http://www.springframework.org/schema/beans"; 
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:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache [...]
     <httpu:engine-factory bus="cxf">
         <httpu:engine port="1234">
             <httpu:tlsServerParameters>
diff --git 
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
 
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
index d634930..4ec64a8 100644
--- 
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.xml
+++ 
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/server-engine-factory.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:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schema [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http:// 
[...]
     <httpu:engine-factory bus="cxf">
         <httpu:engine port="1234">
             <httpu:tlsServerParameters>
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
index 8259727..adf3650 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
@@ -28,7 +28,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
index 2bd44fc..a20c998 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
index 77a6b83..d1682b9 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
index 7618280..e24f6b8 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
index d1be4eb..c724b4a 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
index e9bd45a..25234a2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
@@ -27,7 +27,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
index 4d0101a..65387e2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
index be51f8d..6aba099 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
index 4a26c85..ba078b3 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
index 2d03409..bce15b1 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
index 7d15645..8b13dbb 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
index 547c99a..90d51cd 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="9020">
             <httpj:sessionSupport>true</httpj:sessionSupport>
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
index ec3cdd9..02bc6ae 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="9020">
             <httpj:sessionSupport>true</httpj:sessionSupport>
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
index 2a66438..7f82846 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
index 8259727..adf3650 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
@@ -28,7 +28,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
index 7c2251e..f3180ca 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
index a486669..fbe5a6b 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
index bc86cfa..c53d954 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
index d1be4eb..c724b4a 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
index e9bd45a..25234a2 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
@@ -27,7 +27,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
index 4d0101a..65387e2 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
index 6736abf..d4ea76d 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
index 4a26c85..ba078b3 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
index 2d3998e..d10ed0a 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
index 7d15645..8b13dbb 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
index 547c99a..90d51cd 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="9020">
             <httpj:sessionSupport>true</httpj:sessionSupport>
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
index ec3cdd9..02bc6ae 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="9020">
             <httpj:sessionSupport>true</httpj:sessionSupport>
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
index 195a868..001659e 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
 
b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
index 6a5f814..fa7fd25 100644
--- 
a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
+++ 
b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/undertow-engine.xml
@@ -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:sec="http://cxf.apache.org/configuration/security"; 
xmlns:http="http://cxf.apache.org/transports/http/configuration"; 
xmlns:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schema [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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:httpu="http://cxf.apache.org/transports/http-undertow/configuration"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http:// 
[...]
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <httpu:engine-factory bus="cxf">
         <httpu:engine port="${testutil.ports.EngineLifecycleTest.2}">
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java
index b952716..644f7b8 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/resolver/ResolverTest.java
@@ -45,10 +45,10 @@ public class ResolverTest extends 
AbstractBusClientServerTestBase {
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/resolver");
 
-        String warPath = null;
         URL res = getClass().getResource("/resolver");
-        warPath = res.toURI().getPath();
         
+        String warPath = res.toURI().getPath();
+
         webappcontext.setWar(warPath);
 
         HandlerCollection handlers = new HandlerCollection();
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
index a250d5d..c06dbea 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
@@ -28,7 +28,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
index 521cb0e..e13be7d 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
index e9bd45a..25234a2 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
@@ -27,7 +27,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
index 3114e0d..a8f5b00 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
index 4a26c85..ba078b3 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
index c4da8f3..2c6393c 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.xml
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.xml
index b8069ac..6c66294 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.xml
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-engine.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: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://java.sun.com/xml/ns/jaxws"; xsi:schemaLocation="             
       http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/c [...]
+<beans xmlns="http://www.springframework.org/schema/beans"; 
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"; 
xsi:schemaLocation="                    
http://cxf.apache.org/configuration/security                       
http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf 
[...]
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <httpj:engine-factory bus="cxf">
         <httpj:engine port="${testutil.ports.EngineLifecycleTest.2}">
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
index c1a0d65..83e6d4a 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
@@ -30,7 +30,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
     http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
                   http://cxf.apache.org/configuration/security
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf
index 47e7dfe..d670f91 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf
@@ -22,7 +22,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
index 61a59dd..8986a20 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
index e6db5ff..28e4e81 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Mortimer.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Mortimer.cxf
index 4a26c85..ba078b3 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Mortimer.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Mortimer.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
index 090418d..5a376b4 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd
diff --git 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
index 7dc8dc0..4cb4856 100644
--- 
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
+++ 
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
@@ -29,7 +29,6 @@
   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://java.sun.com/xml/ns/jaxws";
   xsi:schemaLocation="
                   http://cxf.apache.org/configuration/security
                      http://cxf.apache.org/schemas/configuration/security.xsd

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.

Reply via email to