jetty-9 cleaning up dependencies

jetty-client/pom.xml

@@ -88,6 +88,11 @@
             <artifactId>jetty-http</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>

jetty-distribution/pom.xml

@@ -358,11 +358,6 @@
       <artifactId>jetty-servlets</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
@@ -504,11 +499,6 @@
           <artifactId>spdy-core</artifactId>
           <version>${project.version}</version>
         </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty.spdy</groupId>
-          <artifactId>spdy-client</artifactId>
-          <version>${project.version}</version>
-        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty.spdy</groupId>
           <artifactId>spdy-server</artifactId>

jetty-distribution/src/main/resources/webapps/ROOT/index.html

@@ -29,7 +29,7 @@ The project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Sour
           <ul>
             <li><a href="/test/">Test Jetty Webapp</a></li>
             <li><a href="/async-rest/">Async Rest</a></li>
-            <li><a href="http://docs.codehaus.org/display/JETTY/Jetty+Powered">Jetty Powered</a></li>
+	    <li><a href="/oldContextPath/">Redirected Context</a></li>
           </ul>
       </td>
       <td>
@@ -37,6 +37,7 @@ The project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Sour
         <ul>
           <li><a href="http://www.eclipse.org/jetty/">Jetty @ Eclipse Home</a></li>
           <li><a href="http://wiki.eclipse.org/Jetty">Jetty @ Eclipse Doco</a></li>
+          <li><a href="http://docs.codehaus.org/display/JETTY/Jetty+Powered">Jetty Powered</a></li>
         </ul>
       </td>
       <td>

jetty-distribution/src/main/resources/webapps/available.d/README.TXT

@@ -1,3 +0,0 @@
-
-This directory contains example context XML that may be deployed by
-moving/copying/linking them to the ../../webapps directory.

jetty-distribution/src/main/resources/webapps/available.d/resources.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
-
-<!--
-Configure a custom context for serving static resources 
-
-This context contains only a ResourceHandler
-to serve static html files and images.
--->
-
-<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
-  <Set name="contextPath">/resources</Set>
-  <Set name="resourceBase"><SystemProperty name="jetty.home" default="."/>/resources/</Set>
-  <Set name="handler">
-    <New class="org.eclipse.jetty.server.handler.ResourceHandler">
-      <Set name="welcomeFiles">
-        <Array type="String">
-          <Item>index.html</Item>
-        </Array>
-      </Set>
-      <Set name="cacheControl">max-age=3600,public</Set>
-    </New>
-  </Set>
-
-</Configure>
-

jetty-distribution/src/main/resources/webapps/example-moved.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
+<!-- Simple handler to redirect from old path to new -->
 <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
   <Set name="contextPath">/oldContextPath</Set>
-  <Set name="newContextURL">/test/dump/newContextPath</Set>
+  <Set name="newContextURL">/test/dump/moved</Set>
   <Set name="permanent">false</Set>
   <Set name="discardPathInfo">false</Set>
   <Set name="discardQuery">false</Set>

jetty-http/pom.xml

@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
+      <artifactId>jetty-util</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java

@@ -25,7 +25,6 @@ import java.nio.charset.Charset;
 
 import org.eclipse.jetty.http.HttpGenerator.RequestInfo;
 import org.eclipse.jetty.http.HttpGenerator.ResponseInfo;
-import org.eclipse.jetty.io.RuntimeIOException;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.StringUtil;
 
@@ -102,7 +101,7 @@ public class HttpTester
             }
             catch (IOException e)
             {
-                throw new RuntimeIOException(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -115,7 +114,7 @@ public class HttpTester
             }
             catch (IOException e)
             {
-                throw new RuntimeIOException(e);
+                throw new RuntimeException(e);
             }
         }
         @Override
@@ -153,7 +152,7 @@ public class HttpTester
             }
             catch (IOException e)
             {
-                throw new RuntimeIOException(e);
+                throw new RuntimeException(e);
             }
             return false;
         }
@@ -161,7 +160,7 @@ public class HttpTester
         @Override
         public void badMessage(int status, String reason)
         {
-            throw new RuntimeIOException(reason);
+            throw new RuntimeException(reason);
         }
 
         public ByteBuffer generate()
@@ -224,7 +223,7 @@ public class HttpTester
             }
             catch (IOException e)
             {
-                throw new RuntimeIOException(e);
+                throw new RuntimeException(e);
             }
 
         }

jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java

@@ -18,6 +18,13 @@
 
 package org.eclipse.jetty.http;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 import java.nio.ByteBuffer;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -29,13 +36,6 @@ import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 /**
  *
  */

jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java

@@ -18,17 +18,17 @@
 
 package org.eclipse.jetty.http;
 
-import java.nio.ByteBuffer;
-
-import org.eclipse.jetty.util.BufferUtil;
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.matchers.JUnitMatchers.containsString;
 
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.BufferUtil;
+import org.junit.Test;
+
 public class HttpGeneratorClientTest
 {
     public final static String CONTENT="The quick brown fox jumped over the lazy dog.\nNow is the time for all good men to come to the aid of the party\nThe moon is blue to a fish in love.\n";

jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java

@@ -18,14 +18,6 @@
 
 package org.eclipse.jetty.http;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jetty.http.HttpGenerator.ResponseInfo;
-import org.eclipse.jetty.util.BufferUtil;
-import org.junit.Test;
-
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.either;
 import static org.hamcrest.Matchers.equalTo;
@@ -36,6 +28,14 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jetty.http.HttpGenerator.ResponseInfo;
+import org.eclipse.jetty.util.BufferUtil;
+import org.junit.Test;
+
 public class HttpGeneratorServerTest
 {
     private class Handler implements HttpParser.ResponseHandler<ByteBuffer>

jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java

@@ -18,19 +18,18 @@
 
 package org.eclipse.jetty.http;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.nio.ByteBuffer;
 
 import org.eclipse.jetty.http.HttpParser.State;
-import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.StringUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  *
  */

jetty-http/src/test/java/org/eclipse/jetty/http/HttpStatusCodeTest.java

@@ -18,11 +18,11 @@
 
 package org.eclipse.jetty.http;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.junit.Test;
+
 public class HttpStatusCodeTest
 {
     @Test

jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java

@@ -19,12 +19,12 @@
 
 package org.eclipse.jetty.http;
 
+import static org.junit.Assert.assertEquals;
+
 import java.net.URI;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
 
 /* ------------------------------------------------------------ */
 public class HttpURITest

jetty-http/src/test/java/org/eclipse/jetty/http/MimeTypesTest.java

@@ -18,11 +18,11 @@
 
 package org.eclipse.jetty.http;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.junit.Test;
+
 public class MimeTypesTest
 {
     @Test

jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java

@@ -18,12 +18,12 @@
 
 package org.eclipse.jetty.http;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 /**
  *
  */

jetty-proxy/pom.xml

@@ -0,0 +1,94 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-project</artifactId>
+    <version>9.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-proxy</artifactId>
+  <name>Jetty :: Proxy</name>
+  <description>Jetty Proxy</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
+              </instructions>
+            </configuration>
+           </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!--
+        Required for OSGI
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>config</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <configuration>
+          <onlyAnalyze>org.eclipse.jetty.proxy.*</onlyAnalyze>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.servlets;
+package org.eclipse.jetty.proxy;
 
 import java.net.URI;
 import java.util.ArrayList;

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.server.handler;
+package org.eclipse.jetty.proxy;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -45,6 +45,7 @@ import org.eclipse.jetty.io.SelectorManager;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.TypeUtil;

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.server.handler;
+package org.eclipse.jetty.proxy;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.servlets;
+package org.eclipse.jetty.proxy;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -47,7 +47,6 @@ import org.eclipse.jetty.client.util.TimedResponseListener;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.handler.ConnectHandler;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AbstractConnectHandlerTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.server.handler;
+package org.eclipse.jetty.proxy;
 
 import java.io.BufferedReader;
 import java.io.IOException;

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/BalancerServletTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.servlets;
+package org.eclipse.jetty.proxy;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.server.handler;
+package org.eclipse.jetty.proxy;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse;
 import org.eclipse.jetty.util.ssl.SslContextFactory;

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.server.handler;
+package org.eclipse.jetty.proxy;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -39,6 +39,7 @@ import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse;
 import org.eclipse.jetty.util.B64Code;
 import org.eclipse.jetty.util.Callback;

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServer.java

@@ -16,11 +16,10 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.servlets;
+package org.eclipse.jetty.proxy;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.ConnectHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 

jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.servlets;
+package org.eclipse.jetty.proxy;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

jetty-server/pom.xml

@@ -96,6 +96,11 @@
       <artifactId>jetty-http</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>

jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java

@@ -401,7 +401,8 @@ public class ContextHandlerTest
 
     private File setupTestDirectory() throws IOException
     {
-        File tmpDir = new File( System.getProperty( "basedir" ) + "/target/tmp/ContextHandlerTest" );
+        File tmpDir = new File( System.getProperty( "basedir",".") + "/target/tmp/ContextHandlerTest" );
+        tmpDir=tmpDir.getCanonicalFile();
         if (!tmpDir.exists())
             assertTrue(tmpDir.mkdirs());
         File tmp = File.createTempFile("cht",null, tmpDir );

jetty-servlets/pom.xml

@@ -58,11 +58,6 @@
       <artifactId>jetty-continuation</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>

jetty-start/src/main/resources/org/eclipse/jetty/start/start.config

@@ -110,9 +110,6 @@ $(jetty.home)/lib/jetty-webapp-$(version).jar			! available org.eclipse.jetty.we
 [Server,All,deploy,default]
 $(jetty.home)/lib/jetty-deploy-$(version).jar			! available org.eclipse.jetty.deploy.ContextDeployer
 		
-[Server,All,servlets,default]
-$(jetty.home)/lib/jetty-servlets-$(version).jar			! available org.eclipse.jetty.servlets.WelcomeFilter
-
 [All,rewrite]
 $(jetty.home)/lib/jetty-rewrite-$(version).jar			! available org.eclipse.jetty.rewrite.handler.RewriteHandler
 
@@ -141,12 +138,14 @@ $(jetty.home)/lib/setuid/**
 [All,policy]
 $(jetty.home)/lib/jetty-policy-$(version).jar			! available org.eclipse.jetty.policy.JettyPolicy
 					
-[All,Client,client]
+[All,client]
 $(jetty.home)/lib/jetty-http-$(version).jar			! available org.eclipse.jetty.http.HttpParser
 $(jetty.home)/lib/jetty-client-$(version).jar			! available org.eclipse.jetty.client.HttpClient
-
-[Client]
-$(jetty.home)/lib/jetty-http-$(version).jar			! available org.eclipse.jetty.http.HttpParser
+            
+[All,proxy]
+$(jetty.home)/lib/jetty-proxy-$(version).jar         ! available org.eclipse.jetty.proxy.ConnectHandler
+$(jetty.home)/lib/jetty-http-$(version).jar         ! available org.eclipse.jetty.http.HttpParser
+$(jetty.home)/lib/jetty-client-$(version).jar           ! available org.eclipse.jetty.client.HttpClient
 
 [All,websocket]
 $(jetty.home)/lib/websocket/**

jetty-websocket/websocket-server/pom.xml

@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-client</artifactId>
+            <artifactId>websocket-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerContainer.java

@@ -18,17 +18,83 @@
 
 package org.eclipse.jetty.websocket.server;
 
+import java.util.Set;
+
+import javax.net.websocket.ClientEndpointConfiguration;
+import javax.net.websocket.DeploymentException;
 import javax.net.websocket.Endpoint;
 import javax.net.websocket.ServerContainer;
 import javax.net.websocket.ServerEndpointConfiguration;
+import javax.net.websocket.Session;
 
-import org.eclipse.jetty.websocket.client.JettyClientContainer;
-
-public class JettyServerContainer extends JettyClientContainer implements ServerContainer
+public class JettyServerContainer implements ServerContainer
 {
     @Override
     public void publishServer(Endpoint endpoint, ServerEndpointConfiguration ilc)
     {
         // TODO Auto-generated method stub
     }
+
+    @Override
+    public void connectToServer(Endpoint endpoint, ClientEndpointConfiguration olc) throws DeploymentException
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public Set<Session> getActiveSessions()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Set<String> getInstalledExtensions()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public long getMaxBinaryMessageBufferSize()
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public long getMaxSessionIdleTimeout()
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public long getMaxTextMessageBufferSize()
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public void setMaxBinaryMessageBufferSize(long max)
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void setMaxSessionIdleTimeout(long timeout)
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void setMaxTextMessageBufferSize(long max)
+    {
+        // TODO Auto-generated method stub
+        
+    }
 }

pom.xml

@@ -403,6 +403,7 @@
     <module>jetty-jaas</module>
     <module>jetty-spring</module>
     <module>jetty-client</module>
+    <module>jetty-proxy</module>
     <module>jetty-jaspi</module>
     <module>jetty-osgi</module>
     <module>jetty-rewrite</module>

tests/test-webapps/test-jetty-webapp/pom.xml

@@ -191,20 +191,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-client</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-http</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
@@ -220,20 +206,7 @@
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-http</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-io</artifactId>
-        </exclusion>
-      </exclusions>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml

@@ -89,23 +89,6 @@
   </filter-mapping>
   
   
-
-  <!-- Comment out to support PUT and DELETE
-  <filter>
-    <filter-name>RestFilter</filter-name>
-    <filter-class>org.eclipse.jetty.servlets.RestFilter</filter-class>
-    <async-support>true</async-support>
-    <init-param>
-      <param-name>maxPutSize</param-name><param-value>1024</param-value>
-    </init-param>
-  </filter>
-  
-  <filter-mapping>
-    <filter-name>RestFilter</filter-name>
-    <servlet-name>default</servlet-name>
-    <dispatcher>REQUEST</dispatcher>
-  </filter-mapping>
-  -->
   <servlet>
     <servlet-name>Login</servlet-name>
     <servlet-class>com.acme.LoginServlet</servlet-class>
@@ -235,28 +218,6 @@
     <url-pattern>/secureMode/*</url-pattern>
   </servlet-mapping>
   
-  
-  <servlet>
-    <servlet-name>TransparentProxy</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class>
-    <async-support>true</async-support>
-    <init-param>
-      <param-name>prefix</param-name><param-value>/javadoc-proxy</param-value>
-    </init-param>
-    <init-param>
-      <param-name>proxyTo</param-name><param-value>http://download.eclipse.org/jetty/stable-9/apidocs</param-value>
-    </init-param>
-    <init-param>
-      <param-name>hostHeader</param-name><param-value>download.eclipse.org</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TransparentProxy</servlet-name>
-    <url-pattern>/javadoc-proxy/*</url-pattern>
-  </servlet-mapping>
-
-
   <servlet>
      <servlet-name>foo.jsp</servlet-name>
      <jsp-file>/jsp/foo/foo.jsp</jsp-file>
@@ -271,8 +232,6 @@
     <location>/error404.html</location>
   </error-page>
 
-
-
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Rego2</web-resource-name>