Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Thu, 11 Dec 2014 10:37:30 -0000
Message-Id: <b9228a687aa947b4aadb638653dd499f@git.apache.org>
In-Reply-To: <9598634c3dac47fc8a92f834c9a54678@git.apache.org>
References: <9598634c3dac47fc8a92f834c9a54678@git.apache.org>
Subject: [4/4] cxf git commit: Finished transports refactor

Finished transports refactor


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

Branch: refs/heads/master
Commit: d7f7c7cf3e41a6fbd14b71f00da2b9e5adb30d06
Parents: bf8ca4b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Dec 11 10:33:46 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Dec 11 10:33:46 2014 +0000

----------------------------------------------------------------------
 .../src/test/java/digestauth/WEB-INF/beans.xml  |  29 --
 .../src/test/java/digestauth/WEB-INF/web.xml    |  49 ---
 .../org/apache/cxf/systest/http/BareServer.java |   4 +-
 .../org/apache/cxf/systest/http/BusServer.java  |   2 -
 .../org/apache/cxf/systest/http/Server.java     |   4 +-
 .../apache/cxf/systest/http/SessionServer.java  |   4 +-
 .../apache/cxf/systest/http/TrustHandler.java   |   7 +-
 .../cxf/systest/http/auth/DigestServer.java     |   2 -
 .../http_jetty/JettyBasicAuthServer.java        |   2 -
 .../apache/cxf/systest/http_jetty/Server.java   |   2 -
 .../ClientServerWrappedContinuationTest.java    |   2 -
 .../HelloImplWithWrapppedContinuation.java      |   2 +-
 .../systest/http_jetty/continuations/cxf.xml    |  24 --
 .../http_jetty/continuations/cxf_https.xml      |  36 --
 .../http_jetty/continuations/jaxws-server.xml   |  47 ---
 .../http_jetty/continuations/jetty-engine.xml   |  24 --
 .../systest/http_jetty/continuations/test.wsdl  | 100 -----
 .../org/apache/cxf/systest/http_jetty/cxf.xml   |  24 --
 .../cxf/systest/http_jetty/jetty-engine.xml     |  45 ---
 .../systest/http_jetty/jetty-realm.properties   |  20 -
 .../systest/http_jetty/jettyBasicAuthServer.xml |  49 ---
 .../systest/http_jetty/jettyDigestServer.xml    |  50 ---
 .../http_jetty/server-lifecycle-beans.xml       |  47 ---
 .../apache/cxf/systest/http_jetty/server.xml    |  27 --
 .../org/apache/cxf/systest/http_jetty/test.html |  23 --
 .../cxf/systest/local_transport/Server.java     |   2 -
 .../cxf/systest/servlet/GreeterMessage.xml      |  24 --
 .../systest/servlet/NoSpringServletServer.java  |   2 -
 .../java/org/apache/cxf/systest/servlet/add.xml |  22 --
 .../apache/cxf/systest/servlet/cxf-jaxrs.xml    |  29 --
 .../apache/cxf/systest/servlet/cxf-servlet.xml  |  38 --
 .../apache/cxf/systest/servlet/hello_world.js   |  50 ---
 .../apache/cxf/systest/servlet/hello_world.wsdl | 377 -------------------
 .../systest/servlet/hello_world_includes.xsd    | 150 --------
 .../systest/servlet/hello_world_includes2.xsd   |  34 --
 .../servlet/hello_world_xml_wrapped.wsdl        | 148 --------
 .../cxf/systest/servlet/spring-auto-launch.xml  |  26 --
 .../apache/cxf/systest/servlet/spring-error.xml |  32 --
 .../apache/cxf/systest/servlet/spring-js.xml    |  29 --
 .../org/apache/cxf/systest/servlet/spring.xml   |  34 --
 .../apache/cxf/systest/servlet/test_import.xsd  |  37 --
 .../org/apache/cxf/systest/servlet/update.xml   |  23 --
 .../apache/cxf/systest/servlet/web-external.xml |  41 --
 .../apache/cxf/systest/servlet/web-filter.xml   |  51 ---
 .../org/apache/cxf/systest/servlet/web-js.xml   |  45 ---
 .../systest/servlet/web-spring-auto-launch.xml  |  49 ---
 .../cxf/systest/servlet/web-spring-error.xml    |  45 ---
 .../apache/cxf/systest/servlet/web-spring.xml   |  49 ---
 .../java/org/apache/cxf/systest/servlet/web.xml |  41 --
 .../org/apache/cxf/systest/soap_udp/Server.java |   2 -
 .../src/test/java/resolver/WEB-INF/beans.xml    |  26 --
 .../src/test/java/resolver/WEB-INF/web.xml      |  33 --
 .../java/resolver/WEB-INF/wsdl/hello_world.wsdl | 377 -------------------
 .../test/resources/digestauth/WEB-INF/beans.xml |  29 ++
 .../test/resources/digestauth/WEB-INF/web.xml   |  49 +++
 .../systest/http_jetty/continuations/cxf.xml    |  24 ++
 .../http_jetty/continuations/cxf_https.xml      |  36 ++
 .../http_jetty/continuations/jaxws-server.xml   |  47 +++
 .../http_jetty/continuations/jetty-engine.xml   |  24 ++
 .../systest/http_jetty/continuations/test.wsdl  | 100 +++++
 .../org/apache/cxf/systest/http_jetty/cxf.xml   |  24 ++
 .../cxf/systest/http_jetty/jetty-engine.xml     |  45 +++
 .../systest/http_jetty/jetty-realm.properties   |  20 +
 .../systest/http_jetty/jettyBasicAuthServer.xml |  49 +++
 .../systest/http_jetty/jettyDigestServer.xml    |  50 +++
 .../http_jetty/server-lifecycle-beans.xml       |  47 +++
 .../apache/cxf/systest/http_jetty/server.xml    |  27 ++
 .../org/apache/cxf/systest/http_jetty/test.html |  23 ++
 .../cxf/systest/servlet/GreeterMessage.xml      |  24 ++
 .../org/apache/cxf/systest/servlet/add.xml      |  22 ++
 .../apache/cxf/systest/servlet/cxf-jaxrs.xml    |  29 ++
 .../apache/cxf/systest/servlet/cxf-servlet.xml  |  38 ++
 .../apache/cxf/systest/servlet/hello_world.js   |  50 +++
 .../apache/cxf/systest/servlet/hello_world.wsdl | 377 +++++++++++++++++++
 .../systest/servlet/hello_world_includes.xsd    | 150 ++++++++
 .../systest/servlet/hello_world_includes2.xsd   |  34 ++
 .../servlet/hello_world_xml_wrapped.wsdl        | 148 ++++++++
 .../cxf/systest/servlet/spring-auto-launch.xml  |  26 ++
 .../apache/cxf/systest/servlet/spring-error.xml |  32 ++
 .../apache/cxf/systest/servlet/spring-js.xml    |  29 ++
 .../org/apache/cxf/systest/servlet/spring.xml   |  34 ++
 .../apache/cxf/systest/servlet/test_import.xsd  |  37 ++
 .../org/apache/cxf/systest/servlet/update.xml   |  23 ++
 .../apache/cxf/systest/servlet/web-external.xml |  41 ++
 .../apache/cxf/systest/servlet/web-filter.xml   |  51 +++
 .../org/apache/cxf/systest/servlet/web-js.xml   |  45 +++
 .../systest/servlet/web-spring-auto-launch.xml  |  49 +++
 .../cxf/systest/servlet/web-spring-error.xml    |  45 +++
 .../apache/cxf/systest/servlet/web-spring.xml   |  49 +++
 .../org/apache/cxf/systest/servlet/web.xml      |  41 ++
 .../test/resources/resolver/WEB-INF/beans.xml   |  26 ++
 .../src/test/resources/resolver/WEB-INF/web.xml |  33 ++
 .../resolver/WEB-INF/wsdl/hello_world.wsdl      | 377 +++++++++++++++++++
 93 files changed, 2411 insertions(+), 2434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml b/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml
deleted file mode 100644
index b865cf8..0000000
--- a/systests/transports/src/test/java/digestauth/WEB-INF/beans.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation="                    http://cxf.apache.org/configuration/security                       http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf.apache.org/transports/http/configuration               http://cxf.apache.org/schemas/configuration/http-conf.xsd            http://cxf.apache.org/transports/http-jetty/configuration               http://cxf.apache.org/schemas/configuration/http-jetty.xsd            http://www.springframework.org/schema/beans               http://www.springframework.org/schema/beans/spring-beans.xsd            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"/>
-    <http:destination name="{http://apache.org/hello_world}Mortimer.http-destination">
-        <!-- Nothing to Configure here for Mortimer -->
-    </http:destination>
-    <bean id="greeterImpl" class="org.apache.cxf.systest.http.auth.GreeterImpl">
-  </bean>
-    <jaxws:endpoint address="/greeter" implementor="#greeterImpl" publish="true"/>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/digestauth/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/digestauth/WEB-INF/web.xml b/systests/transports/src/test/java/digestauth/WEB-INF/web.xml
deleted file mode 100644
index 067e43d..0000000
--- a/systests/transports/src/test/java/digestauth/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-        license agreements. See the NOTICE file distributed with this work for additional 
-        information regarding copyright ownership. The ASF licenses this file to 
-        you under the Apache License, Version 2.0 (the "License"); you may not use 
-        this file except in compliance with the License. You may obtain a copy of 
-        the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-        by applicable law or agreed to in writing, software distributed under the 
-        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-        OF ANY KIND, either express or implied. See the License for the specific 
-        language governing permissions and limitations under the License. -->
-<web-app>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-    <listener>
-        <listener-class>
-                        org.springframework.web.context.ContextLoaderListener
-                </listener-class>
-    </listener>
-    <servlet>
-        <servlet-name>CXFServlet</servlet-name>
-        <display-name>CXF Servlet</display-name>
-        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>CXFServlet</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>CXFServlet</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <role-name>ROLE_USER</role-name>
-        </auth-constraint>
-    </security-constraint>
-    <login-config>
-        <auth-method>DIGEST</auth-method>
-        <realm-name>BookStoreRealm</realm-name>
-    </login-config>
-    <security-role>
-        <role-name>ROLE_USER</role-name>
-    </security-role>
-</web-app>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
index 20ac283..b2d3a92 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
@@ -46,14 +46,12 @@ public class BareServer extends AbstractBusTestServerBase {
     
     public static void main(String[] args) {
         try {
-            System.out.println("!!!!start");
+            // System.out.println("!!!!start");
             BareServer s = new BareServer();
             s.start();
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
index fa0eae3..6b4fce3 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
@@ -68,8 +68,6 @@ public class BusServer extends AbstractBusTestServerBase {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
index ab20326..9420f49 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
@@ -93,9 +93,7 @@ public class Server extends AbstractBusTestServerBase {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } /*finally {
-            System.out.println("done!");
-        } */
+        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
index df1fa53..ff1851b 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
@@ -46,14 +46,12 @@ public class SessionServer extends AbstractBusTestServerBase {
     
     public static void main(String[] args) {
         try {
-            System.out.println("!!!!start");
+            // System.out.println("!!!!start");
             SessionServer s = new SessionServer();
             s.start();
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java
index 6fcf440..01b60af 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java
@@ -20,11 +20,9 @@
 package org.apache.cxf.systest.http;
 
 import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.http.HttpURLConnectionInfo;
 import org.apache.cxf.transport.http.MessageTrustDecider;
 import org.apache.cxf.transport.http.URLConnectionInfo;
 import org.apache.cxf.transport.http.UntrustedURLConnectionIOException;
-import org.apache.cxf.transport.https.HttpsURLConnectionInfo;
 
 public class TrustHandler
     extends MessageTrustDecider {
@@ -42,10 +40,10 @@ public class TrustHandler
         System.out.println("Trust decision for conduit: "
                 + conduitName + " and " 
                 + connectionInfo.getURI());
-        if (connectionInfo instanceof HttpURLConnectionInfo) {
+        /*if (connectionInfo instanceof HttpURLConnectionInfo) {
             HttpURLConnectionInfo c = (HttpURLConnectionInfo) connectionInfo;
             System.out.println("Http method: " 
-                    + c.getHttpRequestMethod() + " on " + c.getURI());
+                   + c.getHttpRequestMethod() + " on " + c.getURI());
         }
         if (connectionInfo instanceof HttpsURLConnectionInfo) {
             HttpsURLConnectionInfo c = (HttpsURLConnectionInfo) connectionInfo;
@@ -54,6 +52,7 @@ public class TrustHandler
             System.out.println("Local Principal: " + c.getLocalPrincipal());
             System.out.println("Peer Principal: " + c.getPeerPrincipal());
         }
+        */
         //throw new UntrustedURLConnectionIOException("No Way Jose"); 
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
index 6630672..1571dab 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
@@ -89,8 +89,6 @@ public class DigestServer extends AbstractBusTestServerBase {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
index 2df7f12..ae26721 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
@@ -65,8 +65,6 @@ public class JettyBasicAuthServer extends AbstractBusTestServerBase  {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally { 
-            System.out.println("done!");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
index 7fef19e..bd566ff 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
@@ -60,8 +60,6 @@ public class Server extends AbstractBusTestServerBase  {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally { 
-            System.out.println("done!");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
index debf3e4..9f10554 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
@@ -69,8 +69,6 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
             } catch (Exception ex) {
                 ex.printStackTrace();
                 System.exit(-1);
-            } finally {
-                System.out.println("done!");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
index ef79fa0..0faac5c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
@@ -68,7 +68,7 @@ public class HelloImplWithWrapppedContinuation implements HelloContinuation {
                     String surname = continuation.getObject().toString();
                     sb.append(' ').append(surname);
                 }
-                System.out.println("Saying hi to " + sb.toString());
+                // System.out.println("Saying hi to " + sb.toString());
                 return "Hi " + sb.toString();
             }
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml
deleted file mode 100644
index 2e67318..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation="        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <http:conduit name="{http://cxf.apache.org/systest/jaxws}HelloContinuationPort.http-conduit">
-        <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
-    </http:conduit>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
deleted file mode 100644
index 7935ae7..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd ">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <!-- -->
-    <!-- HTTP/S configuration for clients -->
-    <!-- -->
-    <http:conduit name="https://localhost:.*">
-        <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
-        <http:tlsClientParameters disableCNCheck="true">
-            <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
-            </sec:keyManagers>
-            <sec:trustManagers>
-                <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
-            </sec:trustManagers>
-        </http:tlsClientParameters>
-    </http:conduit>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
deleted file mode 100644
index 9c9ef8d..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd         ">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <!-- -->
-    <!-- This Spring config file is designed to represent a minimal -->
-    <!-- configuration for spring-loading a CXF servant, where the -->
-    <!-- servant listens using HTTP/S as the transport protocol. -->
-    <!-- -->
-    <!-- Note that the service endpoint is spring-loaded.  In the -->
-    <!-- scenario in which this config is designed to run, the -->
-    <!-- server application merely instantiates a Bus, and does not -->
-    <!-- publish any services programmatically -->
-    <!-- -->
-    <!-- -->
-    <!-- TLS Port configuration parameters for port 9091 -->
-    <!-- -->
-    <httpj:engine-factory>
-        <httpj:engine port="${testutil.ports.Server.1}">
-            <httpj:tlsServerParameters>
-                <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
-                </sec:keyManagers>
-                <sec:trustManagers>
-                    <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
-                </sec:trustManagers>
-            </httpj:tlsServerParameters>
-        </httpj:engine>
-    </httpj:engine-factory>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml
deleted file mode 100644
index 2ffc615..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation="            http://cxf.apache.org/transports/http-jetty/configuration               http://cxf.apache.org/schemas/configuration/http-jetty.xsd            http://www.springframework.org/schema/beans                http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <httpj:engine-factory bus="cxf">
-        <httpj:engine port="9091" continuationsEnabled="true"/>
-    </httpj:engine-factory>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl
deleted file mode 100644
index ef98bea..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<wsdl:definitions xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/systest/jaxws" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HelloContinuationService" targetNamespace="http://cxf.apache.org/systest/jaxws">
-    <wsdl:message name="isRequestSuspended">
-        <wsdl:part name="arg0" type="xsd:string">
-    </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part name="return" type="xsd:string">
-    </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="sayHi">
-        <wsdl:part name="arg0" type="xsd:string">
-    </wsdl:part>
-        <wsdl:part name="arg1" type="xsd:string">
-    </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="resumeRequestResponse">
-  </wsdl:message>
-    <wsdl:message name="isRequestSuspendedResponse">
-        <wsdl:part name="return" type="xsd:boolean">
-    </wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="resumeRequest">
-        <wsdl:part name="arg0" type="xsd:string">
-    </wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="HelloContinuation">
-        <wsdl:operation name="isRequestSuspended">
-            <wsdl:input message="tns:isRequestSuspended" name="isRequestSuspended">
-    </wsdl:input>
-            <wsdl:output message="tns:isRequestSuspendedResponse" name="isRequestSuspendedResponse">
-    </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="resumeRequest">
-            <wsdl:input message="tns:resumeRequest" name="resumeRequest">
-    </wsdl:input>
-            <wsdl:output message="tns:resumeRequestResponse" name="resumeRequestResponse">
-    </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHi" name="sayHi">
-    </wsdl:input>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
-    </wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="HelloContinuationServiceSoapBinding" type="tns:HelloContinuation">
-        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="isRequestSuspended">
-            <soap:operation soapAction="" style="rpc"/>
-            <wsdl:input name="isRequestSuspended">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="isRequestSuspendedResponse">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="resumeRequest">
-            <soap:operation soapAction="" style="rpc"/>
-            <wsdl:input name="resumeRequest">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="resumeRequestResponse">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="rpc"/>
-            <wsdl:input name="sayHi">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body namespace="http://cxf.apache.org/systest/jaxws" use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="HelloContinuationService">
-        <wsdl:port binding="tns:HelloContinuationServiceSoapBinding" name="HelloContinuationPort">
-            <soap:address location="https://localhost:9091/hellocontinuation"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
deleted file mode 100644
index ae0701b..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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">
-    <http:conduit name="*.http-conduit">
-        <http:client AllowChunking="false" Connection="close"/>
-    </http:conduit>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
deleted file mode 100644
index b8069ac..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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/configuration/security.xsd            http://cxf.apache.org/transports/http/configuration               http://cxf.apache.org/schemas/configuration/http-conf.xsd            http://cxf.apache.org/transports/http-jetty/configuration               http://cxf.apache.org/schemas/configuration/http-jetty.xsd            http://www.springframework.org/schema/beans               http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <httpj:engine-factory bus="cxf">
-        <httpj:engine port="${testutil.ports.EngineLifecycleTest.2}">
-            <httpj:handlers>
-                <bean class="org.eclipse.jetty.webapp.WebAppContext">
-                    <constructor-arg value="."/>
-                    <constructor-arg value="/jsunit"/>
-                </bean>
-                <bean class="org.eclipse.jetty.server.handler.ContextHandler">
-                    <property name="contextPath" value="/"/>
-                    <property name="handler">
-                        <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
-                            <property name="baseResource">
-                                <bean class="org.eclipse.jetty.util.resource.FileResource">
-                                    <constructor-arg value="${staticResourceURL}"/>
-                                </bean>
-                            </property>
-                        </bean>
-                    </property>
-                </bean>
-                <bean class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-            </httpj:handlers>
-        </httpj:engine>
-    </httpj:engine-factory>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties
deleted file mode 100644
index 974aae2..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-## 
-## http://www.apache.org/licenses/LICENSE-2.0
-## 
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Defines users that can access the web (console, demo, etc.)
-# username: password [,rolename ...]
-ffang: pswd, admin

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
deleted file mode 100644
index be7a4f5..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <httpj:engine-factory bus="cxf">
-        <httpj:engine port="${testutil.ports.JettyBasicAuthServer}">
-            <httpj:handlers>
-                <bean class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-                    <property name="loginService" ref="securityLoginService"/>
-                    <property name="constraintMappings">
-                        <list>
-                            <ref bean="securityConstraintMapping"/>
-                        </list>
-                    </property>
-                </bean>
-            </httpj:handlers>
-        </httpj:engine>
-    </httpj:engine-factory>
-    <bean id="securityLoginService" class="org.eclipse.jetty.security.HashLoginService">
-        <property name="name" value="WSRealm"/>
-        <property name="config" value="src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties"/>
-    </bean>
-    <bean id="securityConstraint" class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="BASIC"/>
-        <property name="roles" value="admin"/>
-        <property name="authenticate" value="true"/>
-    </bean>
-    <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="securityConstraint"/>
-        <property name="pathSpec" value="/*"/>
-    </bean>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
deleted file mode 100644
index 47e5592..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <httpj:engine-factory bus="cxf">
-        <httpj:engine port="${testutil.ports.JettyDigestAuthTest}">
-            <httpj:handlers>
-                <bean class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-                    <property name="loginService" ref="securityLoginService"/>
-                    <property name="authMethod" value="DIGEST"/>
-                    <property name="constraintMappings">
-                        <list>
-                            <ref bean="securityConstraintMapping"/>
-                        </list>
-                    </property>
-                </bean>
-            </httpj:handlers>
-        </httpj:engine>
-    </httpj:engine-factory>
-    <bean id="securityLoginService" class="org.eclipse.jetty.security.HashLoginService">
-        <property name="name" value="WSRealm"/>
-        <property name="config" value="src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties"/>
-    </bean>
-    <bean id="securityConstraint" class="org.eclipse.jetty.util.security.Constraint">
-        <property name="name" value="DIGEST"/>
-        <property name="roles" value="admin"/>
-        <property name="authenticate" value="true"/>
-    </bean>
-    <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
-        <property name="constraint" ref="securityConstraint"/>
-        <property name="pathSpec" value="/*"/>
-    </bean>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
deleted file mode 100644
index 4c4c30b..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-        license agreements. See the NOTICE file distributed with this work for additional 
-        information regarding copyright ownership. The ASF licenses this file to 
-        you under the Apache License, Version 2.0 (the "License"); you may not use 
-        this file except in compliance with the License. You may obtain a copy of 
-        the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-        by applicable law or agreed to in writing, software distributed under the 
-        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-        OF ANY KIND, either express or implied. See the License for the specific 
-        language governing permissions and limitations under the License. -->
-<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:httpj="http://cxf.apache.org/transports/http-jetty/configuration" 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         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd  ">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype">
-        <property name="configuration">
-            <bean class="org.apache.cxf.aegis.type.TypeCreationOptions">
-                <property name="defaultMinOccurs" value="1"/>
-                <property name="defaultNillable" value="false"/>
-            </bean>
-        </property>
-    </bean>
-    <!-- define a service factory that supports both JAX-WS annotations and 
-                also Aegis files. -->
-    <bean id="jaxws-and-aegis-service-factory" class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean" scope="prototype">
-        <property name="dataBinding" ref="aegisBean"/>
-    </bean>
-    <jaxws:endpoint id="dummy-service-endpoint" implementor="org.apache.cxf.systest.http_jetty.Dummy" address="http://localhost:${testutil.ports.EngineLifecycleTest.2}/Dummy">
-        <jaxws:serviceFactory>
-            <ref bean="jaxws-and-aegis-service-factory"/>
-        </jaxws:serviceFactory>
-    </jaxws:endpoint>
-    <jaxws:endpoint id="dummy-8801-service-endpoint" implementor="org.apache.cxf.systest.http_jetty.Dummy" address="http://localhost:${testutil.ports.EngineLifecycleTest.1}/Dummy">
-        <jaxws:serviceFactory>
-            <ref bean="jaxws-and-aegis-service-factory"/>
-        </jaxws:serviceFactory>
-    </jaxws:endpoint>
-    <bean id="dummy-client" class="org.apache.cxf.systest.http_jetty.DummyInterface" factory-bean="clientFactory" factory-method="create"/>
-    <bean id="clientFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
-        <property name="serviceClass" value="org.apache.cxf.systest.http_jetty.DummyInterface"/>
-        <property name="address" value="http://localhost:${testutil.ports.EngineLifecycleTest.2}/Dummy"/>
-    </bean>
-    <bean id="dummy-client-8801" class="org.apache.cxf.systest.http_jetty.DummyInterface" factory-bean="clientFactory-8801" factory-method="create"/>
-    <bean id="clientFactory-8801" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
-        <property name="serviceClass" value="org.apache.cxf.systest.http_jetty.DummyInterface"/>
-        <property name="address" value="http://localhost:${testutil.ports.EngineLifecycleTest.1}/Dummy"/>
-    </bean>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
deleted file mode 100644
index edc34ad..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http-jetty="http://cxf.apache.org/transports/http-jetty/configuration" xsi:schemaLocation=" http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <http-jetty:engine-factory bus="cxf">
-        <http-jetty:engine port="${testutil.ports.org.apache.cxf.systest.http_jetty.Server}">
-            <http-jetty:threadingParameters minThreads="3" maxThreads="${ThreadPoolTest.threads}"/>
-        </http-jetty:engine>
-    </http-jetty:engine-factory>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html
deleted file mode 100644
index 63d3de2..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<body>
-Test
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java
index f627d2e..340441f 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java
@@ -50,8 +50,6 @@ public class Server extends AbstractBusTestServerBase {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml
deleted file mode 100644
index 7b450e9..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
-    <env:Body>
-        <m:sayHi xmlns:m="http://apache.org/hello_world_soap_http/types"/>
-    </env:Body>
-</env:Envelope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
index 2049211..72b8fa9 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
@@ -95,8 +95,6 @@ public class NoSpringServletServer extends AbstractBusTestServerBase {
         } catch (Exception ex) {
             ex.printStackTrace();
             System.exit(-1);
-        } finally {
-            System.out.println("done!");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml
deleted file mode 100644
index 9477205..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<customer xmlns="http://cxf.apache.org/jra">
-    <name>Hadrian</name>
-</customer>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
deleted file mode 100644
index 8d5ef51..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop  http://www.springframework.org/schema/aop/spring-aop.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <jaxrs:server id="bookservice" address="/">
-        <jaxrs:serviceBeans>
-            <ref bean="bookstore"/>
-            <ref bean="bookstoreInterface"/>
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-    <bean id="bookstore" scope="prototype" class="org.apache.cxf.systest.jaxrs.BookStore"/>
-    <bean id="bookstoreInterface" scope="prototype" class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface"/>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
deleted file mode 100644
index 88828eb..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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">
-    <jaxws:endpoint id="greeter1" address="/greeter" implementor="org.apache.hello_world_soap_http.GreeterImpl" wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl"/>
-    <jaxws:endpoint id="greeter2" address="/greeter2" implementor="org.apache.hello_world_xml_http.wrapped.GreeterImpl" wsdlLocation="/org/apache/cxf/systest/servlet/hello_world_xml_wrapped.wsdl"/>
-    <jaxws:endpoint id="greeter3" address="/greeter3" implementor="org.apache.cxf.systest.servlet.CXFServletTest$NoWsdlGreeter">
-        <jaxws:schemaLocations>
-            <jaxws:schemaLocation>/org/apache/cxf/systest/servlet/hello_world_includes.xsd</jaxws:schemaLocation>
-        </jaxws:schemaLocations>
-    </jaxws:endpoint>
-    <jaxws:endpoint id="greeter4" address="/greeter4" implementor="org.apache.cxf.systest.servlet.CXFServletTest$NoWsdlGreeter">
-        <jaxws:schemaLocations>
-            <jaxws:schemaLocation>/org/apache/cxf/systest/servlet/hello_world_includes.xsd</jaxws:schemaLocation>
-        </jaxws:schemaLocations>
-        <jaxws:properties>
-            <entry key="publishedEndpointUrl" value="http://cxf.apache.org/MyGreeter"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:e="http://apache.org/hello_world_soap_http" id="greeter5" address="/greeter5" publishedEndpointUrl="http://cxf.apache.org/publishedEndpointUrl1" implementor="org.apache.hello_world_soap_http.GreeterImpl" wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl" serviceName="e:SOAPService" endpointName="e:SoapPort"/>
-    <jaxws:endpoint xmlns:e="http://apache.org/hello_world_soap_http" id="greeter6" address="/greeter6" publishedEndpointUrl="http://cxf.apache.org/publishedEndpointUrl2" implementor="org.apache.hello_world_soap_http.GreeterImpl" wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl" serviceName="e:SOAPService" endpointName="e:SoapPort1"/>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7f7c7cf/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js
deleted file mode 100644
index 3f92ca2..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var WebServiceProvider = {
-    'wsdlLocation': 'file:../../testutils/target/classes/wsdl/hello_world.wsdl',
-    'serviceName': 'SOAPService',
-    'portName': 'SoapPort',
-    'targetNamespace': 'http://apache.org/hello_world_soap_http',
-    'ServiceMode': 'MESSAGE',
-};
-
-var SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-var ns4 = "http://apache.org/hello_world_soap_http/types";
-
-WebServiceProvider.invoke = function(req) {
-    var resp = req.getImplementation().createDocument(SOAP_ENV, "SOAP-ENV:Envelope", null);
-    var list = req.getElementsByTagNameNS(ns4, "greetMe");
-    var txt, responseNode;
-    if (list.length > 0) {
-        txt = resp.createTextNode("TestGreetMeResponse");
-        responseNode = 'ns4:greetMeResponse';
-    } else {
-        txt = resp.createTextNode("TestSayHiResponse");
-        responseNode = 'ns4:sayHiResponse';
-    }
-    var respType = resp.createElementNS(ns4, "ns4:responseType");
-    respType.insertBefore(txt, null);
-    var gm = resp.createElementNS(ns4, responseNode);
-    gm.insertBefore(respType, null);
-    var sb = resp.createElementNS(SOAP_ENV, "SOAP-ENV:Body");
-    sb.insertBefore(gm, null);
-    resp.getDocumentElement().insertBefore(sb, null);
-    return resp;
-}