diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 4df01929ebc..57d1a44eb68 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -88,6 +88,11 @@ jetty-http ${project.version} + + org.eclipse.jetty + jetty-io + ${project.version} + org.eclipse.jetty jetty-server diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index a256aeb297e..99c199d06e5 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -358,11 +358,6 @@ jetty-servlets ${project.version} - - org.eclipse.jetty.websocket - websocket-client - ${project.version} - org.eclipse.jetty.websocket websocket-server @@ -504,11 +499,6 @@ spdy-core ${project.version} - - org.eclipse.jetty.spdy - spdy-client - ${project.version} - org.eclipse.jetty.spdy spdy-server diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/index.html b/jetty-distribution/src/main/resources/webapps/ROOT/index.html index 92de4ddf2a9..6dd73af75d6 100644 --- a/jetty-distribution/src/main/resources/webapps/ROOT/index.html +++ b/jetty-distribution/src/main/resources/webapps/ROOT/index.html @@ -29,7 +29,7 @@ The project is 100% Open Sour @@ -37,6 +37,7 @@ The project is 100% Open Sour diff --git a/jetty-distribution/src/main/resources/webapps/available.d/README.TXT b/jetty-distribution/src/main/resources/webapps/available.d/README.TXT deleted file mode 100644 index 10f0eae32f1..00000000000 --- a/jetty-distribution/src/main/resources/webapps/available.d/README.TXT +++ /dev/null @@ -1,3 +0,0 @@ - -This directory contains example context XML that may be deployed by -moving/copying/linking them to the ../../webapps directory. diff --git a/jetty-distribution/src/main/resources/webapps/available.d/resources.xml b/jetty-distribution/src/main/resources/webapps/available.d/resources.xml deleted file mode 100644 index 9ea0e18773b..00000000000 --- a/jetty-distribution/src/main/resources/webapps/available.d/resources.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - /resources - /resources/ - - - - - index.html - - - max-age=3600,public - - - - - diff --git a/jetty-distribution/src/main/resources/webapps/available.d/move-context.xml b/jetty-distribution/src/main/resources/webapps/example-moved.xml similarity index 79% rename from jetty-distribution/src/main/resources/webapps/available.d/move-context.xml rename to jetty-distribution/src/main/resources/webapps/example-moved.xml index 7821b3d903d..6e72d39d533 100644 --- a/jetty-distribution/src/main/resources/webapps/available.d/move-context.xml +++ b/jetty-distribution/src/main/resources/webapps/example-moved.xml @@ -1,9 +1,10 @@ + /oldContextPath - /test/dump/newContextPath + /test/dump/moved false false false diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index aa5a9229fb9..de2bd45f3ba 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jetty - jetty-io + jetty-util ${project.version} diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java index 908ba46e752..004c4b31132 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java +++ b/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); } } diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java index ea1198a786f..83842aa2805 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java +++ b/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; - /** * */ diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java index c796bc21ec4..a6efb9022c8 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java +++ b/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"; diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java index 967ccf0bb81..c0cfacdf08b 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java +++ b/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 diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java index 53ff6247298..2f3dca8494c 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java +++ b/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; - /** * */ diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpStatusCodeTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpStatusCodeTest.java index 448164f9da4..5658ed053d4 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpStatusCodeTest.java +++ b/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 diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java index 7164d7aef2b..f97427bc679 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java +++ b/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 diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/MimeTypesTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/MimeTypesTest.java index f9a6c59c4fa..d0c8cd17733 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/MimeTypesTest.java +++ b/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 diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java index 3df8d2b36b6..1633fdc0e38 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java +++ b/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; + /** * */ diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml new file mode 100644 index 00000000000..6e0f8238634 --- /dev/null +++ b/jetty-proxy/pom.xml @@ -0,0 +1,94 @@ + + + org.eclipse.jetty + jetty-project + 9.0.0-SNAPSHOT + + 4.0.0 + jetty-proxy + Jetty :: Proxy + Jetty Proxy + + ${project.groupId}.proxy + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + javax.servlet.*;version="2.6.0",* + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + config + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.proxy.* + + + + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-servlet + ${project.version} + provided + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty.orbit + javax.servlet + provided + + + diff --git a/jetty-servlets/src/main/config/etc/jetty-proxy.xml b/jetty-proxy/src/main/config/etc/jetty-proxy.xml similarity index 100% rename from jetty-servlets/src/main/config/etc/jetty-proxy.xml rename to jetty-proxy/src/main/config/etc/jetty-proxy.xml diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java similarity index 99% rename from jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java rename to jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java index 9ce69c88278..8daeb2c1cc7 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java +++ b/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; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java similarity index 99% rename from jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java rename to jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java index 7fc1f92ab62..69347cf1f4f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java +++ b/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; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxyConnection.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java similarity index 99% rename from jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxyConnection.java rename to jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java index 80b8ac19469..424f8abdf90 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ProxyConnection.java +++ b/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; diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java similarity index 99% rename from jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java rename to jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index a4eff7589e0..e0840f26b46 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java +++ b/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; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AbstractConnectHandlerTest.java similarity index 98% rename from jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AbstractConnectHandlerTest.java index a3eb2e9f140..57297e3b73f 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractConnectHandlerTest.java +++ b/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; diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/BalancerServletTest.java similarity index 99% rename from jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/BalancerServletTest.java index 06605255206..1fcb4fe5d50 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java +++ b/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; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java similarity index 98% rename from jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java index 4e6c6231c11..09688822983 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java +++ b/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; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java similarity index 99% rename from jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java index e2b2c7baca6..4a20823e0a0 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java +++ b/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; diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServer.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServer.java similarity index 95% rename from jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServer.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServer.java index 61b6c44011d..dbb4367c6be 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServer.java +++ b/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; diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java similarity index 99% rename from jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java rename to jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index 0990cc91c4b..607b3f078cb 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java +++ b/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; diff --git a/jetty-proxy/src/test/resources/keystore b/jetty-proxy/src/test/resources/keystore new file mode 100644 index 00000000000..b727bd0fb77 Binary files /dev/null and b/jetty-proxy/src/test/resources/keystore differ diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index f24e7daad29..fe06bdfbe0f 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -96,6 +96,11 @@ jetty-http ${project.version} + + org.eclipse.jetty + jetty-io + ${project.version} + org.eclipse.jetty jetty-xml diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java index 09ca5bcc711..3bedb5744a8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java +++ b/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 ); diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index e5f73ef2c36..61aa7cf023b 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -58,11 +58,6 @@ jetty-continuation ${project.version} - - org.eclipse.jetty - jetty-client - ${project.version} - org.eclipse.jetty jetty-http diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config index 99e0b68c076..5955f77a6d0 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config +++ b/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/** diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index baae5f6e3b5..d4aaec958d6 100644 --- a/jetty-websocket/websocket-server/pom.xml +++ b/jetty-websocket/websocket-server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-client + websocket-common ${project.version} diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerContainer.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerContainer.java index 43a12545653..f70e1aed3b5 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerContainer.java +++ b/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 getActiveSessions() + { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set 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 + + } } diff --git a/pom.xml b/pom.xml index ef6a44e830a..234f2f003cb 100644 --- a/pom.xml +++ b/pom.xml @@ -403,6 +403,7 @@ jetty-jaas jetty-spring jetty-client + jetty-proxy jetty-jaspi jetty-osgi jetty-rewrite diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 1b36e9866f0..9c4227f7838 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -191,20 +191,6 @@ org.eclipse.jetty jetty-servlets ${project.version} - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-http - - org.eclipse.jetty.orbit @@ -220,20 +206,7 @@ org.eclipse.jetty.websocket websocket-server ${project.version} - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - + test org.eclipse.jetty diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml index eebc73b4ea2..c4530625cb0 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml @@ -89,23 +89,6 @@ - - Login com.acme.LoginServlet @@ -235,28 +218,6 @@ /secureMode/* - - - TransparentProxy - org.eclipse.jetty.servlets.ProxyServlet$Transparent - true - - prefix/javadoc-proxy - - - proxyTohttp://download.eclipse.org/jetty/stable-9/apidocs - - - hostHeaderdownload.eclipse.org - - 1 - - - TransparentProxy - /javadoc-proxy/* - - - foo.jsp /jsp/foo/foo.jsp @@ -271,8 +232,6 @@ /error404.html - - Rego2