cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject cxf git commit: [CXF-7199]drop jetty 8 support for CXF 3.2
Date Thu, 29 Dec 2016 05:10:41 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 03cdee74d -> 73d1f886a


[CXF-7199]drop jetty 8 support for CXF 3.2


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

Branch: refs/heads/master
Commit: 73d1f886ae5265131e8664ee952ffd1cdc82f71a
Parents: 03cdee7
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Thu Dec 29 13:10:28 2016 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Thu Dec 29 13:10:28 2016 +0800

----------------------------------------------------------------------
 parent/pom.xml                                  |   7 -
 .../http_jetty/JettyHTTPDestination.java        |  27 +-
 .../http_jetty/JettyHTTPServerEngine.java       | 189 +++-----
 .../JettyHTTPServerEngineFactory.java           |   7 +-
 rt/transports/websocket/pom.xml                 |  14 -
 .../websocket/WebSocketDestinationFactory.java  |  18 +-
 .../jetty/JettyWebSocketDestination.java        | 435 -------------------
 .../websocket/jetty/JettyWebSocketHandler.java  |   6 +-
 .../jetty/JettyWebSocketDestinationTest.java    |   3 +-
 systests/jaxrs/pom.xml                          |  20 -
 systests/jaxws/pom.xml                          |   6 +-
 11 files changed, 80 insertions(+), 652 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ebe7983..85f8338 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,6 @@
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jettison.version>1.3.8</cxf.jettison.version>
-        <cxf.jetty8.version>8.1.19.v20160209</cxf.jetty8.version>
         <cxf.jetty9.version>9.3.5.v20151012</cxf.jetty9.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
@@ -1973,12 +1972,6 @@
             </properties>
         </profile>
         <profile>
-            <id>jetty8</id>
-            <properties>
-                <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
-            </properties>
-        </profile>
-        <profile>
             <!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
             <id>eclipse.moxy</id>
             <properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
index 16eb0e9..ed64932 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
@@ -23,7 +23,6 @@ import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
@@ -51,6 +50,8 @@ import org.apache.cxf.transport.http_jetty.continuations.JettyContinuationProvid
 import org.apache.cxf.transport.https.CertConstraintsJaxBUtils;
 import org.apache.cxf.transport.servlet.ServletDestination;
 import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 
@@ -282,12 +283,7 @@ public class JettyHTTPDestination extends ServletDestination {
 
         private boolean sendContent(Class<?> type, InputStream c) throws IOException {
             try {
-                out.getClass().getMethod("sendContent", type).invoke(out, c);
-            } catch (InvocationTargetException ioe) {
-                if (ioe.getTargetException() instanceof IOException) {
-                    throw (IOException)ioe.getTargetException();
-                }
-                return false;
+                out.sendContent(c);
             } catch (Exception e) {
                 return false;
             }
@@ -378,19 +374,10 @@ public class JettyHTTPDestination extends ServletDestination {
     
     private Request getCurrentRequest() {
         try {
-            //Jetty 8
-            Object con = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.AbstractHttpConnection",
-                                                    getClass()).getMethod("getCurrentConnection").invoke(null);
-            return (Request)con.getClass().getMethod("getRequest").invoke(con);
-        } catch (Throwable t) {
-            //
-        }
-        try {
-            //Jetty 9
-            Object con = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.HttpConnection",
-                                                    getClass()).getMethod("getCurrentConnection").invoke(null);
-            Object channel = con.getClass().getMethod("getHttpChannel").invoke(con);
-            return (Request)channel.getClass().getMethod("getRequest").invoke(channel);
+            HttpConnection con = HttpConnection.getCurrentConnection();
+            
+            HttpChannel channel = con.getHttpChannel();
+            return channel.getRequest();
         } catch (Throwable t) {
             //
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 67e960b..8bcbbac 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.PropertyUtils;
@@ -54,12 +53,17 @@ import org.apache.cxf.transport.HttpUriMapper;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SessionManager;
+import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
@@ -330,12 +334,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
         Server s = null;
         if (threadPool != null) {
             try {
-                if (!Server.getVersion().startsWith("8")) {
-                    s = Server.class.getConstructor(ThreadPool.class).newInstance(threadPool);
-                } else {
-                    s = new Server();
-                    Server.class.getMethod("setThreadPool", ThreadPool.class).invoke(s, threadPool);
-                }
+                s = new Server(threadPool);
             } catch (Exception e) {
                 //ignore
             }
@@ -343,33 +342,30 @@ public class JettyHTTPServerEngine implements ServerEngine {
         if (s == null) {
             s = new Server();
         }
-        if (!Server.getVersion().startsWith("8")) {
-            //need an error handler that won't leak information about the exception 
-            //back to the client.
-            ErrorHandler eh = new ErrorHandler() {
-                @SuppressWarnings("deprecation")
-                public void handle(String target, Request baseRequest, 
-                                   HttpServletRequest request, HttpServletResponse response) 
-                    throws IOException {
-                    String msg = (String)request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
-                    if (StringUtils.isEmpty(msg) || msg.contains("org.apache.cxf.interceptor.Fault")) {
-                        msg = HttpStatus.getMessage(response.getStatus());
-                        request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
-                    }
-                    if (response instanceof Response) {
-                        //need to use the deprecated method to support compiling with Jetty 8
-                        ((Response)response).setStatus(response.getStatus(), msg);
-                    }
-                    super.handle(target, baseRequest, request, response);
+        
+        // need an error handler that won't leak information about the exception
+        // back to the client.
+        ErrorHandler eh = new ErrorHandler() {
+            @SuppressWarnings("deprecation")
+            public void handle(String target, Request baseRequest, HttpServletRequest request,
+                               HttpServletResponse response) throws IOException {
+                String msg = (String)request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
+                if (StringUtils.isEmpty(msg) || msg.contains("org.apache.cxf.interceptor.Fault")) {
+                    msg = HttpStatus.getMessage(response.getStatus());
+                    request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
                 }
-                protected void writeErrorPage(HttpServletRequest request, Writer writer, int code,
-                                              String message, boolean showStacks)
-                    throws IOException {
-                    super.writeErrorPage(request, writer, code, message, false);
+                if (response instanceof Response) {
+                    ((Response)response).setStatusWithReason(response.getStatus(), msg);
                 }
-            };
-            s.addBean(eh);
-        }
+                super.handle(target, baseRequest, request, response);
+            }
+
+            protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message,
+                                          boolean showStacks) throws IOException {
+                super.writeErrorPage(request, writer, code, message, false);
+            }
+        };
+        s.addBean(eh);
         return s;
     }
     
@@ -395,7 +391,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
             if (connector == null) {
                 connector = createConnector(getHost(), getPort());
                 if (LOG.isLoggable(Level.FINER)) {
-                    logConnector(connector);
+                    logConnector((ServerConnector)connector);
                 }
             } 
             server.addConnector(connector);
@@ -549,13 +545,9 @@ public class JettyHTTPServerEngine implements ServerEngine {
         }        
         
         try {
-            Object o = getContainer(server);
-            o.getClass().getMethod("addEventListener", Container.Listener.class).invoke(o, mBeanContainer);
-            if (Server.getVersion().startsWith("8")) {
-                return;
-            }
-            mBeanContainer.getClass().getMethod("beanAdded", Container.class, Object.class)
-                .invoke(mBeanContainer, null, server);
+            Container container = getContainer(server);
+            container.addEventListener(mBeanContainer);
+            mBeanContainer.beanAdded(null, server);
         } catch (RuntimeException rex) {
             throw rex;
         } catch (Exception r) {
@@ -564,8 +556,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
     }
     private void removeServerMBean() {
         try {
-            mBeanContainer.getClass().getMethod("beanRemoved", Container.class, Object.class)
-                .invoke(mBeanContainer, null, server);
+            mBeanContainer.beanRemoved(null, server);
         } catch (RuntimeException rex) {
             throw rex;
         } catch (Exception r) {
@@ -589,9 +580,9 @@ public class JettyHTTPServerEngine implements ServerEngine {
             };
             decorateCXFJettySslSocketConnector(sslcf);
         }
-        AbstractConnector result = null;
-        
-        int major = 8;
+        ServerConnector result = null;
+                
+        int major = 9;
         int minor = 0;
         try {
             String[] version = Server.getVersion().split("\\.");
@@ -601,18 +592,15 @@ public class JettyHTTPServerEngine implements ServerEngine {
             // unparsable version
         }
     
-        if (major >= 9) {
-            result = createConnectorJetty9(sslcf, hosto, porto, major, minor);
-        } else {
-            result = createConnectorJetty8(sslcf, hosto, porto);
-        }        
+        result = (ServerConnector)createConnectorJetty(sslcf, hosto, porto, major, minor);
+         
         
         try {
-            result.getClass().getMethod("setPort", Integer.TYPE).invoke(result, porto);
+            result.setPort(porto);
             if (hosto != null) {
-                result.getClass().getMethod("setHost", String.class).invoke(result, hosto);
+                result.setHost(hosto);
             }
-            result.getClass().getMethod("setReuseAddress", Boolean.TYPE).invoke(result, isReuseAddress());
+            result.setReuseAddress(isReuseAddress());
         } catch (RuntimeException rex) {
             throw rex;
         } catch (Exception ex) {
@@ -622,45 +610,29 @@ public class JettyHTTPServerEngine implements ServerEngine {
         return result;
     }
     
-    AbstractConnector createConnectorJetty9(SslContextFactory sslcf, String hosto, int porto, int major, int minor) {
-        //Jetty 9
+    AbstractConnector createConnectorJetty(SslContextFactory sslcf, String hosto, int porto, int major, int minor) {
         AbstractConnector result = null;
         try {
-            Class<?> configClass = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.HttpConfiguration", 
-                                                              Server.class); 
-            Object httpConfig = configClass.newInstance();
-            httpConfig.getClass().getMethod("setSendServerVersion", Boolean.TYPE)
-                .invoke(httpConfig, getSendServerVersion());
+            HttpConfiguration httpConfig = new HttpConfiguration();
+            httpConfig.setSendServerVersion(getSendServerVersion());
+            HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig);
             
-            Object httpFactory = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.HttpConnectionFactory", 
-                                                            Server.class)
-                                                            .getConstructor(configClass).newInstance(httpConfig); 
-
-            Collection<Object> connectionFactories = new ArrayList<Object>();
-            result = (AbstractConnector)ClassLoaderUtils.loadClass("org.eclipse.jetty.server.ServerConnector", 
-                                                                   Server.class)
-                                                                   .getConstructor(Server.class)
-                                                                   .newInstance(server);
+            Collection<ConnectionFactory> connectionFactories = new ArrayList<ConnectionFactory>();
+            
+            result = new org.eclipse.jetty.server.ServerConnector(server);
             
             if (tlsServerParameters != null) {
-                Class<?> src = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.SecureRequestCustomizer",
-                                                          Server.class);
-                httpConfig.getClass().getMethod("addCustomizer", src.getInterfaces()[0])
-                    .invoke(httpConfig, src.newInstance());
-                Object scf = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.SslConnectionFactory",
-                                                        Server.class).getConstructor(SslContextFactory.class,
-                                                                                     String.class)
-                                                        .newInstance(sslcf, "HTTP/1.1");
+                httpConfig.addCustomizer(new org.eclipse.jetty.server.SecureRequestCustomizer());
+                SslConnectionFactory scf = new SslConnectionFactory(sslcf, "HTTP/1.1");
                 connectionFactories.add(scf);
                 String proto = (major > 9 || (major == 9 && minor >= 3)) ? "SSL" : "SSL-HTTP/1.1";
-                result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result, proto);
+                result.setDefaultProtocol(proto);
             }
             connectionFactories.add(httpFactory);
-            result.getClass().getMethod("setConnectionFactories", Collection.class)
-                .invoke(result, connectionFactories);
+            result.setConnectionFactories(connectionFactories);
             
             if (getMaxIdleTime() > 0) {
-                result.getClass().getMethod("setIdleTimeout", Long.TYPE).invoke(result, Long.valueOf(getMaxIdleTime()));
+                result.setIdleTimeout(Long.valueOf(getMaxIdleTime()));
             }
 
         } catch (RuntimeException rex) {
@@ -670,33 +642,6 @@ public class JettyHTTPServerEngine implements ServerEngine {
         }
         return result;
     }
-    AbstractConnector createConnectorJetty8(SslContextFactory sslcf, String hosto, int porto) {
-        //Jetty 8
-        AbstractConnector result = null;
-        try {
-            if (sslcf == null) { 
-                result = (AbstractConnector)ClassLoaderUtils
-                    .loadClass("org.eclipse.jetty.server.nio.SelectChannelConnector",
-                               Server.class).newInstance();
-            } else {
-                result = (AbstractConnector)ClassLoaderUtils
-                    .loadClass("org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
-                               Server.class).getConstructor(SslContextFactory.class)
-                               .newInstance(sslcf);
-            }
-            Server.class.getMethod("setSendServerVersion", Boolean.TYPE).invoke(server, getSendServerVersion());
-            if (getMaxIdleTime() > 0) {
-                result.getClass().getMethod("setMaxIdleTime", Integer.TYPE).invoke(result, getMaxIdleTime());
-            }
-        } catch (RuntimeException rex) {
-            throw rex;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-        return result;
-    }
-    
-    
     protected SSLContext createSSLContext(SslContextFactory scf) throws Exception  {
         String proto = tlsServerParameters.getSecureSocketProtocol() == null
             ? "TLS" : tlsServerParameters.getSecureSocketProtocol();
@@ -797,10 +742,10 @@ public class JettyHTTPServerEngine implements ServerEngine {
         }
     }
 
-    private static void logConnector(Connector connector) {
+    private static void logConnector(ServerConnector connector) {
         try {
-            String h = (String)connector.getClass().getMethod("getHost").invoke(connector);
-            int port = (Integer)connector.getClass().getMethod("getPort").invoke(connector);
+            String h = connector.getHost();
+            int port = connector.getPort();
             LOG.finer("connector.host: " 
                 + h == null 
                   ? "null" 
@@ -963,18 +908,9 @@ public class JettyHTTPServerEngine implements ServerEngine {
         }
                         
         try {
-            //Jetty 8
-            return ClassLoaderUtils.loadClass("org.eclipse.jetty.server.ssl.SslConnector",
-                                              Server.class).isInstance(connector);
-        } catch (ClassNotFoundException e) {
-            //Jetty 9
-            //return "https".equalsIgnoreCase(connector.getDefaultConnectionFactory().getProtocol());
-            try {
-                Object o = connector.getClass().getMethod("getDefaultConnectionFactory").invoke(connector);
-                return "https".equalsIgnoreCase((String)o.getClass().getMethod("getProtocol").invoke(o));
-            } catch (Exception ex) {
-                //ignore
-            }
+            return "https".equalsIgnoreCase(connector.getDefaultConnectionFactory().getProtocol());
+        } catch (Exception ex) {
+            //ignore
         }
         return false;
     }
@@ -1012,7 +948,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
     
     private void checkConnectorPort() throws IOException {
         try {
-            int cp = (Integer)connector.getClass().getMethod("getPort").invoke(connector);
+            int cp = ((ServerConnector)connector).getPort();
             if (null != connector && port != cp) {
                 throw new IOException("Error: Connector port " + cp + " does not match"
                             + " with the server engine port " + port);
@@ -1040,7 +976,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
                     if (connector instanceof Closeable) {
                         ((Closeable)connector).close();
                     } else {
-                        connector.getClass().getMethod("close").invoke(connector);
+                        ((ServerConnector)connector).close();
                     }
                 }
             } finally {  
@@ -1052,8 +988,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
                 }
                 contexts = null;
                 server.stop();
-                if (mBeanContainer != null
-                    && !Server.getVersion().startsWith("8")) {
+                if (mBeanContainer != null) {
                     removeServerMBean();
                 }
                 server.destroy();

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index bd468a6..15013eb9 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -38,7 +38,6 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 import org.apache.cxf.management.InstrumentationManager;
-import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.component.Container;
 
 
@@ -127,11 +126,7 @@ public class JettyHTTPServerEngineFactory {
         return ref;
     }
     
-    public boolean isJetty8() {
-        return Server.getVersion().startsWith("8");
-    }
-
-    
+        
     /**
      * This call is used to set the bus. It should only be called once.
      * @param bus

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 441edb2..b476c85 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -111,7 +111,6 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -127,43 +126,36 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jmx</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-continuation</artifactId>
-            <version>${cxf.jetty8.version}</version>
             <optional>true</optional>
         </dependency>
         
@@ -180,12 +172,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-websocket</artifactId>
-            <version>${cxf.jetty8.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-runtime</artifactId>
             <version>${cxf.atmosphere.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
index fccc265..93d5637 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
@@ -38,8 +38,6 @@ import org.apache.cxf.transport.websocket.atmosphere.AtmosphereWebSocketServletD
 @NoJSR250Annotations()
 public class WebSocketDestinationFactory implements HttpDestinationFactory {
     private static final boolean ATMOSPHERE_AVAILABLE = probeClass("org.atmosphere.cpr.ApplicationConfig");
-    private static final Constructor<?> JETTY_WEBSOCKET_DESTINATION_CTR =
-        probeConstructor("org.apache.cxf.transport.websocket.jetty.JettyWebSocketDestination");
     private static final Constructor<?> JETTY9_WEBSOCKET_DESTINATION_CTR =
         probeConstructor("org.apache.cxf.transport.websocket.jetty9.Jetty9WebSocketDestination");
     private static final Constructor<?> ATMOSPHERE_WEBSOCKET_JETTY_DESTINATION_CTR =
@@ -78,13 +76,8 @@ public class WebSocketDestinationFactory implements HttpDestinationFactory {
                 return createJettyHTTPDestination(ATMOSPHERE_WEBSOCKET_JETTY_DESTINATION_CTR,
                                                   bus, registry, endpointInfo, serverEngineFactory);
             } else {
-                if (serverEngineFactory.isJetty8()) {
-                    return createJettyHTTPDestination(JETTY_WEBSOCKET_DESTINATION_CTR,
+                return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR,
                                                       bus, registry, endpointInfo, serverEngineFactory);
-                } else {
-                    return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR,
-                                                      bus, registry, endpointInfo, serverEngineFactory);
-                }
             }
         } else {
             //REVISIT other way of getting the registry of http so that the plain cxf servlet finds the destination?
@@ -96,16 +89,9 @@ public class WebSocketDestinationFactory implements HttpDestinationFactory {
                 return new AtmosphereWebSocketServletDestination(bus, registry,
                                                                  endpointInfo, endpointInfo.getAddress());
             } else {
-                JettyHTTPServerEngineFactory serverEngineFactory = bus
-                    .getExtension(JettyHTTPServerEngineFactory.class);
                 // use jetty-websocket
-                if (serverEngineFactory.isJetty8()) { 
-                    return createJettyHTTPDestination(JETTY_WEBSOCKET_DESTINATION_CTR,
-                                                      bus, registry, endpointInfo, null);
-                } else {
-                    return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR,
+                return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR,
                                                       bus, registry, endpointInfo, null);
-                }
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestination.java
deleted file mode 100644
index 8522274..0000000
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestination.java
+++ /dev/null
@@ -1,435 +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.
- */
-
-package org.apache.cxf.transport.websocket.jetty;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.http.DestinationRegistry;
-import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
-import org.apache.cxf.transport.http_jetty.JettyHTTPHandler;
-import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
-import org.apache.cxf.transport.websocket.InvalidPathException;
-import org.apache.cxf.transport.websocket.WebSocketConstants;
-import org.apache.cxf.transport.websocket.WebSocketDestinationService;
-
-import org.apache.cxf.workqueue.WorkQueueManager;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketFactory;
-
-/**
- * 
- */
-public class JettyWebSocketDestination extends JettyHTTPDestination implements 
-    WebSocketDestinationService {
-    private static final Logger LOG = LogUtils.getL7dLogger(JettyWebSocketDestination.class);
-
-    //REVISIT make these keys configurable
-    private String requestIdKey = WebSocketConstants.DEFAULT_REQUEST_ID_KEY;
-    private String responseIdKey = WebSocketConstants.DEFAULT_RESPONSE_ID_KEY;
-
-    private WebSocketFactory webSocketFactory;
-    private final Executor executor;
-
-    public JettyWebSocketDestination(Bus bus, DestinationRegistry registry, EndpointInfo ei,
-                                     JettyHTTPServerEngineFactory serverEngineFactory) throws IOException {
-        super(bus, registry, ei, serverEngineFactory);
-        webSocketFactory = new WebSocketFactory(new Acceptor(), 8192);
-        executor = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
-    }
-    
-    @Override
-    public void invokeInternal(ServletConfig config, ServletContext context, HttpServletRequest req,
-                               HttpServletResponse resp) throws IOException {
-        super.invoke(config, context, req, resp);
-    }
-    public void invoke(final ServletConfig config, 
-                       final ServletContext context, 
-                       final HttpServletRequest request, 
-                       final HttpServletResponse response) throws IOException {
-        if (webSocketFactory.acceptWebSocket(request, response)) {
-            ((Request)request).setHandled(true);
-            return;
-        }
-        super.invoke(config, context, request, response);
-    }
-    @Override
-    protected String getAddress(EndpointInfo endpointInfo) {
-        String address = endpointInfo.getAddress();
-        if (address.startsWith("ws")) {
-            address = "http" + address.substring(2);
-        }
-        return address;
-    }
-        
-    @Override
-    protected JettyHTTPHandler createJettyHTTPHandler(JettyHTTPDestination jhd, boolean cmExact) {
-        return new JettyWebSocketHandler(jhd, cmExact, webSocketFactory);
-    }
-    
-    @Override
-    public void shutdown() {
-        try {
-            webSocketFactory.stop();
-        } catch (Exception e) {
-            // ignore
-        } finally {
-            super.shutdown();
-        }
-    }
-
-    private class Acceptor implements WebSocketFactory.Acceptor {
-
-        @Override
-        public boolean checkOrigin(HttpServletRequest request, String protocol) {
-            return true;
-        }
-
-        @Override
-        public WebSocket doWebSocketConnect(HttpServletRequest request, String protocol) {
-            return new JettyWebSocket(request, protocol);
-        }
-    }
-
-    private class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessage {
-        private Connection webSocketConnection;
-        private WebSocketServletHolder webSocketHolder;
-//        private String protocol;
-
-        JettyWebSocket(HttpServletRequest request, String protocol) {
-//            this.protocol = protocol;
-            this.webSocketHolder = new JettyWebSocketServletHolder(this, request);
-        }
-        
-        @Override
-        public void onClose(int closeCode, String message) {
-            if (LOG.isLoggable(Level.FINE)) {
-                LOG.log(Level.FINE, "onClose({0}, {1})", new Object[]{closeCode, message});
-            }
-            this.webSocketConnection = null;
-        }
-
-        @Override
-        public void onOpen(Connection connection) {
-            if (LOG.isLoggable(Level.FINE)) {
-                LOG.log(Level.FINE, "onOpen({0}))", connection);
-            }
-            this.webSocketConnection = connection;
-        }
-
-        @Override
-        public void onMessage(String data) {
-            if (LOG.isLoggable(Level.FINE)) {
-                LOG.log(Level.FINE, "onMessage({0})", data);
-            }
-            try {
-                //TODO may want use string directly instead of converting it to byte[]
-                byte[] bdata = data.getBytes("utf-8");
-                invokeService(bdata, 0, bdata.length);
-            } catch (UnsupportedEncodingException e) {
-                // will not happen
-            }            
-        }
-
-        @Override
-        public void onMessage(byte[] data, int offset, int length) {
-            if (LOG.isLoggable(Level.FINE)) {
-                LOG.log(Level.FINE, "onMessage({0}, {1}, {2})", new Object[]{data, offset, length});
-            }
-            final byte[] safedata = new byte[length];
-            System.arraycopy(data, offset, safedata, 0, length);
-            invokeService(safedata, 0, safedata.length);
-        }
-        
-        private void invokeService(final byte[] data, final int offset, final int length) {
-            // invoke the service asynchronously as the jetty websocket's onMessage is synchronously blocked
-            // make sure the byte array passed to this method is immutable, as the websocket framework
-            // may corrupt the byte array after this method is returned (i.e., before the data is returned in
-            // the executor's thread.
-            executeServiceTask(new Runnable() {
-                @Override
-                public void run() {
-                    HttpServletRequest request = null;
-                    HttpServletResponse response = null;
-                    try {
-                        response = createServletResponse();
-                        request = createServletRequest(data, offset, length);
-                        String reqid = request.getHeader(requestIdKey);
-                        if (reqid != null) {
-                            response.setHeader(responseIdKey, reqid);
-                        }
-                        invoke(null, null, request, response);
-                    } catch (InvalidPathException ex) { 
-                        reportErrorStatus(response, 400);
-                    } catch (Exception e) {
-                        LOG.log(Level.WARNING, "Failed to invoke service", e);
-                        reportErrorStatus(response, 500);
-                    }
-                }
-            });
-        }
-
-        private void executeServiceTask(Runnable r) {
-            try {
-                executor.execute(r);
-            } catch (RejectedExecutionException e) {
-                LOG.warning(
-                    "Executor queue is full, run the service invocation task in caller thread." 
-                    + "  Users can specify a larger executor queue to avoid this.");
-                r.run();
-            }
-        }
-
-        // may want to move this error reporting code to WebSocketServletHolder
-        private void reportErrorStatus(HttpServletResponse response, int status) {
-            if (response != null) {
-                response.setStatus(status);
-                try {
-                    response.getWriter().write("\r\n");
-                    response.getWriter().close();
-                    response.flushBuffer();
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }
-        }
-        
-        private WebSocketVirtualServletRequest createServletRequest(byte[] data, int offset, int length) 
-            throws IOException {
-            return new WebSocketVirtualServletRequest(webSocketHolder, new ByteArrayInputStream(data, offset, length));
-        }
-
-        private WebSocketVirtualServletResponse createServletResponse() throws IOException {
-            return new WebSocketVirtualServletResponse(webSocketHolder);
-        }
-        
-        /**
-         * Writes to the underlining socket.
-         * 
-         * @param data
-         * @param offset
-         * @param length
-         */
-        void write(byte[] data, int offset, int length) throws IOException {
-            LOG.log(Level.FINE, "write(byte[], offset, length)");
-            webSocketConnection.sendMessage(data, offset, length);
-        }
-    }
-    
-    private static class JettyWebSocketServletHolder implements WebSocketServletHolder {
-        private JettyWebSocket webSocket;
-        private Map<String, Object> requestProperties;
-        private Map<String, Object> requestAttributes;
-        
-        JettyWebSocketServletHolder(JettyWebSocket webSocket, HttpServletRequest request) {
-            this.webSocket = webSocket;
-            this.requestProperties = readProperties(request);
-            this.requestAttributes = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
-            // attributes that are needed for finding the operation in some cases
-            Object v = request.getAttribute("org.apache.cxf.transport.endpoint.address");
-            if (v != null) {
-                requestAttributes.put("org.apache.cxf.transport.endpoint.address", v);
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private <T> T getRequestProperty(String name, Class<T> cls) {
-            return (T)requestProperties.get(name);
-        }
-
-        private Map<String, Object> readProperties(HttpServletRequest request) {
-            Map<String, Object> properties = new HashMap<String, Object>();
-            properties.put("servletPath", request.getServletPath());
-            properties.put("requestURI", request.getRequestURI());
-            properties.put("requestURL", request.getRequestURL());
-            properties.put("contextPath", request.getContextPath());
-            properties.put("servletPath", request.getServletPath());
-            properties.put("servletContext", request.getServletContext());
-            properties.put("pathInfo", request.getPathInfo());
-            properties.put("pathTranslated", request.getPathTranslated());
-            properties.put("protocol", request.getProtocol());
-            properties.put("scheme", request.getScheme());
-            // some additional ones
-            properties.put("localAddr", request.getLocalAddr());
-            properties.put("localName", request.getLocalName());
-            properties.put("localPort", request.getLocalPort());
-            properties.put("locale", request.getLocale());
-            properties.put("locales", request.getLocales());
-            properties.put("remoteHost", request.getRemoteHost());
-            properties.put("remotePort", request.getRemotePort());
-            properties.put("remoteAddr", request.getRemoteAddr());
-            properties.put("serverName", request.getServerName());
-            properties.put("serverPort", request.getServerPort());
-            properties.put("secure", request.isSecure());
-            properties.put("authType", request.getAuthType());
-            properties.put("dispatcherType", request.getDispatcherType());
-
-            return properties;
-        }
-
-        @Override
-        public String getAuthType() {
-            return getRequestProperty("authType", String.class);
-        }
-
-        @Override
-        public String getContextPath() {
-            return getRequestProperty("contextPath", String.class);
-        }
-
-        @Override
-        public String getLocalAddr() {
-            return getRequestProperty("LocalAddr", String.class);
-        }
-
-        @Override
-        public String getLocalName() {
-            return getRequestProperty("localName", String.class);
-        }
-
-        @Override
-        public int getLocalPort() {
-            return getRequestProperty("localPort", int.class);
-        }
-
-        @Override
-        public Locale getLocale() {
-            return getRequestProperty("locale", Locale.class);
-        }
-
-        @Override
-        public Enumeration<Locale> getLocales() {
-            return CastUtils.cast(getRequestProperty("locales", Enumeration.class));
-        }
-
-        @Override
-        public String getProtocol() {
-            return getRequestProperty("protocol", String.class);
-        }
-
-        @Override
-        public String getRemoteAddr() {
-            return getRequestProperty("remoteAddr", String.class);
-        }
-
-        @Override
-        public String getRemoteHost() {
-            return getRequestProperty("remoteHost", String.class);
-        }
-
-        @Override
-        public int getRemotePort() {
-            return getRequestProperty("remotePort", int.class);
-        }
-
-        @Override
-        public String getRequestURI() {
-            return getRequestProperty("requestURI", String.class);
-        }
-
-        @Override
-        public StringBuffer getRequestURL() {
-            return getRequestProperty("requestURL", StringBuffer.class);
-        }
-
-        @Override
-        public DispatcherType getDispatcherType() {
-            return getRequestProperty("dispatcherType", DispatcherType.class);
-        }
-
-        @Override
-        public boolean isSecure() {
-            return getRequestProperty("secure", boolean.class);
-        }
-
-        @Override
-        public String getPathInfo() {
-            return getRequestProperty("pathInfo", String.class);
-        }
-
-        @Override
-        public String getPathTranslated() {
-            return getRequestProperty("pathTranslated", String.class);
-        }
-
-        @Override
-        public String getScheme() {
-            return getRequestProperty("scheme", String.class);
-        }
-
-        @Override
-        public String getServerName() {
-            return getRequestProperty("serverName", String.class);
-        }
-
-        @Override
-        public String getServletPath() {
-            return getRequestProperty("servletPath", String.class);
-        }
-
-        @Override
-        public int getServerPort() {
-            return getRequestProperty("serverPort", int.class);
-        }
-
-        @Override
-        public ServletContext getServletContext() {
-            return getRequestProperty("serverContext", ServletContext.class);
-        }
-
-        @Override
-        public Principal getUserPrincipal() {
-            return getRequestProperty("userPrincipal", Principal.class);
-        }
-
-        @Override
-        public Object getAttribute(String name) {
-            return requestAttributes.get(name);
-        }
-
-        @Override
-        public void write(byte[] data, int offset, int length) throws IOException {
-            webSocket.write(data, offset, length);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketHandler.java
index cf44b3e..a4d0f35 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketHandler.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketHandler.java
@@ -27,16 +27,16 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
 import org.apache.cxf.transport.http_jetty.JettyHTTPHandler;
 import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.websocket.WebSocketFactory;
+import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
 
 /**
  * The extended version of JettyHTTPHandler that can support websocket.
  */
 class JettyWebSocketHandler extends JettyHTTPHandler {
-    private WebSocketFactory webSocketFactory;;
+    private WebSocketServerFactory webSocketFactory;;
 
     JettyWebSocketHandler(JettyHTTPDestination jhd, boolean cmExact,
-                                 WebSocketFactory webSocketFactory) {
+                          WebSocketServerFactory webSocketFactory) {
         super(jhd, cmExact);
         this.webSocketFactory = webSocketFactory;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index 7db0d3f..ccda1f3 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.transport.http.DestinationRegistry;
 import org.apache.cxf.transport.http.HTTPTransportFactory;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
+import org.apache.cxf.transport.websocket.jetty9.Jetty9WebSocketDestination;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
@@ -73,7 +74,7 @@ public class JettyWebSocketDestinationTest extends Assert {
         assertNull(registry.getDestinationForPath(ENDPOINT_ADDRESS));
     }
     
-    private static class TestJettyWebSocketDestination extends JettyWebSocketDestination {
+    private static class TestJettyWebSocketDestination extends Jetty9WebSocketDestination {
         TestJettyWebSocketDestination(Bus bus, DestinationRegistry registry, EndpointInfo ei,
                                       JettyHTTPServerEngineFactory serverEngineFactory, 
                                       JettyHTTPServerEngine engine) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c5a01d6..e3d0e04 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -598,26 +598,6 @@
             </dependencies>
         </profile>
         <profile>
-            <id>jetty8</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-              <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-plus</artifactId>
-                <version>${cxf.jetty8.version}</version>
-                <scope>test</scope>
-              </dependency>
-              <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-websocket</artifactId>
-                <version>${cxf.jetty8.version}</version>
-                <scope>test</scope>
-              </dependency>
-            </dependencies>
-        </profile>
-        <profile>
             <id>jetty9</id>
             <activation>
                 <activeByDefault>true</activeByDefault>

http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/systests/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 9806ee4..0b0e6c1 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -160,9 +160,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-websocket</artifactId>
-            <version>${cxf.jetty8.version}</version>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${cxf.jetty9.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>


Mime
View raw message