From 704063de5379ebbe48d8ff0086755d0eb885a72e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 11:45:30 +1100
Subject: [PATCH 01/21] merge websocket-util into websocket-core-common

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../eclipse/jetty/osgi/test/TestOSGiUtil.java |  1 -
 jetty-websocket/pom.xml                       |  1 -
 .../src/main/java/module-info.java            |  2 +
 .../core}/messages/AbstractMessageSink.java   |  2 +-
 .../core}/messages/ByteArrayMessageSink.java  |  4 +-
 .../core}/messages/ByteBufferMessageSink.java |  4 +-
 .../core}/messages/DispatchedMessageSink.java |  2 +-
 .../messages/InputStreamMessageSink.java      |  2 +-
 .../core}/messages/MessageInputStream.java    |  2 +-
 .../core}/messages/MessageOutputStream.java   |  2 +-
 .../core}/messages/MessageReader.java         |  2 +-
 .../websocket/core}/messages/MessageSink.java |  2 +-
 .../core}/messages/MessageWriter.java         |  2 +-
 .../messages/PartialByteArrayMessageSink.java |  2 +-
 .../PartialByteBufferMessageSink.java         |  2 +-
 .../messages/PartialStringMessageSink.java    |  2 +-
 .../core}/messages/ReaderMessageSink.java     |  2 +-
 .../core}/messages/StringMessageSink.java     |  2 +-
 .../util/DuplicateAnnotationException.java    |  2 +-
 .../core}/util/InvalidSignatureException.java |  2 +-
 .../core}/util/InvalidWebSocketException.java |  2 +-
 .../websocket/core}/util/InvokerUtils.java    |  2 +-
 .../websocket/core}/util/ReflectUtils.java    |  2 +-
 .../jetty/websocket/core}/util/TextUtils.java |  2 +-
 .../core/autobahn/AutobahnTests.java          |  1 -
 .../core}/util/MessageReaderTest.java         |  4 +-
 .../core}/util/MessageWriterTest.java         |  4 +-
 .../util/PartialStringMessageSinkTest.java    |  4 +-
 .../core}/util/StringMessageSinkTest.java     |  4 +-
 .../websocket-javax-client/pom.xml            |  5 --
 .../AnnotatedClientEndpointConfig.java        |  2 +-
 .../JavaxWebSocketClientContainer.java        |  2 +-
 ...vaxWebSocketClientFrameHandlerFactory.java |  2 +-
 .../websocket-javax-common/pom.xml            |  5 --
 .../src/main/java/module-info.java            |  1 -
 .../common/JavaxWebSocketAsyncRemote.java     |  6 +-
 .../common/JavaxWebSocketBasicRemote.java     |  2 +-
 .../common/JavaxWebSocketFrameHandler.java    | 10 +--
 .../JavaxWebSocketFrameHandlerFactory.java    | 16 ++---
 .../JavaxWebSocketFrameHandlerMetadata.java   |  2 +-
 .../common/JavaxWebSocketMessageMetadata.java |  2 +-
 .../common/JavaxWebSocketRemoteEndpoint.java  |  4 +-
 .../javax/common/JavaxWebSocketSession.java   |  2 +-
 .../common/decoders/AvailableDecoders.java    |  6 +-
 .../common/encoders/AvailableEncoders.java    |  6 +-
 .../messages/AbstractDecodedMessageSink.java  |  2 +-
 .../messages/DecodedBinaryMessageSink.java    |  4 +-
 .../DecodedBinaryStreamMessageSink.java       |  4 +-
 .../messages/DecodedTextMessageSink.java      |  4 +-
 .../DecodedTextStreamMessageSink.java         |  4 +-
 .../common/DummyFrameHandlerFactory.java      |  2 +-
 ...ebSocketFrameHandlerBadSignaturesTest.java |  2 +-
 ...SocketFrameHandlerOnMessageBinaryTest.java |  2 +-
 ...ebSocketFrameHandlerOnMessageTextTest.java |  2 +-
 .../messages/InputStreamMessageSinkTest.java  |  2 +-
 .../messages/ReaderMessageSinkTest.java       |  2 +-
 .../util/InvokerUtilsStaticParamsTest.java    |  4 +-
 .../javax/common/util/InvokerUtilsTest.java   |  4 +-
 .../common/util/NameParamIdentifier.java      |  2 +-
 .../javax/common/util/ReflectUtilsTest.java   |  2 +-
 .../main/config/modules/websocket-javax.mod   |  1 -
 .../JavaxWebSocketServerContainer.java        |  4 +-
 .../server/internal/PathParamIdentifier.java  |  4 +-
 .../tests/CompletableFutureMethodHandle.java  |  4 +-
 .../tests/matchers/IsMessageHandlerType.java  |  2 +-
 .../tests/client/MessageReceivingTest.java    |  2 +-
 .../tests/coders/AvailableDecodersTest.java   |  2 +-
 .../tests/coders/AvailableEncodersTest.java   |  2 +-
 .../javax/tests/coders/DecoderListTest.java   |  2 +-
 .../javax/tests/server/AddEndpointTest.java   |  1 -
 .../tests/server/DeploymentExceptionTest.java |  2 +-
 .../config/modules/websocket-jetty-client.mod |  1 -
 .../DelegatedJettyClientUpgradeResponse.java  |  3 -
 .../websocket-jetty-common/pom.xml            |  2 +-
 .../src/main/java/module-info.java            |  1 -
 .../common/JettyWebSocketFrameHandler.java    |  6 +-
 .../JettyWebSocketFrameHandlerFactory.java    | 24 +++----
 .../JettyWebSocketFrameHandlerMetadata.java   |  2 +-
 .../jetty/websocket/common/EndPoints.java     |  2 +-
 .../common/LocalEndpointMetadataTest.java     | 12 ++--
 .../common/MessageInputStreamTest.java        |  2 +-
 .../common/MessageOutputStreamTest.java       |  2 +-
 .../common/OutgoingMessageCapture.java        |  6 +-
 .../common/invoke/InvokerUtilsTest.java       |  4 +-
 .../common/invoke/NameParamIdentifier.java    |  2 +-
 .../main/config/modules/websocket-jetty.mod   |  1 -
 .../server/JettyWebSocketServerContainer.java |  2 +-
 .../jetty/websocket/tests/EchoSocket.java     |  1 -
 .../tests/server/PartialListenerTest.java     |  2 +-
 jetty-websocket/websocket-util/pom.xml        | 64 -------------------
 .../src/main/java/module-info.java            | 26 --------
 .../test/resources/jetty-logging.properties   |  1 -
 92 files changed, 131 insertions(+), 243 deletions(-)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/AbstractMessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/ByteArrayMessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/ByteBufferMessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/DispatchedMessageSink.java (99%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/InputStreamMessageSink.java (95%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/MessageInputStream.java (99%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/MessageOutputStream.java (99%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/MessageReader.java (98%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/MessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/MessageWriter.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/PartialByteArrayMessageSink.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/PartialByteBufferMessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/PartialStringMessageSink.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/ReaderMessageSink.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/messages/StringMessageSink.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/DuplicateAnnotationException.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/InvalidSignatureException.java (97%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/InvalidWebSocketException.java (96%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/InvokerUtils.java (99%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/ReflectUtils.java (99%)
 rename jetty-websocket/{websocket-util/src/main/java/org/eclipse/jetty/websocket => websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core}/util/TextUtils.java (98%)
 rename jetty-websocket/{websocket-util/src/test/java/org/eclipse/jetty/websocket => websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core}/util/MessageReaderTest.java (97%)
 rename jetty-websocket/{websocket-util/src/test/java/org/eclipse/jetty/websocket => websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core}/util/MessageWriterTest.java (98%)
 rename jetty-websocket/{websocket-util/src/test/java/org/eclipse/jetty/websocket => websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core}/util/PartialStringMessageSinkTest.java (98%)
 rename jetty-websocket/{websocket-util/src/test/java/org/eclipse/jetty/websocket => websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core}/util/StringMessageSinkTest.java (98%)
 delete mode 100644 jetty-websocket/websocket-util/pom.xml
 delete mode 100644 jetty-websocket/websocket-util/src/main/java/module-info.java
 delete mode 100644 jetty-websocket/websocket-util/src/test/resources/jetty-logging.properties

diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index ae1039583c35..fd2c6f18481a 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -186,7 +186,6 @@ public static List<Option> coreJettyDependencies()
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start());
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index f6d97ef4cf26..1f543b83aa5e 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -29,7 +29,6 @@
     <module>websocket-javax-server</module>
     <module>websocket-javax-tests</module>
     <!-- Common WebSocket Implementation -->
-    <module>websocket-util</module>
     <module>websocket-util-server</module>
   </modules>
   <build>
diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
index 43087904262a..18253eb25ca6 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
@@ -25,6 +25,8 @@
 module org.eclipse.jetty.websocket.core.common
 {
     exports org.eclipse.jetty.websocket.core;
+    exports org.eclipse.jetty.websocket.core.util;
+    exports org.eclipse.jetty.websocket.core.messages;
     exports org.eclipse.jetty.websocket.core.exception;
     exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/AbstractMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/AbstractMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java
index 14d1cc857136..906753d05c9d 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/AbstractMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteArrayMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteArrayMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
index 4b84a54156d0..c14d9efca2bd 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteArrayMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 
 public class ByteArrayMessageSink extends AbstractMessageSink
 {
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteBufferMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteBufferMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
index 0c255e4e2676..84978ea17a5e 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ByteBufferMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 
 public class ByteBufferMessageSink extends AbstractMessageSink
 {
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/DispatchedMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java
similarity index 99%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/DispatchedMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java
index 805dd70790fd..e6cf09465577 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/DispatchedMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.Closeable;
 import java.lang.invoke.MethodHandle;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/InputStreamMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/InputStreamMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java
index 161b367dd2ec..33ede2cbd1ed 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/InputStreamMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java
similarity index 99%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java
index c3bc69867695..aec7efe43799 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageInputStream.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java
similarity index 99%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java
index e3b841bc05e3..cf9f4c565471 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageOutputStream.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageReader.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java
similarity index 98%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageReader.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java
index e20e7da922eb..127b1c9c2372 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageReader.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java
index d1b5842d2c53..fc60f2424bac 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageWriter.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageWriter.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java
index 4dbde70a72d9..f313cbea9dd6 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/MessageWriter.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteArrayMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteArrayMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java
index bf7058cbe0c8..2920268428d2 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteArrayMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteBufferMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteBufferMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java
index 9336e93aa52f..2bc1c76c19df 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialByteBufferMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialStringMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialStringMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java
index 457bb1461ea0..d1addbcc4062 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/PartialStringMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ReaderMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ReaderMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java
index df70a7cc7b81..978b0aef241c 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/ReaderMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/StringMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/StringMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java
index 78fef1afb1b0..aeac579cde16 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/messages/StringMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/DuplicateAnnotationException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/DuplicateAnnotationException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java
index df3a7b49fa84..730af9637304 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/DuplicateAnnotationException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidSignatureException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidSignatureException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java
index 388b0faae470..0eda3b03bcf4 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidSignatureException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidWebSocketException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java
similarity index 96%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidWebSocketException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java
index 8b8329f4e380..6e4a8650c2ef 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvalidWebSocketException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
similarity index 99%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
index 8a3bc181b801..a5d3e6437fcb 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/ReflectUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
similarity index 99%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/ReflectUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
index bb1a33e6e99d..8a0aa1d4f229 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/ReflectUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/TextUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java
similarity index 98%
rename from jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/TextUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java
index 20563f8af404..3e0a6c39072e 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/TextUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 /**
  * Collection of utility methods for Text content
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
index 03075cf227e3..e77485f86195 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
@@ -52,7 +52,6 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerStatus;
 import org.testcontainers.utility.MountableFile;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageReaderTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
similarity index 97%
rename from jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageReaderTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
index eb676efec42a..51001b7385d8 100644
--- a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageReaderTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -31,7 +31,7 @@
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.MessageReader;
+import org.eclipse.jetty.websocket.core.messages.MessageReader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageWriterTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
similarity index 98%
rename from jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageWriterTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
index a1c26f60f692..13b60e8b98d0 100644
--- a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/MessageWriterTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.io.IOException;
 import java.nio.charset.MalformedInputException;
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.messages.MessageWriter;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/PartialStringMessageSinkTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
similarity index 98%
rename from jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/PartialStringMessageSinkTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
index 6569d8aed3b5..bc24e8eea599 100644
--- a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/PartialStringMessageSinkTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -34,7 +34,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/StringMessageSinkTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
similarity index 98%
rename from jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/StringMessageSinkTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
index 8696ec91565c..cecbe355c6a1 100644
--- a/jetty-websocket/websocket-util/src/test/java/org/eclipse/jetty/websocket/util/StringMessageSinkTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml
index 3d3f594e7239..cb44b77f76e7 100644
--- a/jetty-websocket/websocket-javax-client/pom.xml
+++ b/jetty-websocket/websocket-javax-client/pom.xml
@@ -24,11 +24,6 @@
       <artifactId>websocket-javax-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-client</artifactId>
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
index 6a207d9223cf..d123f34df909 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
@@ -23,8 +23,8 @@
 import javax.websocket.ClientEndpoint;
 import javax.websocket.ClientEndpointConfig;
 
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 
 public class AnnotatedClientEndpointConfig extends ClientEndpointConfigWrapper
 {
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
index 8202b43a44a6..3fe54eac8b79 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
@@ -42,12 +42,12 @@
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 
 /**
  * Container for Client use of the javax.websocket API.
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
index ec33f0e12665..b93715b619a4 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
@@ -21,10 +21,10 @@
 import javax.websocket.ClientEndpoint;
 import javax.websocket.EndpointConfig;
 
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
 
 public class JavaxWebSocketClientFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory
 {
diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml
index 5788cfeb68a8..4ceac71d1db6 100644
--- a/jetty-websocket/websocket-javax-common/pom.xml
+++ b/jetty-websocket/websocket-javax-common/pom.xml
@@ -70,11 +70,6 @@
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-javax-websocket-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-client</artifactId>
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
index 97397c3d70ef..705e6d822f9a 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
@@ -26,5 +26,4 @@
     requires org.slf4j;
     requires transitive jetty.websocket.api;
     requires transitive org.eclipse.jetty.websocket.core.client;
-    requires transitive org.eclipse.jetty.websocket.util;
 }
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
index 185c89715c8d..553945661955 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
@@ -31,9 +31,9 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.TextUtils;
-import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.util.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
index 2519e4be72f4..3d443213e4dc 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
@@ -31,7 +31,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.TextUtils;
+import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
index 884f6581de5b..eb50ec1b72de 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
@@ -45,17 +45,17 @@
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.ProtocolException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
index 853dc88d6395..dda8252311d2 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
@@ -43,20 +43,20 @@
 
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
 import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.common.messages.AbstractDecodedMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
index 52d96b780265..66e3cbc4604d 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
@@ -23,9 +23,9 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 
 public class JavaxWebSocketFrameHandlerMetadata
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
index bd98e8dd594b..fd168632f427 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
@@ -21,8 +21,8 @@
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 
 public class JavaxWebSocketMessageMetadata
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
index 718b2553d76b..26f80071c238 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
@@ -34,8 +34,8 @@
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.OutgoingFrames;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.util.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.messages.MessageWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
index 13b4701fd2b3..c24b25845226 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
@@ -43,9 +43,9 @@
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
index b0174ee1e91e..a9ce5e7cced9 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
@@ -30,9 +30,9 @@
 import javax.websocket.Decoder;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 
 public class AvailableDecoders implements Iterable<RegisteredDecoder>
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
index dac4741c4a94..74e8490865fc 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
@@ -29,10 +29,10 @@
 import javax.websocket.Encoder;
 import javax.websocket.EndpointConfig;
 
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.InitException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 
 public class AvailableEncoders implements Predicate<Class<?>>
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
index 9ae040bb9c6f..d8d76cd8f920 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
@@ -28,8 +28,8 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
index bd2b2aa9d1f9..7b896904f47c 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
@@ -28,10 +28,10 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
index 38c40b45ac7f..03b6d0eb276d 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
@@ -29,10 +29,10 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 
 public class DecodedBinaryStreamMessageSink<T> extends AbstractDecodedMessageSink.Stream<Decoder.BinaryStream<T>>
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
index ff1749550c5e..1c6b4c3bacde 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
@@ -27,10 +27,10 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
index ff2caa4730a9..3e26ee0f5369 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
@@ -29,10 +29,10 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.ReaderMessageSink;
 
 public class DecodedTextStreamMessageSink<T> extends AbstractDecodedMessageSink.Stream<Decoder.TextStream<T>>
 {
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
index 5ac2117464a0..868609264b86 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
@@ -22,7 +22,7 @@
 import javax.websocket.ClientEndpointConfig;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 
 public class DummyFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory
 {
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
index cf4b7dc9e758..b012e8098d7c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
@@ -25,7 +25,7 @@
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
index 2d05a5b3e8ef..d6f00afa3194 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
@@ -29,8 +29,8 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
index ccb95e2674ea..f7dbd053290b 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
@@ -29,8 +29,8 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
index eb8a9fb32fec..2e6eee2a915c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
@@ -35,8 +35,8 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
+import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
 import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest;
-import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
index 3bab792edcaa..c0ff9b1e20e6 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
index d9b5b131afe2..82f74d695a06 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
@@ -26,9 +26,9 @@
 import javax.websocket.Session;
 
 import org.eclipse.jetty.util.annotation.Name;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
index 54c6e51fa7ff..d35d2b755a61 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
@@ -24,8 +24,8 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
index 9ecb0e20cf16..5e2374da5a51 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 
 /**
  * Simple {@link InvokerUtils.ParamIdentifier}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
index 9d7026334d93..02205fcd529c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
@@ -18,7 +18,7 @@
 
 package org.eclipse.jetty.websocket.javax.common.util;
 
-import org.eclipse.jetty.websocket.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
index 48e0dff9169c..6f1e98641fab 100644
--- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
+++ b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
@@ -14,7 +14,6 @@ annotations
 lib/websocket/websocket-core-common-${jetty.version}.jar
 lib/websocket/websocket-core-client-${jetty.version}.jar
 lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-util-server-${jetty.version}.jar
 lib/websocket/jetty-javax-websocket-api-1.1.2.jar
 lib/websocket/websocket-javax-client-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
index f9218c819d95..cafa5ca65ca1 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
@@ -38,11 +38,11 @@
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
index 44410741311a..2e7fa162b319 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
@@ -22,8 +22,8 @@
 import java.lang.reflect.Method;
 import javax.websocket.server.PathParam;
 
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 
 /**
  * Method argument identifier for {@link javax.websocket.server.PathParam} annotations.
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
index c7008dea7801..eb2d0fb2ba1b 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
@@ -23,9 +23,9 @@
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletableFuture;
 
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 
 public class CompletableFutureMethodHandle
 {
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
index bc77695fc28e..bc303efaff49 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
@@ -22,10 +22,10 @@
 import javax.websocket.MessageHandler;
 import javax.websocket.PongMessage;
 
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.tests.MessageType;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
index 9699f2a3bc02..c7397d97712a 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
@@ -45,9 +45,9 @@
 import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.eclipse.jetty.websocket.javax.tests.CoreServer;
 import org.eclipse.jetty.websocket.javax.tests.DataUtils;
-import org.eclipse.jetty.websocket.util.TextUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
index e279680f6f31..40be5379306d 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
@@ -31,10 +31,10 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.toolchain.test.Hex;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
index acde049e0450..bca0d048710f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
@@ -30,10 +30,10 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.toolchain.test.Hex;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.IntegerEncoder;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
index 28d96a65280c..52f1cf3d20a7 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
@@ -39,12 +39,12 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.common.decoders.AbstractDecoder;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.javax.tests.EventSocket;
 import org.eclipse.jetty.websocket.javax.tests.WSURI;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AddEndpointTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AddEndpointTest.java
index 66e654c35270..ac93de20aced 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AddEndpointTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AddEndpointTest.java
@@ -40,7 +40,6 @@
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.javax.tests.WSURI;
 import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.BasicOpenCloseSocket;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
index e8abab0ecc65..0f54e8de10b8 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
@@ -29,6 +29,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidCloseIntSocket;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorErrorSocket;
@@ -36,7 +37,6 @@
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenCloseReasonSocket;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenIntSocket;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenSessionIntSocket;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod b/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
index 0e35bf32ce45..78420f79fb4b 100644
--- a/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
+++ b/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
@@ -13,7 +13,6 @@ annotations
 [lib]
 lib/websocket/websocket-core-common-${jetty.version}.jar
 lib/websocket/websocket-core-client-${jetty.version}.jar
-lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-jetty-api-${jetty.version}.jar
 lib/websocket/websocket-jetty-common-${jetty.version}.jar
 lib/websocket/websocket-jetty-client-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java
index c967c537075f..15148e7d9d26 100644
--- a/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java
+++ b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java
@@ -20,15 +20,12 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.eclipse.jetty.client.HttpResponse;
-import org.eclipse.jetty.http.HttpField;
-import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml
index b3809d06724e..de119c47126e 100644
--- a/jetty-websocket/websocket-jetty-common/pom.xml
+++ b/jetty-websocket/websocket-jetty-common/pom.xml
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util</artifactId>
+      <artifactId>websocket-core-common</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
index 848cf00520fa..2e235491619f 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
@@ -27,7 +27,6 @@
     requires org.slf4j;
     requires transitive org.eclipse.jetty.websocket.core.common;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
-    requires transitive org.eclipse.jetty.websocket.util;
 
     provides ExtensionConfig.Parser with ExtensionConfigParser;
 }
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
index 484235984fc8..dbdc3a339334 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
@@ -45,9 +45,9 @@
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
index da579a24477e..da09da6009f6 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
@@ -51,18 +51,18 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
-import org.eclipse.jetty.websocket.util.messages.ByteArrayMessageSink;
-import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
-import org.eclipse.jetty.websocket.util.messages.ReaderMessageSink;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 
 /**
  * Factory to create {@link JettyWebSocketFrameHandler} instances suitable for
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
index ae782768f906..99385ddf53fd 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.exceptions.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
 
 public class JettyWebSocketFrameHandlerMetadata extends Configuration.ConfigurationCustomizer
 {
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
index 4ec9847e0af0..43a4217136e9 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
@@ -38,7 +38,7 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.core.CloseStatus;
-import org.eclipse.jetty.websocket.util.TextUtils;
+import org.eclipse.jetty.websocket.core.util.TextUtils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
index de31a6b50470..45bbdaf40cfa 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
@@ -19,12 +19,12 @@
 package org.eclipse.jetty.websocket.common;
 
 import org.eclipse.jetty.websocket.api.exceptions.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.DuplicateAnnotationException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.messages.ByteArrayMessageSink;
-import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.util.messages.ReaderMessageSink;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.util.DuplicateAnnotationException;
+import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
index b7fe9197f99c..0b56fc4798c9 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.MessageInputStream;
+import org.eclipse.jetty.websocket.core.messages.MessageInputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
index f090d20a4de9..73e508791d82 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
@@ -23,7 +23,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
index 366827f169f1..cff6767b092d 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
@@ -31,9 +31,9 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
index 315d7ee4fe76..8185aa718111 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
@@ -24,8 +24,8 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
index 5caedfa43cb6..b19d8d1c2ec8 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 
 /**
  * Simple {@link InvokerUtils.ParamIdentifier}
diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
index 8194e1e74889..53eb8a2a7cf4 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
+++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
@@ -12,7 +12,6 @@ annotations
 [lib]
 lib/websocket/websocket-core-common-${jetty.version}.jar
 lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-util-server-${jetty.version}.jar
 lib/websocket/websocket-jetty-api-${jetty.version}.jar
 lib/websocket/websocket-jetty-common-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index 1729cd545f0f..f2be5c65290d 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -40,11 +40,11 @@
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
 import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java
index d1c7db2f4c24..7672f85ab56b 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.eclipse.jetty.websocket.api.WriteCallback;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 
 @SuppressWarnings("unused")
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
index 36bc27041e5e..f87a54520cfe 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
@@ -40,6 +40,7 @@
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.common.WebSocketSession;
+import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
@@ -47,7 +48,6 @@
 import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.tests.CloseTrackingEndpoint;
-import org.eclipse.jetty.websocket.util.TextUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml
deleted file mode 100644
index cafdccef9492..000000000000
--- a/jetty-websocket/websocket-util/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.websocket</groupId>
-    <artifactId>websocket-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-util</artifactId>
-  <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Util</name>
-
-  <properties>
-    <bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>ban-java-servlet-api</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <includes>
-                    <include>javax.servlet</include>
-                    <include>servletapi</include>
-                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
-                    <include>org.mortbay.jetty:servlet-api</include>
-                    <include>jetty:servlet-api</include>
-                    <include>jetty-servlet-api</include>
-                  </includes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/jetty-websocket/websocket-util/src/main/java/module-info.java b/jetty-websocket/websocket-util/src/main/java/module-info.java
deleted file mode 100644
index fdca115546e7..000000000000
--- a/jetty-websocket/websocket-util/src/main/java/module-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
-//
-// This program and the accompanying materials are made available under
-// the terms of the Eclipse Public License 2.0 which is available at
-// https://www.eclipse.org/legal/epl-2.0
-//
-// This Source Code may also be made available under the following
-// Secondary Licenses when the conditions for such availability set
-// forth in the Eclipse Public License, v. 2.0 are satisfied:
-// the Apache License v2.0 which is available at
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-// ========================================================================
-//
-
-module org.eclipse.jetty.websocket.util
-{
-    exports org.eclipse.jetty.websocket.util;
-    exports org.eclipse.jetty.websocket.util.messages;
-
-    requires transitive org.eclipse.jetty.websocket.core.common;
-    requires org.slf4j;
-}
diff --git a/jetty-websocket/websocket-util/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-util/src/test/resources/jetty-logging.properties
deleted file mode 100644
index 376b9b6babb6..000000000000
--- a/jetty-websocket/websocket-util/src/test/resources/jetty-logging.properties
+++ /dev/null
@@ -1 +0,0 @@
-# Jetty Logging using jetty-slf4j-impl

From 855f12596e9cbbb2ee5096984b00dd6ccee68eb4 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 12:29:55 +1100
Subject: [PATCH 02/21] move websocket-util-server implementation to
 websocket-core-server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../jetty/websocket/core/MessageHandler.java  |  2 +-
 .../core/server}/FrameHandlerFactory.java     |  2 +-
 .../websocket/core/server/Negotiation.java    |  3 ---
 .../core/server}/ServerUpgradeRequest.java    |  7 ++----
 .../core/server}/ServerUpgradeResponse.java   |  6 +----
 .../core/server}/WebSocketCreator.java        |  2 +-
 .../core/server}/WebSocketMapping.java        | 12 +++++-----
 .../core/server/WebSocketUpgradeHandler.java  | 16 ++++++--------
 .../server/internal/AbstractHandshaker.java   |  1 -
 .../server/{ => internal}/Handshaker.java     |  9 ++------
 .../server/internal/HandshakerSelector.java   |  1 -
 .../internal/UpgradeHttpServletRequest.java   |  2 +-
 .../core/chat/ChatWebSocketServer.java        |  4 ++++
 .../src/main/java/module-info.java            |  1 +
 ...xWebSocketServletContainerInitializer.java |  2 +-
 .../internal/JavaxServerUpgradeRequest.java   |  2 +-
 .../internal/JavaxWebSocketCreator.java       |  6 ++---
 .../JavaxWebSocketServerContainer.java        |  2 +-
 ...vaxWebSocketServerFrameHandlerFactory.java |  6 ++---
 .../server/internal/JsrHandshakeRequest.java  |  2 +-
 .../server/internal/JsrHandshakeResponse.java |  2 +-
 .../src/main/java/module-info.java            |  1 +
 .../server/JettyWebSocketServerContainer.java | 22 +++++--------------
 .../server/JettyWebSocketServlet.java         | 10 ++++-----
 ...yWebSocketServletContainerInitializer.java |  2 +-
 .../DelegatedServerUpgradeRequest.java        |  2 +-
 .../DelegatedServerUpgradeResponse.java       |  2 +-
 .../JettyServerFrameHandlerFactory.java       |  6 ++---
 .../tests/WebSocketOverHTTP2Test.java         |  2 +-
 .../src/main/java/module-info.java            |  5 ++---
 .../util/server/WebSocketUpgradeFilter.java   |  2 +-
 31 files changed, 58 insertions(+), 86 deletions(-)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server}/FrameHandlerFactory.java (96%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server}/ServerUpgradeRequest.java (98%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server}/ServerUpgradeResponse.java (97%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server}/WebSocketCreator.java (96%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server}/WebSocketMapping.java (96%)
 rename jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/{ => internal}/Handshaker.java (84%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util => websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core}/server/internal/UpgradeHttpServletRequest.java (99%)

diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
index 4a2620ddf4d6..3c9ee20ca9af 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
@@ -87,7 +87,7 @@ protected void onBinary(ByteBuffer message, Callback callback)
         };
     }
 
-    protected static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);
 
     private CoreSession coreSession;
     private Utf8StringBuilder textMessageBuffer;
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/FrameHandlerFactory.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java
similarity index 96%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/FrameHandlerFactory.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java
index 1eb7c367fee8..b39c8123f3e3 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/FrameHandlerFactory.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import org.eclipse.jetty.websocket.core.FrameHandler;
 
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
index 34fc7eb7fdf3..d6f982d034ca 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
@@ -33,7 +33,6 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
 
 public abstract class Negotiation
 {
@@ -45,7 +44,6 @@ public abstract class Negotiation
     private List<ExtensionConfig> offeredExtensions;
     private List<ExtensionConfig> negotiatedExtensions;
     private List<String> offeredProtocols;
-    private ExtensionStack extensionStack;
     private String protocol;
 
     public Negotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
@@ -180,7 +178,6 @@ public void setNegotiatedExtensions(List<ExtensionConfig> extensions)
         if (extensions == offeredExtensions)
             return;
         negotiatedExtensions = extensions;
-        extensionStack = null;
     }
 
     @Override
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeRequest.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
similarity index 98%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeRequest.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
index 81a9b31e98f5..0420defa43cc 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeRequest.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.net.HttpCookie;
 import java.net.InetSocketAddress;
@@ -41,11 +41,8 @@
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.internal.UpgradeHttpServletRequest;
 
-/**
- * Holder of request data for a WebSocket upgrade request.
- */
 public class ServerUpgradeRequest
 {
     private final URI requestURI;
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeResponse.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
similarity index 97%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeResponse.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
index 9c3743136a7d..6a1a5784b27c 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/ServerUpgradeResponse.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,11 +31,7 @@
 
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
 
-/**
- * Servlet Specific UpgradeResponse implementation.
- */
 public class ServerUpgradeResponse
 {
     private final HttpServletResponse response;
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketCreator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
similarity index 96%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketCreator.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
index 9479a66d3676..90767a392303 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketCreator.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 /**
  * Abstract WebSocket creator interface.
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
similarity index 96%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
index e93c0c4c0192..f32c41a062e3 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicReference;
@@ -39,10 +39,8 @@
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
+import org.eclipse.jetty.websocket.core.server.internal.Handshaker;
+import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -137,7 +135,7 @@ else if (rawSpec.startsWith("uri-template|"))
 
     private final PathMappings<Negotiator> mappings = new PathMappings<>();
     private final WebSocketComponents components;
-    private final Handshaker handshaker = Handshaker.newInstance();
+    private final Handshaker handshaker = new HandshakerSelector();
 
     public WebSocketMapping()
     {
@@ -246,7 +244,7 @@ private class Negotiator extends WebSocketNegotiator.AbstractNegotiator
 
         public Negotiator(WebSocketCreator creator, FrameHandlerFactory factory, Configuration.Customizer customizer)
         {
-            super(components, customizer);
+            super(WebSocketMapping.this.components, customizer);
             this.creator = creator;
             this.factory = factory;
         }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index e85fda1d2be7..77ac9a4d21af 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.servlet.ServletException;
@@ -29,15 +30,17 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.server.internal.Handshaker;
+import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class WebSocketUpgradeHandler extends HandlerWrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeHandler.class);
-    final Handshaker handshaker = Handshaker.newInstance();
-    final PathSpecSet paths = new PathSpecSet();
-    final WebSocketNegotiator negotiator;
+    private final Handshaker handshaker = new HandshakerSelector();
+    private final PathSpecSet paths = new PathSpecSet();
+    private final WebSocketNegotiator negotiator;
 
     public WebSocketUpgradeHandler(
         Function<Negotiation, FrameHandler> negotiate,
@@ -60,12 +63,7 @@ public WebSocketNegotiator getWebSocketNegotiator()
     public void addPathSpec(String... pathSpecs)
     {
         if (pathSpecs != null)
-        {
-            for (String spec : pathSpecs)
-            {
-                this.paths.add(spec);
-            }
-        }
+            this.paths.addAll(Arrays.asList(pathSpecs));
     }
 
     @Override
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
index 6dde83487ffb..cc04b8890cd4 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
@@ -47,7 +47,6 @@
 import org.eclipse.jetty.websocket.core.internal.Negotiated;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
 import org.eclipse.jetty.websocket.core.server.Negotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.slf4j.Logger;
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
similarity index 84%
rename from jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
index e3cc18fc7ea0..0321b2c3797d 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
@@ -16,21 +16,16 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.server;
+package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 public interface Handshaker
 {
-    static Handshaker newInstance()
-    {
-        return new HandshakerSelector();
-    }
-
     boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException;
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
index 30a59cd22192..a776175869fc 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
@@ -23,7 +23,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 /**
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/UpgradeHttpServletRequest.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java
similarity index 99%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/UpgradeHttpServletRequest.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java
index 93482fcc5a55..264d42a7b349 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/UpgradeHttpServletRequest.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.BufferedReader;
 import java.net.InetSocketAddress;
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
index fee181609553..e98285a75a29 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
@@ -40,11 +40,15 @@
 import org.eclipse.jetty.websocket.core.server.Negotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.eclipse.jetty.util.Callback.NOOP;
 
 public class ChatWebSocketServer
 {
+    protected static final Logger LOG = LoggerFactory.getLogger(ChatWebSocketServer.class);
+
     private final Set<MessageHandler> members = new HashSet<>();
 
     private FrameHandler negotiate(Negotiation negotiation)
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
index c4ad6598d80f..a08bff09ef12 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
@@ -30,6 +30,7 @@
 
     requires org.eclipse.jetty.websocket.javax.common;
     requires org.eclipse.jetty.websocket.util.server;
+    requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.javax.client;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
index 4325b3240c89..7d3c857704a9 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
@@ -37,10 +37,10 @@
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.thread.ThreadClassLoaderScope;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java
index fb530a6b3848..f0733e1d7943 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java
@@ -21,8 +21,8 @@
 import java.net.URI;
 import java.security.Principal;
 
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
 import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
 
 public class JavaxServerUpgradeRequest implements UpgradeRequest
 {
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java
index c428010a221d..5b50bb4c05ff 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java
@@ -34,13 +34,13 @@
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.WebSocketCreator;
 import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtension;
 import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
index cafa5ca65ca1..894038de8773 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
@@ -37,13 +37,13 @@
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java
index e9e69a3a1cf4..191551260d76 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java
@@ -23,12 +23,12 @@
 
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
 import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
-import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
 
 public class JavaxWebSocketServerFrameHandlerFactory extends JavaxWebSocketClientFrameHandlerFactory implements FrameHandlerFactory
 {
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java
index 280cecd27e45..96abb136de3c 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java
@@ -25,7 +25,7 @@
 import javax.websocket.server.HandshakeRequest;
 
 import org.eclipse.jetty.http.pathmap.PathSpec;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
 
 public class JsrHandshakeRequest implements HandshakeRequest
 {
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java
index b55ec99f3fd2..985ae03e0cd1 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import javax.websocket.HandshakeResponse;
 
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
 
 public class JsrHandshakeResponse implements HandshakeResponse
 {
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
index 6156e8d5a307..d7981bbeba45 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
@@ -30,6 +30,7 @@
     requires jetty.servlet.api;
     requires org.eclipse.jetty.websocket.jetty.common;
     requires org.eclipse.jetty.websocket.util.server;
+    requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index f2be5c65290d..76e51b991e4b 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -37,17 +37,15 @@
 import org.eclipse.jetty.websocket.api.WebSocketSessionListener;
 import org.eclipse.jetty.websocket.common.SessionTracker;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
-import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,10 +73,8 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl
                 executor = contextHandler.getServer().getThreadPool();
 
             // Create the Jetty ServerContainer implementation
-            container = new JettyWebSocketServerContainer(
-                contextHandler,
-                WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY),
-                WebSocketServerComponents.getWebSocketComponents(servletContext), executor);
+            WebSocketMapping mappings = WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY);
+            container = new JettyWebSocketServerContainer(contextHandler, mappings, executor);
             servletContext.setAttribute(JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE, container);
             contextHandler.addManaged(container);
             contextHandler.addEventListener(container);
@@ -91,7 +87,6 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl
 
     private final ServletContextHandler contextHandler;
     private final WebSocketMapping webSocketMapping;
-    private final WebSocketComponents components;
     private final FrameHandlerFactory frameHandlerFactory;
     private final Executor executor;
     private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
@@ -103,15 +98,13 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl
      * Main entry point for {@link JettyWebSocketServletContainerInitializer}.
      *
      * @param webSocketMapping the {@link WebSocketMapping} that this container belongs to
-     * @param components the {@link WebSocketComponents} instance to use
      * @param executor the {@link Executor} to use
      */
-    JettyWebSocketServerContainer(ServletContextHandler contextHandler, WebSocketMapping webSocketMapping, WebSocketComponents components, Executor executor)
+    JettyWebSocketServerContainer(ServletContextHandler contextHandler, WebSocketMapping webSocketMapping, Executor executor)
     {
         this.contextHandler = contextHandler;
         this.webSocketMapping = webSocketMapping;
         this.executor = executor;
-        this.components = components;
 
         // Ensure there is a FrameHandlerFactory
         JettyServerFrameHandlerFactory factory = contextHandler.getBean(JettyServerFrameHandlerFactory.class);
@@ -157,11 +150,6 @@ public void addMapping(String pathSpec, final Class<?> endpointClass)
         });
     }
 
-    public WebSocketComponents getWebSocketComponents()
-    {
-        return components;
-    }
-
     @Override
     public Executor getExecutor()
     {
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
index eb5f4016c5ec..b36b3bd2cd5b 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
@@ -31,16 +31,16 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.WebSocketCreator;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
-import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketCreator;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
index bbe0e33bda98..01bc539ce9c7 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
@@ -25,9 +25,9 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.listener.ContainerInitializer;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeRequest.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeRequest.java
index 1969e792b4c4..789e2c599713 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeRequest.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeRequest.java
@@ -33,8 +33,8 @@
 
 import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
 
 public class DelegatedServerUpgradeRequest implements JettyServerUpgradeRequest
 {
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeResponse.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeResponse.java
index 287e3649266f..8ea5d42f578f 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeResponse.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeResponse.java
@@ -26,8 +26,8 @@
 
 import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
 
 public class DelegatedServerUpgradeResponse implements JettyServerUpgradeResponse
 {
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
index b7e594aedb16..5b085ea9b8ba 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
@@ -27,9 +27,9 @@
 import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandler;
 import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;
-import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
 
 public class JettyServerFrameHandlerFactory extends JettyWebSocketFrameHandlerFactory implements FrameHandlerFactory, LifeCycle.Listener
 {
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
index 87725e660856..3b15549f19bf 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
@@ -61,10 +61,10 @@
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.exceptions.UpgradeException;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.eclipse.jetty.websocket.core.server.internal.UpgradeHttpServletRequest;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.util.server.internal.UpgradeHttpServletRequest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-util-server/src/main/java/module-info.java b/jetty-websocket/websocket-util-server/src/main/java/module-info.java
index c067bea8bf3b..6981140f77b6 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-util-server/src/main/java/module-info.java
@@ -19,9 +19,8 @@
 module org.eclipse.jetty.websocket.util.server
 {
     exports org.eclipse.jetty.websocket.util.server;
-    exports org.eclipse.jetty.websocket.util.server.internal to org.eclipse.jetty.websocket.jetty.server, org.eclipse.jetty.websocket.javax.server;
-    
+
     requires org.slf4j;
+    requires org.eclipse.jetty.websocket.core.server;
     requires transitive org.eclipse.jetty.servlet;
-    requires transitive org.eclipse.jetty.websocket.core.server;
 }
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
index f285b8b910bf..53220fceef9f 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
+++ b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
@@ -40,7 +40,7 @@
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
+import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

From 67677b84ad2d7768bfc2d7fd953a212b7091332a Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 14:39:15 +1100
Subject: [PATCH 03/21] rename websocket-util-server to websocket-servlet

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 demos/embedded/pom.xml                                        | 2 +-
 jetty-bom/pom.xml                                             | 2 +-
 jetty-gcloud/jetty-gcloud-session-manager/pom.xml             | 2 +-
 jetty-home/pom.xml                                            | 2 +-
 jetty-osgi/test-jetty-osgi/pom.xml                            | 2 +-
 .../test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java   | 2 +-
 jetty-websocket/pom.xml                                       | 2 +-
 .../jetty/websocket/core/server/WebSocketUpgradeHandler.java  | 4 +---
 jetty-websocket/websocket-javax-server/pom.xml                | 2 +-
 .../src/main/config/modules/websocket-javax.mod               | 2 +-
 .../websocket-javax-server/src/main/java/module-info.java     | 2 +-
 .../config/JavaxWebSocketServletContainerInitializer.java     | 2 +-
 .../jetty/websocket/javax/tests/server/AltFilterTest.java     | 2 +-
 .../src/test/resources/alt-filter-web.xml                     | 2 +-
 .../src/test/resources/wsuf-alt-config-via-listener.xml       | 2 +-
 .../src/test/resources/wsuf-config-via-listener.xml           | 2 +-
 .../src/test/resources/wsuf-config-via-servlet-init.xml       | 2 +-
 jetty-websocket/websocket-jetty-server/pom.xml                | 2 +-
 .../src/main/config/modules/websocket-jetty.mod               | 2 +-
 .../websocket-jetty-server/src/main/java/module-info.java     | 2 +-
 .../jetty/websocket/server/JettyWebSocketServerContainer.java | 2 +-
 .../eclipse/jetty/websocket/server/JettyWebSocketServlet.java | 2 +-
 .../jetty/websocket/tests/JettyWebSocketFilterTest.java       | 2 +-
 .../{websocket-util-server => websocket-servlet}/pom.xml      | 2 +-
 .../src/main/java/module-info.java                            | 4 ++--
 .../jetty/websocket/servlet}/WebSocketUpgradeFilter.java      | 2 +-
 26 files changed, 27 insertions(+), 29 deletions(-)
 rename jetty-websocket/{websocket-util-server => websocket-servlet}/pom.xml (98%)
 rename jetty-websocket/{websocket-util-server => websocket-servlet}/src/main/java/module-info.java (89%)
 rename jetty-websocket/{websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server => websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet}/WebSocketUpgradeFilter.java (99%)

diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml
index 1a0cde082d09..dff3c9f69bec 100644
--- a/demos/embedded/pom.xml
+++ b/demos/embedded/pom.xml
@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index 1b57992da501..8adb720db91b 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -364,7 +364,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-util-server</artifactId>
+        <artifactId>websocket-servlet</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 93093f2b624d..b4ad7355ace1 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 0397b02b90cf..a6c6af75309e 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -647,7 +647,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 52a27baa1ca9..8c8bb65d2407 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -316,7 +316,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index fd2c6f18481a..f64f4f6e6afb 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -186,7 +186,7 @@ public static List<Option> coreJettyDependencies()
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util-server").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start());
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 1f543b83aa5e..c2e4e8f858c8 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -29,7 +29,7 @@
     <module>websocket-javax-server</module>
     <module>websocket-javax-tests</module>
     <!-- Common WebSocket Implementation -->
-    <module>websocket-util-server</module>
+    <module>websocket-servlet</module>
   </modules>
   <build>
     <plugins>
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index 77ac9a4d21af..9d8b01ee7120 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -42,9 +42,7 @@ public class WebSocketUpgradeHandler extends HandlerWrapper
     private final PathSpecSet paths = new PathSpecSet();
     private final WebSocketNegotiator negotiator;
 
-    public WebSocketUpgradeHandler(
-        Function<Negotiation, FrameHandler> negotiate,
-        String... pathSpecs)
+    public WebSocketUpgradeHandler(Function<Negotiation, FrameHandler> negotiate, String... pathSpecs)
     {
         this(WebSocketNegotiator.from(negotiate), pathSpecs);
     }
diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml
index a0251b8779c7..d380a257888d 100644
--- a/jetty-websocket/websocket-javax-server/pom.xml
+++ b/jetty-websocket/websocket-javax-server/pom.xml
@@ -22,7 +22,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
index 6f1e98641fab..c0b07f110478 100644
--- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
+++ b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
@@ -14,7 +14,7 @@ annotations
 lib/websocket/websocket-core-common-${jetty.version}.jar
 lib/websocket/websocket-core-client-${jetty.version}.jar
 lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-util-server-${jetty.version}.jar
+lib/websocket/websocket-servlet-${jetty.version}.jar
 lib/websocket/jetty-javax-websocket-api-1.1.2.jar
 lib/websocket/websocket-javax-client-${jetty.version}.jar
 lib/websocket/websocket-javax-common-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
index a08bff09ef12..60102eb22e1e 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
@@ -29,7 +29,7 @@
     exports org.eclipse.jetty.websocket.javax.server.config;
 
     requires org.eclipse.jetty.websocket.javax.common;
-    requires org.eclipse.jetty.websocket.util.server;
+    requires org.eclipse.jetty.websocket.servlet;
     requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
index 7d3c857704a9..faa3365c2189 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
@@ -40,7 +40,7 @@
 import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
-import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
index 31df6bdda450..8916f604c9c8 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
@@ -30,7 +30,7 @@
 import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
 import org.eclipse.jetty.websocket.javax.tests.WSServer;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket;
-import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
index ccf98c85030a..294ad6e8d65e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
+++ b/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
@@ -13,7 +13,7 @@
 
   <filter>
     <filter-name>wsuf-test</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>jetty.websocket.WebSocketMapping</param-name>
       <param-value>jetty.websocket.defaultMapping</param-value>
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml
index 647d0947663f..1479493aff3e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml
+++ b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml
@@ -12,7 +12,7 @@
 
   <filter>
     <filter-name>wsuf-alt</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>configAttributeKey</param-name>
       <param-value>alt.config</param-value>
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml
index 595de89a035c..d9811f6e0e5e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml
+++ b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml
@@ -16,7 +16,7 @@
 
   <filter>
     <filter-name>wsuf</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
   </filter>
 
   <filter-mapping>
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml
index 56a333bfee1e..f8c8fbf61e92 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml
+++ b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml
@@ -18,7 +18,7 @@
 
   <filter>
     <filter-name>wsuf</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
   </filter>
 
   <filter-mapping>
diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml
index 0387a72b773d..321280eafc1f 100644
--- a/jetty-websocket/websocket-jetty-server/pom.xml
+++ b/jetty-websocket/websocket-jetty-server/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
index 53eb8a2a7cf4..e9d04d710d86 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
+++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
@@ -12,7 +12,7 @@ annotations
 [lib]
 lib/websocket/websocket-core-common-${jetty.version}.jar
 lib/websocket/websocket-core-server-${jetty.version}.jar
-lib/websocket/websocket-util-server-${jetty.version}.jar
+lib/websocket/websocket-servlet-${jetty.version}.jar
 lib/websocket/websocket-jetty-api-${jetty.version}.jar
 lib/websocket/websocket-jetty-common-${jetty.version}.jar
 lib/websocket/websocket-jetty-server-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
index d7981bbeba45..78cf8a627cc2 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
@@ -29,7 +29,7 @@
 
     requires jetty.servlet.api;
     requires org.eclipse.jetty.websocket.jetty.common;
-    requires org.eclipse.jetty.websocket.util.server;
+    requires org.eclipse.jetty.websocket.servlet;
     requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index 76e51b991e4b..9a8736cd012f 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -45,7 +45,7 @@
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
index b36b3bd2cd5b..c80478c080d2 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
@@ -40,7 +40,7 @@
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
-import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java
index c0be53db2630..6ab8b6c832da 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java
@@ -33,7 +33,7 @@
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-util-server/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
similarity index 98%
rename from jetty-websocket/websocket-util-server/pom.xml
rename to jetty-websocket/websocket-servlet/pom.xml
index 3fd5fc74a48d..5121c83e8dbf 100644
--- a/jetty-websocket/websocket-util-server/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-util-server</artifactId>
+  <artifactId>websocket-servlet</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Util-Server</name>
 
   <properties>
diff --git a/jetty-websocket/websocket-util-server/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
similarity index 89%
rename from jetty-websocket/websocket-util-server/src/main/java/module-info.java
rename to jetty-websocket/websocket-servlet/src/main/java/module-info.java
index 6981140f77b6..80d8bc15893d 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
@@ -16,9 +16,9 @@
 // ========================================================================
 //
 
-module org.eclipse.jetty.websocket.util.server
+module org.eclipse.jetty.websocket.servlet
 {
-    exports org.eclipse.jetty.websocket.util.server;
+    exports org.eclipse.jetty.websocket.servlet;
 
     requires org.slf4j;
     requires org.eclipse.jetty.websocket.core.server;
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java
similarity index 99%
rename from jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
rename to jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java
index 53220fceef9f..c6b121143641 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketUpgradeFilter.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server;
+package org.eclipse.jetty.websocket.servlet;
 
 import java.io.IOException;
 import java.time.Duration;

From 0ae5b8f8b75f6c725cb9c0e90fd0b2dde7799eeb Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 19:26:30 +1100
Subject: [PATCH 04/21] Negotiator should not need the WebSocketComponents,
 give this to handshaker instead

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../core/server/ServerUpgradeRequest.java     |   6 +-
 .../core/server/ServerUpgradeResponse.java    |   4 +-
 .../core/server/WebSocketCreator.java         |   4 +-
 .../core/server/WebSocketMapping.java         | 100 ++++++------------
 ...tiation.java => WebSocketNegotiation.java} |   4 +-
 .../core/server/WebSocketNegotiator.java      |  84 ++-------------
 .../core/server/WebSocketUpgradeHandler.java  |  43 +++-----
 .../server/internal/AbstractHandshaker.java   |  13 ++-
 .../server/internal/CreatorNegotiator.java    |  68 ++++++++++++
 .../core/server/internal/Handshaker.java      |   3 +-
 .../server/internal/HandshakerSelector.java   |   7 +-
 .../server/internal/RFC6455Handshaker.java    |   8 +-
 .../server/internal/RFC6455Negotiation.java   |   4 +-
 .../server/internal/RFC8441Handshaker.java    |   6 +-
 .../server/internal/RFC8441Negotiation.java   |   4 +-
 .../websocket/core/EchoFrameHandler.java      |   7 +-
 .../jetty/websocket/core/FlushTest.java       |   2 +-
 .../jetty/websocket/core/FrameBufferTest.java |   2 +-
 .../websocket/core/TestUpgradeHandler.java    |  49 ---------
 .../core/TestWebSocketNegotiator.java         |  44 ++------
 .../core/TestWebSocketUpgradeHandler.java     |  50 ---------
 .../websocket/core/UpgradeHandlerTest.java    |  76 +++++++++++++
 .../core/WebSocketNegotiationTest.java        |   8 +-
 .../jetty/websocket/core/WebSocketServer.java |  12 ++-
 .../core/autobahn/AutobahnTests.java          |   2 +-
 .../core/autobahn/CoreAutobahnServer.java     |   8 +-
 .../core/chat/ChatWebSocketServer.java        |  10 +-
 .../PerMessageDeflaterBufferSizeTest.java     |   4 +-
 .../extensions/ValidationExtensionTest.java   |   4 +-
 .../core/proxy/WebSocketProxyTest.java        |  11 +-
 .../websocket/javax/tests/CoreServer.java     |  65 ++----------
 .../javax/tests/client/CookiesTest.java       |   4 +-
 .../tests/client/MessageReceivingTest.java    |  18 ++--
 .../server/JettyWebSocketServlet.java         |   3 +-
 34 files changed, 307 insertions(+), 430 deletions(-)
 rename jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/{Negotiation.java => WebSocketNegotiation.java} (96%)
 create mode 100644 jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
 delete mode 100644 jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
 delete mode 100644 jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
 create mode 100644 jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java

diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
index 0420defa43cc..31e88f31f230 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
@@ -49,11 +49,11 @@ public class ServerUpgradeRequest
     private final String queryString;
     private final UpgradeHttpServletRequest request;
     private final boolean secure;
-    private final Negotiation negotiation;
+    private final WebSocketNegotiation negotiation;
     private List<HttpCookie> cookies;
     private Map<String, List<String>> parameterMap;
 
-    public ServerUpgradeRequest(Negotiation negotiation) throws BadMessageException
+    public ServerUpgradeRequest(WebSocketNegotiation negotiation) throws BadMessageException
     {
         this.negotiation = negotiation;
         HttpServletRequest httpRequest = negotiation.getRequest();
@@ -111,7 +111,7 @@ public List<HttpCookie> getCookies()
 
     /**
      * @return The extensions offered
-     * @see Negotiation#getOfferedExtensions()
+     * @see WebSocketNegotiation#getOfferedExtensions()
      */
     public List<ExtensionConfig> getExtensions()
     {
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
index 6a1a5784b27c..2951475f168a 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java
@@ -35,9 +35,9 @@
 public class ServerUpgradeResponse
 {
     private final HttpServletResponse response;
-    private final Negotiation negotiation;
+    private final WebSocketNegotiation negotiation;
 
-    public ServerUpgradeResponse(Negotiation negotiation)
+    public ServerUpgradeResponse(WebSocketNegotiation negotiation)
     {
         this.negotiation = negotiation;
         this.response = negotiation.getResponse();
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
index 90767a392303..be320be7e737 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java
@@ -21,8 +21,8 @@
 /**
  * Abstract WebSocket creator interface.
  * <p>
- * Should you desire filtering of the WebSocket object creation due to criteria such as origin or sub-protocol, then you will be required to implement a custom
- * WebSocketCreator implementation.
+ * Should you desire filtering of the WebSocket object creation due to criteria such as origin or sub-protocol,
+ * then you will be required to implement a custom WebSocketCreator implementation.
  * </p>
  */
 public interface WebSocketCreator
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
index f32c41a062e3..778ffa99a62a 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMapping.java
@@ -19,7 +19,6 @@
 package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -39,6 +38,7 @@
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.server.internal.CreatorNegotiator;
 import org.eclipse.jetty.websocket.core.server.internal.Handshaker;
 import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
 import org.slf4j.Logger;
@@ -74,12 +74,6 @@ public static WebSocketMapping getMapping(ServletContext servletContext, String
         return null;
     }
 
-    public WebSocketCreator getMapping(PathSpec pathSpec)
-    {
-        Negotiator cn = mappings.get(pathSpec);
-        return cn == null ? null : cn.getWebSocketCreator();
-    }
-
     public static WebSocketMapping ensureMapping(ServletContext servletContext, String mappingKey)
     {
         WebSocketMapping mapping = getMapping(servletContext, mappingKey);
@@ -133,7 +127,7 @@ else if (rawSpec.startsWith("uri-template|"))
 
     public static final String DEFAULT_KEY = "jetty.websocket.defaultMapping";
 
-    private final PathMappings<Negotiator> mappings = new PathMappings<>();
+    private final PathMappings<WebSocketNegotiator> mappings = new PathMappings<>();
     private final WebSocketComponents components;
     private final Handshaker handshaker = new HandshakerSelector();
 
@@ -171,6 +165,19 @@ public void dump(Appendable out, String indent) throws IOException
         Dumpable.dumpObjects(out, indent, this, mappings);
     }
 
+    public WebSocketNegotiator getMapping(PathSpec pathSpec)
+    {
+        return mappings.get(pathSpec);
+    }
+
+    public WebSocketCreator getCreator(PathSpec pathSpec)
+    {
+        WebSocketNegotiator negotiator = getMapping(pathSpec);
+        if (negotiator instanceof CreatorNegotiator)
+            return  ((CreatorNegotiator)negotiator).getWebSocketCreator();
+        return null;
+    }
+
     /**
      * Manually add a WebSocket mapping.
      * <p>
@@ -181,12 +188,28 @@ public void dump(Appendable out, String indent) throws IOException
      *
      * @param pathSpec the pathspec to respond on
      * @param creator the websocket creator to activate on the provided mapping.
-     * @param factory the factory to use to create a FrameHandler for the websocket
+     * @param factory the factory to use to create a FrameHandler for the websocket.
      * @param customizer the customizer to use to customize the WebSocket session.
      */
     public void addMapping(PathSpec pathSpec, WebSocketCreator creator, FrameHandlerFactory factory, Configuration.Customizer customizer) throws WebSocketException
     {
-        mappings.put(pathSpec, new Negotiator(creator, factory, customizer));
+        mappings.put(pathSpec, new CreatorNegotiator(creator, factory, customizer));
+    }
+
+    /**
+     * Manually add a WebSocket mapping.
+     * <p>
+     * If mapping is added before this configuration is started, then it is persisted through
+     * stop/start of this configuration's lifecycle.  Otherwise it will be removed when
+     * this configuration is stopped.
+     * </p>
+     *
+     * @param pathSpec the pathspec to respond on
+     * @param negotiator the WebSocketNegotiator to use to create a FrameHandler for the websocket.
+     */
+    public void addMapping(PathSpec pathSpec, WebSocketNegotiator negotiator) throws WebSocketException
+    {
+        mappings.put(pathSpec, negotiator);
     }
 
     public boolean removeMapping(PathSpec pathSpec)
@@ -203,7 +226,7 @@ public boolean removeMapping(PathSpec pathSpec)
      */
     public WebSocketNegotiator getMatchedNegotiator(String target, Consumer<PathSpec> pathSpecConsumer)
     {
-        MappedResource<Negotiator> mapping = this.mappings.getMatch(target);
+        MappedResource<WebSocketNegotiator> mapping = this.mappings.getMatch(target);
         if (mapping == null)
             return null;
 
@@ -234,59 +257,6 @@ public boolean upgrade(HttpServletRequest request, HttpServletResponse response,
             LOG.debug("WebSocket Negotiated detected on {} for endpoint {}", target, negotiator);
 
         // We have an upgrade request
-        return handshaker.upgradeRequest(negotiator, request, response, defaultCustomizer);
-    }
-
-    private class Negotiator extends WebSocketNegotiator.AbstractNegotiator
-    {
-        private final WebSocketCreator creator;
-        private final FrameHandlerFactory factory;
-
-        public Negotiator(WebSocketCreator creator, FrameHandlerFactory factory, Configuration.Customizer customizer)
-        {
-            super(WebSocketMapping.this.components, customizer);
-            this.creator = creator;
-            this.factory = factory;
-        }
-
-        public WebSocketCreator getWebSocketCreator()
-        {
-            return creator;
-        }
-
-        @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
-        {
-            ServletContext servletContext = negotiation.getRequest().getServletContext();
-            if (servletContext == null)
-                throw new IllegalStateException("null servletContext from request");
-
-            ServerUpgradeRequest upgradeRequest = new ServerUpgradeRequest(negotiation);
-            ServerUpgradeResponse upgradeResponse = new ServerUpgradeResponse(negotiation);
-
-            AtomicReference<Object> result = new AtomicReference<>();
-            ((ContextHandler.Context)servletContext).getContextHandler().handle(() ->
-                result.set(creator.createWebSocket(upgradeRequest, upgradeResponse)));
-            Object websocketPojo = result.get();
-
-            // Handling for response forbidden (and similar paths)
-            if (upgradeResponse.isCommitted())
-                return null;
-
-            if (websocketPojo == null)
-            {
-                // no creation, sorry
-                upgradeResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, "WebSocket Endpoint Creation Refused");
-                return null;
-            }
-
-            return factory.newFrameHandler(websocketPojo, upgradeRequest, upgradeResponse);
-        }
-
-        @Override
-        public String toString()
-        {
-            return String.format("%s@%x{%s,%s,%s}", getClass().getSimpleName(), hashCode(), creator, factory, getCustomizer());
-        }
+        return handshaker.upgradeRequest(negotiator, request, response, components, defaultCustomizer);
     }
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
similarity index 96%
rename from jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
index d6f982d034ca..8f8020f38b79 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
@@ -34,7 +34,7 @@
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 
-public abstract class Negotiation
+public abstract class WebSocketNegotiation
 {
     private final Request baseRequest;
     private final HttpServletRequest request;
@@ -46,7 +46,7 @@ public abstract class Negotiation
     private List<String> offeredProtocols;
     private String protocol;
 
-    public Negotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    public WebSocketNegotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         this.baseRequest = baseRequest;
         this.request = request;
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
index 49815689baf3..e02811ac870d 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
@@ -21,77 +21,41 @@
 import java.io.IOException;
 import java.util.function.Function;
 
-import org.eclipse.jetty.io.ByteBufferPool;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
 
 public interface WebSocketNegotiator extends Configuration.Customizer
 {
-    FrameHandler negotiate(Negotiation negotiation) throws IOException;
+    FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException;
 
-    WebSocketExtensionRegistry getExtensionRegistry();
-
-    DecoratedObjectFactory getObjectFactory();
-
-    ByteBufferPool getByteBufferPool();
-
-    WebSocketComponents getWebSocketComponents();
-
-    static WebSocketNegotiator from(Function<Negotiation, FrameHandler> negotiate)
+    static WebSocketNegotiator from(Function<WebSocketNegotiation, FrameHandler> negotiate)
     {
-        return new AbstractNegotiator()
-        {
-            @Override
-            public FrameHandler negotiate(Negotiation negotiation)
-            {
-                return negotiate.apply(negotiation);
-            }
-        };
-    }
-
-    static WebSocketNegotiator from(Function<Negotiation, FrameHandler> negotiate, Configuration.Customizer customizer)
-    {
-        return new AbstractNegotiator(null, customizer)
-        {
-            @Override
-            public FrameHandler negotiate(Negotiation negotiation)
-            {
-                return negotiate.apply(negotiation);
-            }
-        };
+        return from(negotiate, null);
     }
 
-    static WebSocketNegotiator from(
-        Function<Negotiation, FrameHandler> negotiate,
-        WebSocketComponents components,
-        Configuration.Customizer customizer)
+    static WebSocketNegotiator from(Function<WebSocketNegotiation, FrameHandler> negotiate, Configuration.Customizer customizer)
     {
-        return new AbstractNegotiator(components, customizer)
+        return new AbstractNegotiator(customizer)
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation)
+            public FrameHandler negotiate(WebSocketNegotiation negotiation)
             {
                 return negotiate.apply(negotiation);
             }
         };
     }
 
-    abstract class AbstractNegotiator implements WebSocketNegotiator
+    abstract class AbstractNegotiator extends Configuration.ConfigurationCustomizer implements WebSocketNegotiator
     {
-        final WebSocketComponents components;
         final Configuration.Customizer customizer;
 
         public AbstractNegotiator()
         {
-            this(null, null);
+            this(null);
         }
 
-        public AbstractNegotiator(WebSocketComponents components, Configuration.Customizer customizer)
+        public AbstractNegotiator(Configuration.Customizer customizer)
         {
-            this.components = components == null ? new WebSocketComponents() : components;
             this.customizer = customizer;
         }
 
@@ -100,35 +64,7 @@ public void customize(Configuration configurable)
         {
             if (customizer != null)
                 customizer.customize(configurable);
-        }
-
-        @Override
-        public WebSocketExtensionRegistry getExtensionRegistry()
-        {
-            return components.getExtensionRegistry();
-        }
-
-        @Override
-        public DecoratedObjectFactory getObjectFactory()
-        {
-            return components.getObjectFactory();
-        }
-
-        @Override
-        public ByteBufferPool getByteBufferPool()
-        {
-            return components.getBufferPool();
-        }
-
-        @Override
-        public WebSocketComponents getWebSocketComponents()
-        {
-            return components;
-        }
-
-        public Configuration.Customizer getCustomizer()
-        {
-            return customizer;
+            super.customize(configurable);
         }
     }
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index 9d8b01ee7120..3ac2e752ea85 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -19,61 +19,50 @@
 package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.function.Function;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.http.pathmap.PathSpecSet;
+import org.eclipse.jetty.http.pathmap.PathSpec;
+import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.server.internal.Handshaker;
-import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
+import org.eclipse.jetty.websocket.core.Configuration;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class WebSocketUpgradeHandler extends HandlerWrapper
 {
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeHandler.class);
-    private final Handshaker handshaker = new HandshakerSelector();
-    private final PathSpecSet paths = new PathSpecSet();
-    private final WebSocketNegotiator negotiator;
 
-    public WebSocketUpgradeHandler(Function<Negotiation, FrameHandler> negotiate, String... pathSpecs)
+    private final WebSocketMapping mappings;
+    private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
+
+    public WebSocketUpgradeHandler()
     {
-        this(WebSocketNegotiator.from(negotiate), pathSpecs);
+        this(new WebSocketComponents());
     }
 
-    public WebSocketUpgradeHandler(WebSocketNegotiator negotiator, String... pathSpecs)
+    public WebSocketUpgradeHandler(WebSocketComponents components)
     {
-        this.negotiator = Objects.requireNonNull(negotiator);
-        addPathSpec(pathSpecs);
+        this.mappings = new WebSocketMapping(components);
     }
 
-    public WebSocketNegotiator getWebSocketNegotiator()
+    public void addMapping(String pathSpec, WebSocketNegotiator negotiator)
     {
-        return negotiator;
+        mappings.addMapping(new ServletPathSpec(pathSpec), negotiator);
     }
 
-    public void addPathSpec(String... pathSpecs)
+    public void addMapping(PathSpec pathSpec, WebSocketNegotiator negotiator)
     {
-        if (pathSpecs != null)
-            this.paths.addAll(Arrays.asList(pathSpecs));
+        mappings.addMapping(pathSpec, negotiator);
     }
 
     @Override
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
-        if (!paths.isEmpty() && !paths.test(target))
-        {
-            super.handle(target, baseRequest, request, response);
-            return;
-        }
-
-        if (handshaker.upgradeRequest(negotiator, request, response, null))
+        if (mappings.upgrade(request, response, customizer))
             return;
 
         if (!baseRequest.isHandled())
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
index cc04b8890cd4..870aa7c75617 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
@@ -47,7 +47,7 @@
 import org.eclipse.jetty.websocket.core.internal.Negotiated;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,13 +58,12 @@ public abstract class AbstractHandshaker implements Handshaker
     private static final HttpField SERVER_VERSION = new PreEncodedHttpField(HttpHeader.SERVER, HttpConfiguration.SERVER_VERSION);
 
     @Override
-    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException
+    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException
     {
         if (!validateRequest(request))
             return false;
 
-        WebSocketComponents components = negotiator.getWebSocketComponents();
-        Negotiation negotiation = newNegotiation(request, response, components);
+        WebSocketNegotiation negotiation = newNegotiation(request, response, components);
         if (LOG.isDebugEnabled())
             LOG.debug("negotiation {}", negotiation);
         negotiation.negotiate();
@@ -172,11 +171,11 @@ public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest
 
     protected abstract boolean validateRequest(HttpServletRequest request);
 
-    protected abstract Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents);
+    protected abstract WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents);
 
     protected abstract boolean validateFrameHandler(FrameHandler frameHandler, HttpServletResponse response);
 
-    protected boolean validateNegotiation(Negotiation negotiation)
+    protected boolean validateNegotiation(WebSocketNegotiation negotiation)
     {
         if (!negotiation.validateHeaders())
         {
@@ -218,5 +217,5 @@ protected WebSocketConnection newWebSocketConnection(EndPoint endPoint, Executor
         return new WebSocketConnection(endPoint, executor, scheduler, byteBufferPool, coreSession);
     }
 
-    protected abstract void prepareResponse(Response response, Negotiation negotiation);
+    protected abstract void prepareResponse(Response response, WebSocketNegotiation negotiation);
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
new file mode 100644
index 000000000000..d0227ba02353
--- /dev/null
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
@@ -0,0 +1,68 @@
+package org.eclipse.jetty.websocket.core.server.internal;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.WebSocketCreator;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
+
+public class CreatorNegotiator extends WebSocketNegotiator.AbstractNegotiator
+{
+    private final WebSocketCreator creator;
+    private final FrameHandlerFactory factory;
+
+    public CreatorNegotiator(WebSocketCreator creator, FrameHandlerFactory factory, Customizer customizer)
+    {
+        super(customizer);
+        this.creator = creator;
+        this.factory = factory;
+    }
+
+    public WebSocketCreator getWebSocketCreator()
+    {
+        return creator;
+    }
+
+    @Override
+    public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
+    {
+        ServletContext servletContext = negotiation.getRequest().getServletContext();
+        if (servletContext == null)
+            throw new IllegalStateException("null servletContext from request");
+
+        ServerUpgradeRequest upgradeRequest = new ServerUpgradeRequest(negotiation);
+        ServerUpgradeResponse upgradeResponse = new ServerUpgradeResponse(negotiation);
+
+        AtomicReference<Object> result = new AtomicReference<>();
+        ((ContextHandler.Context)servletContext).getContextHandler().handle(() ->
+            result.set(creator.createWebSocket(upgradeRequest, upgradeResponse)));
+        Object websocketPojo = result.get();
+
+        // Handling for response forbidden (and similar paths)
+        if (upgradeResponse.isCommitted())
+            return null;
+
+        if (websocketPojo == null)
+        {
+            // no creation, sorry
+            upgradeResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, "WebSocket Endpoint Creation Refused");
+            return null;
+        }
+
+        return factory.newFrameHandler(websocketPojo, upgradeRequest, upgradeResponse);
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x{%s,%s}", getClass().getSimpleName(), hashCode(), creator, factory);
+    }
+}
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
index 0321b2c3797d..ac68abe93473 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java
@@ -23,9 +23,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.websocket.core.Configuration;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 public interface Handshaker
 {
-    boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException;
+    boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException;
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
index a776175869fc..001b8ca502e1 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
@@ -23,6 +23,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.websocket.core.Configuration;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 /**
@@ -36,10 +37,10 @@ public class HandshakerSelector implements Handshaker
     private final RFC8441Handshaker rfc8441 = new RFC8441Handshaker();
 
     @Override
-    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException
+    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException
     {
         // Try HTTP/1.1 WS upgrade, if this fails try an HTTP/2 WS upgrade if no response was committed.
-        return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer) ||
-            !response.isCommitted() && rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer);
+        return rfc6455.upgradeRequest(negotiator, request, response, components, defaultCustomizer) ||
+            !response.isCommitted() && rfc8441.upgradeRequest(negotiator, request, response, components, defaultCustomizer);
     }
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
index 2c4df763b0bb..73f06c0e1760 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
@@ -37,7 +37,7 @@
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCore;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
 public final class RFC6455Handshaker extends AbstractHandshaker
 {
@@ -65,13 +65,13 @@ protected boolean validateRequest(HttpServletRequest request)
     }
 
     @Override
-    protected Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    protected WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         return new RFC6455Negotiation(Request.getBaseRequest(request), request, response, webSocketComponents);
     }
 
     @Override
-    protected boolean validateNegotiation(Negotiation negotiation)
+    protected boolean validateNegotiation(WebSocketNegotiation negotiation)
     {
         boolean result = super.validateNegotiation(negotiation);
         if (!result)
@@ -103,7 +103,7 @@ protected WebSocketConnection createWebSocketConnection(Request baseRequest, Web
     }
 
     @Override
-    protected void prepareResponse(Response response, Negotiation negotiation)
+    protected void prepareResponse(Response response, WebSocketNegotiation negotiation)
     {
         response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS);
         HttpFields.Mutable responseFields = response.getHttpFields();
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
index b36a46a3b373..f376e10781e5 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
@@ -27,9 +27,9 @@
 import org.eclipse.jetty.http.QuotedCSV;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
-public class RFC6455Negotiation extends Negotiation
+public class RFC6455Negotiation extends WebSocketNegotiation
 {
     private boolean successful;
     private String key;
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
index 138d7f47844c..b0339fe1c7ef 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
@@ -33,7 +33,7 @@
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
 public class RFC8441Handshaker extends AbstractHandshaker
 {
@@ -58,7 +58,7 @@ protected boolean validateRequest(HttpServletRequest request)
     }
 
     @Override
-    protected Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    protected WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         return new RFC8441Negotiation(Request.getBaseRequest(request), request, response, webSocketComponents);
     }
@@ -87,7 +87,7 @@ protected WebSocketConnection createWebSocketConnection(Request baseRequest, Web
     }
 
     @Override
-    protected void prepareResponse(Response response, Negotiation negotiation)
+    protected void prepareResponse(Response response, WebSocketNegotiation negotiation)
     {
         response.setStatus(HttpStatus.OK_200);
     }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
index c8e3e6570d93..f3b85a4d15df 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
@@ -25,9 +25,9 @@
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
-public class RFC8441Negotiation extends Negotiation
+public class RFC8441Negotiation extends WebSocketNegotiation
 {
     public RFC8441Negotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components) throws BadMessageException
     {
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
index ee38f271f929..ee9885279ea8 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
@@ -29,6 +29,11 @@ public void throwOnFrame()
         throwOnFrame = true;
     }
 
+    public EchoFrameHandler()
+    {
+        super(EchoFrameHandler.class.getName());
+    }
+
     public EchoFrameHandler(String name)
     {
         super(name);
@@ -48,7 +53,7 @@ public void onFrame(Frame frame, Callback callback)
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("[{}] echoDataFrame {}", name, frame);
-            Frame echo = Frame.copy(frame).setMask(null);
+            Frame echo = new Frame(frame.getOpCode(), frame.isFin(), frame.getPayload());
             coreSession.sendFrame(echo, callback, false);
         }
         else
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
index e17524caaf92..a1b5cee76bcc 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
@@ -48,7 +48,7 @@ public class FlushTest
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverHandler);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler);
         server = new WebSocketServer(negotiator);
         client = new WebSocketCoreClient(null, components);
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
index 9acce6884bd2..ede061c04683 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
@@ -47,7 +47,7 @@ public class FrameBufferTest extends WebSocketTester
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverHandler);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler);
         server = new WebSocketServer(negotiator);
         client = new WebSocketCoreClient(null, components);
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
deleted file mode 100644
index 8cbb95435980..000000000000
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
-//
-// This program and the accompanying materials are made available under
-// the terms of the Eclipse Public License 2.0 which is available at
-// https://www.eclipse.org/legal/epl-2.0
-//
-// This Source Code may also be made available under the following
-// Secondary Licenses when the conditions for such availability set
-// forth in the Eclipse Public License, v. 2.0 are satisfied:
-// the Apache License v2.0 which is available at
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-// ========================================================================
-//
-
-package org.eclipse.jetty.websocket.core;
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
-
-public class TestUpgradeHandler extends WebSocketUpgradeHandler
-{
-    public TestUpgradeHandler(WebSocketNegotiator negotiator)
-    {
-        super(negotiator);
-        setHandler(new AbstractHandler()
-        {
-            @Override
-            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException
-            {
-                response.setStatus(200);
-                response.setContentType("text/plain");
-                response.getOutputStream().println("Test WS Upgrade Handler!");
-                baseRequest.setHandled(true);
-            }
-        });
-    }
-}
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
index 0b78759587c2..06b89962604f 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
@@ -21,29 +21,26 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.jetty.io.ByteBufferPool;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
-public class TestWebSocketNegotiator implements WebSocketNegotiator
+public class TestWebSocketNegotiator extends WebSocketNegotiator.AbstractNegotiator
 {
-    final WebSocketComponents components;
     private final FrameHandler frameHandler;
 
     public TestWebSocketNegotiator(FrameHandler frameHandler)
     {
-        this (frameHandler, new WebSocketComponents());
+        this(frameHandler, null);
     }
 
-    public TestWebSocketNegotiator(FrameHandler frameHandler, WebSocketComponents components)
+    public TestWebSocketNegotiator(FrameHandler frameHandler, Configuration.Customizer customizer)
     {
-        this.components = components;
+        super(customizer);
         this.frameHandler = frameHandler;
     }
 
     @Override
-    public FrameHandler negotiate(Negotiation negotiation) throws IOException
+    public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
     {
         List<String> offeredSubprotocols = negotiation.getOfferedSubprotocols();
         if (!offeredSubprotocols.isEmpty())
@@ -51,33 +48,4 @@ public FrameHandler negotiate(Negotiation negotiation) throws IOException
 
         return frameHandler;
     }
-
-    @Override
-    public void customize(Configuration configurable)
-    {
-    }
-
-    @Override
-    public WebSocketExtensionRegistry getExtensionRegistry()
-    {
-        return components.getExtensionRegistry();
-    }
-
-    @Override
-    public DecoratedObjectFactory getObjectFactory()
-    {
-        return components.getObjectFactory();
-    }
-
-    @Override
-    public ByteBufferPool getByteBufferPool()
-    {
-        return components.getBufferPool();
-    }
-
-    @Override
-    public WebSocketComponents getWebSocketComponents()
-    {
-        return components;
-    }
 }
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
deleted file mode 100644
index c75eb8ceeaf3..000000000000
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
-//
-// This program and the accompanying materials are made available under
-// the terms of the Eclipse Public License 2.0 which is available at
-// https://www.eclipse.org/legal/epl-2.0
-//
-// This Source Code may also be made available under the following
-// Secondary Licenses when the conditions for such availability set
-// forth in the Eclipse Public License, v. 2.0 are satisfied:
-// the Apache License v2.0 which is available at
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-// ========================================================================
-//
-
-package org.eclipse.jetty.websocket.core;
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
-
-public class TestWebSocketUpgradeHandler extends WebSocketUpgradeHandler
-{
-    public TestWebSocketUpgradeHandler(WebSocketNegotiator negotiator)
-    {
-        super(negotiator);
-
-        setHandler(new AbstractHandler()
-        {
-            @Override
-            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException
-            {
-                response.setStatus(200);
-                response.setContentType("text/plain");
-                response.getOutputStream().println("Hello World!");
-                baseRequest.setHandled(true);
-            }
-        });
-    }
-}
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java
new file mode 100644
index 000000000000..f4338f5a3750
--- /dev/null
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java
@@ -0,0 +1,76 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.websocket.core;
+
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class UpgradeHandlerTest
+{
+    private Server server;
+    private WebSocketCoreClient client;
+    private URI serverUri;
+
+    @BeforeEach
+    public void before() throws Exception
+    {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        server.addConnector(connector);
+
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/path/echo", new TestWebSocketNegotiator(new EchoFrameHandler()));
+        server.setHandler(upgradeHandler);
+        server.start();
+
+        client = new WebSocketCoreClient();
+        client.start();
+
+        serverUri = URI.create("ws://localhost:" + connector.getLocalPort());
+    }
+
+    @AfterEach
+    public void after() throws Exception
+    {
+        server.stop();
+        client.stop();
+    }
+
+    @Test
+    public void test() throws Exception
+    {
+        TestMessageHandler clientEndpoint = new TestMessageHandler();
+        CoreSession coreSession = client.connect(clientEndpoint, serverUri.resolve("/path/echo")).get(5, TimeUnit.SECONDS);
+        assertNotNull(coreSession);
+        coreSession.close(Callback.NOOP);
+        assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
+    }
+}
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
index bc853bf3b56c..d652fe4752b2 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
@@ -42,7 +42,7 @@
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -81,10 +81,10 @@ public void onFrame(Frame frame)
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = new WebSocketNegotiator.AbstractNegotiator(components, null)
+        WebSocketNegotiator negotiator = new WebSocketNegotiator.AbstractNegotiator()
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation) throws IOException
+            public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
             {
                 if (negotiation.getOfferedSubprotocols().isEmpty())
                 {
@@ -127,7 +127,7 @@ public FrameHandler negotiate(Negotiation negotiation) throws IOException
             }
         };
 
-        server = new WebSocketServer(negotiator);
+        server = new WebSocketServer(components, negotiator, false);
         client = new WebSocketCoreClient(null, components);
 
         server.start();
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
index c74cbf7a490d..3696cc2579b9 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
@@ -27,7 +27,7 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 
@@ -73,6 +73,11 @@ public WebSocketServer(FrameHandler frameHandler, boolean tls)
     }
 
     public WebSocketServer(WebSocketNegotiator negotiator, boolean tls)
+    {
+        this(new WebSocketComponents(), negotiator, tls);
+    }
+
+    public WebSocketServer(WebSocketComponents components, WebSocketNegotiator negotiator, boolean tls)
     {
         ServerConnector connector;
         if (tls)
@@ -84,7 +89,8 @@ public WebSocketServer(WebSocketNegotiator negotiator, boolean tls)
         ContextHandler context = new ContextHandler("/");
         server.setHandler(context);
 
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(components);
+        upgradeHandler.addMapping("/*", negotiator);
         context.setHandler(upgradeHandler);
     }
 
@@ -111,7 +117,7 @@ public DefaultNegotiator(FrameHandler frameHandler)
         }
 
         @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             List<String> offeredSubprotocols = negotiation.getOfferedSubprotocols();
             if (!offeredSubprotocols.isEmpty())
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
index e77485f86195..3a9d7c5a0fee 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
@@ -42,6 +42,7 @@
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +59,6 @@
 @Testcontainers
 public class AutobahnTests
 {
-    
     private static final Logger LOG = LoggerFactory.getLogger(AutobahnTests.class);
     private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
index 4b8f65b6e4f8..bfae30329f40 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
@@ -21,6 +21,8 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 
 /**
@@ -78,9 +80,11 @@ public static Server startAutobahnServer(int port) throws Exception
         ContextHandler context = new ContextHandler("/");
         server.setHandler(context);
 
-        WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler((neg) -> new AutobahnFrameHandler());
-        context.setHandler(handler);
+        WebSocketComponents components = new WebSocketComponents();
+        WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler(components);
+        handler.addMapping("/*", new TestWebSocketNegotiator(new AutobahnFrameHandler()));
 
+        context.setHandler(handler);
         server.start();
         return server;
     }
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
index e98285a75a29..1c9fcb487245 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
@@ -26,6 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
@@ -37,7 +38,8 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.MessageHandler;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 import org.slf4j.Logger;
@@ -51,7 +53,7 @@ public class ChatWebSocketServer
 
     private final Set<MessageHandler> members = new HashSet<>();
 
-    private FrameHandler negotiate(Negotiation negotiation)
+    private FrameHandler negotiate(WebSocketNegotiation negotiation)
     {
         // Finalize negotiations in API layer involves:
         //  + MAY mutate the policy
@@ -117,7 +119,9 @@ public static void main(String[] args) throws Exception
         server.setHandler(context);
 
         ChatWebSocketServer chat = new ChatWebSocketServer();
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(WebSocketNegotiator.from(chat::negotiate));
+        WebSocketComponents components = new WebSocketComponents();
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(components);
+        upgradeHandler.addMapping(new ServletPathSpec("/*"), WebSocketNegotiator.from(chat::negotiate));
         context.setHandler(upgradeHandler);
 
         upgradeHandler.setHandler(new AbstractHandler()
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
index 445249b9e9b8..ad980f7560a1 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
@@ -41,7 +41,7 @@
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.UpgradeListener;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +69,7 @@ public class TestNegotiator extends WebSocketNegotiator.AbstractNegotiator
         int inflateBufferSize = -1;
 
         @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             for (ExtensionConfig extensionConfig : negotiation.getOfferedExtensions())
             {
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
index 50e79eacfb76..07e504cb0ce7 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
@@ -35,7 +35,7 @@
 import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.WebSocketServer;
 import org.eclipse.jetty.websocket.core.WebSocketTester;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -58,7 +58,7 @@ public void start() throws Exception
         WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler)
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation) throws IOException
+            public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
             {
                 List<ExtensionConfig> negotiatedExtensions = new ArrayList<>();
                 negotiatedExtensions.add(ExtensionConfig.parse(
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
index 94dca3739c7b..daf5515c7b5a 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
@@ -45,6 +45,7 @@
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.TestAsyncFrameHandler;
+import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
@@ -114,8 +115,9 @@ public void start() throws Exception
 
         ContextHandler serverContext = new ContextHandler("/server");
         serverFrameHandler = new EchoFrameHandler("SERVER");
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverFrameHandler, defaultCustomizer);
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverFrameHandler, defaultCustomizer);
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/*", negotiator);
         serverContext.setHandler(upgradeHandler);
         handlers.addHandler(serverContext);
 
@@ -125,8 +127,9 @@ public void start() throws Exception
 
         ContextHandler proxyContext = new ContextHandler("/proxy");
         proxy = new WebSocketProxy(_client, uri);
-        negotiator = WebSocketNegotiator.from((negotiation) -> proxy.client2Proxy, defaultCustomizer);
-        upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        negotiator = new TestWebSocketNegotiator(proxy.client2Proxy, defaultCustomizer);
+        upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/*", negotiator);
         proxyContext.setHandler(upgradeHandler);
         handlers.addHandler(proxyContext);
 
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java
index d3a3314fd6e6..43920839d1f6 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java
@@ -23,19 +23,14 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
 import org.eclipse.jetty.util.component.ContainerLifeCycle;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameEcho;
@@ -49,12 +44,12 @@ public class CoreServer extends ContainerLifeCycle
     private URI serverUri;
     private URI wsUri;
 
-    public CoreServer(Function<Negotiation, FrameHandler> negotiationFunction)
+    public CoreServer(Function<WebSocketNegotiation, FrameHandler> negotiationFunction)
     {
-        this(new BaseNegotiator()
+        this(new WebSocketNegotiator.AbstractNegotiator()
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation) throws IOException
+            public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
             {
                 return negotiationFunction.apply(negotiation);
             }
@@ -81,7 +76,9 @@ protected void doStart() throws Exception
         server.addConnector(connector);
 
         // Add Handler
-        server.setHandler(new HandlerList(new WebSocketUpgradeHandler(negotiator), new DefaultHandler()));
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/*", negotiator);
+        server.setHandler(new HandlerList(upgradeHandler, new DefaultHandler()));
 
         // Start Server
         addBean(server);
@@ -104,49 +101,10 @@ public URI getWsUri()
         return wsUri;
     }
 
-    public abstract static class BaseNegotiator implements WebSocketNegotiator
+    public static class EchoNegotiator extends WebSocketNegotiator.AbstractNegotiator
     {
-        protected final WebSocketComponents components;
-
-        public BaseNegotiator()
-        {
-            this.components = new WebSocketComponents();
-        }
-
-        @Override
-        public void customize(Configuration configurable)
-        {
-        }
-
-        @Override
-        public WebSocketExtensionRegistry getExtensionRegistry()
-        {
-            return components.getExtensionRegistry();
-        }
-
-        @Override
-        public DecoratedObjectFactory getObjectFactory()
-        {
-            return components.getObjectFactory();
-        }
-
-        @Override
-        public ByteBufferPool getByteBufferPool()
-        {
-            return components.getBufferPool();
-        }
-
         @Override
-        public WebSocketComponents getWebSocketComponents()
-        {
-            return components;
-        }
-    }
-
-    public static class EchoNegotiator extends BaseNegotiator
-    {
-        @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             List<String> offeredSubProtocols = negotiation.getOfferedSubprotocols();
 
@@ -174,10 +132,5 @@ public FrameHandler negotiate(Negotiation negotiation) throws IOException
                 return null;
             }
         }
-
-        @Override
-        public void customize(Configuration configurable)
-        {
-        }
     }
 }
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java
index 86434f4204e3..58fc7706d85c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java
@@ -35,7 +35,7 @@
 
 import org.eclipse.jetty.util.FuturePromise;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.javax.tests.CoreServer;
 import org.eclipse.jetty.websocket.javax.tests.DummyEndpoint;
 import org.eclipse.jetty.websocket.javax.tests.framehandlers.StaticText;
@@ -54,7 +54,7 @@ public class CookiesTest
 {
     private CoreServer server;
 
-    protected void startServer(Function<Negotiation, FrameHandler> negotiationFunction) throws Exception
+    protected void startServer(Function<WebSocketNegotiation, FrameHandler> negotiationFunction) throws Exception
     {
         server = new CoreServer(negotiationFunction);
         server.start();
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
index c7397d97712a..88bdb834f2fa 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
@@ -39,12 +39,12 @@
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.component.LifeCycle;
-import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.eclipse.jetty.websocket.javax.tests.CoreServer;
 import org.eclipse.jetty.websocket.javax.tests.DataUtils;
@@ -342,17 +342,18 @@ public void onError(Throwable cause, Callback callback)
         }
     }
 
-    public static class ServerMessageNegotiator extends CoreServer.BaseNegotiator
+    public static class ServerMessageNegotiator extends WebSocketNegotiator.AbstractNegotiator
     {
         private static final int MAX_MESSAGE_SIZE = (1024 * 1024) + 2;
 
         public ServerMessageNegotiator()
         {
-            super();
+            setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
+            setMaxTextMessageSize(MAX_MESSAGE_SIZE);
         }
 
         @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             List<String> offeredSubProtocols = negotiation.getOfferedSubprotocols();
 
@@ -378,13 +379,6 @@ public FrameHandler negotiate(Negotiation negotiation) throws IOException
 
             return null;
         }
-
-        @Override
-        public void customize(Configuration configurable)
-        {
-            configurable.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
-            configurable.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
-        }
     }
 
     public static class TestEndpoint extends Endpoint
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
index c80478c080d2..cbafb8330e70 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
@@ -249,10 +249,9 @@ public void setCreator(JettyWebSocketCreator creator)
         @Override
         public JettyWebSocketCreator getMapping(String pathSpec)
         {
-            WebSocketCreator creator = mapping.getMapping(WebSocketMapping.parsePathSpec(pathSpec));
+            WebSocketCreator creator = mapping.getCreator(WebSocketMapping.parsePathSpec(pathSpec));
             if (creator instanceof WrappedJettyCreator)
                 return ((WrappedJettyCreator)creator).getJettyWebSocketCreator();
-
             return null;
         }
 

From b08a983500ccd6389840867bb1bca19815318a3f Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 19:55:50 +1100
Subject: [PATCH 05/21] fix tests and WebSocketConfigurations

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../server/internal/CreatorNegotiator.java     | 18 ++++++++++++++++++
 .../config/JavaxWebSocketConfiguration.java    |  2 +-
 .../config/JettyWebSocketConfiguration.java    |  4 ++--
 .../jetty/websocket/tests/ErrorCloseTest.java  |  1 +
 jetty-websocket/websocket-servlet/pom.xml      | 18 ------------------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
index d0227ba02353..f594267c3cae 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java
@@ -1,3 +1,21 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
 package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.IOException;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
index a6ab2692f04e..c3dfceffc950 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
@@ -37,7 +37,7 @@ public JavaxWebSocketConfiguration()
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
         addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
 
-        protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter
+        protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
         protectAndExpose("org.eclipse.jetty.websocket.javax.server.config.");
         protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider");
         hide("org.eclipse.jetty.websocket.javax.server.internal");
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java
index 5115c0005e0c..624c68fc8789 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java
@@ -31,7 +31,7 @@
  * <p>Websocket Configuration</p>
  * <p>This configuration configures the WebAppContext server/system classes to
  * be able to see the {@code org.eclipse.jetty.websocket.api}, {@code org.eclipse.jetty.websocket.server} and
- * {@code org.eclipse.jetty.websocket.util.server} packages.</p>
+ * {@code org.eclipse.jetty.websocket.servlet} packages.</p>
  */
 public class JettyWebSocketConfiguration extends AbstractConfiguration
 {
@@ -44,7 +44,7 @@ public JettyWebSocketConfiguration()
 
         protectAndExpose("org.eclipse.jetty.websocket.api.");
         protectAndExpose("org.eclipse.jetty.websocket.server.");
-        protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter
+        protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
         hide("org.eclipse.jetty.server.internal.");
         hide("org.eclipse.jetty.server.config.");
     }
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
index b4a850bb5cac..0c335d953c04 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
@@ -257,6 +257,7 @@ public void testWebSocketThrowsOnLocalDisconnect(String methodToThrow) throws Ex
         serverSocket.methodsToThrow.add(methodToThrow);
         EventSocket clientSocket = new EventSocket();
         client.connect(clientSocket, serverUri).get(5, TimeUnit.SECONDS);
+        assertTrue(serverSocket.openLatch.await(5, TimeUnit.SECONDS));
 
         try (StacklessLogging ignored = new StacklessLogging(WebSocketSession.class))
         {
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index 5121c83e8dbf..b60a77c7d36f 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -42,24 +42,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <id>generate-manifest</id>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-            <configuration>
-              <instructions>
-                <Export-Package>*,org.eclipse.jetty.websocket.util.server.internal.*</Export-Package>
-              </instructions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

From 768a0c9cffbacec01a98c36631cde4e7d9d0cac4 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 19 Nov 2020 22:47:53 +1100
Subject: [PATCH 06/21] move exception classes in websocket-core-common

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../DuplicateAnnotationException.java         |  4 +-
 .../InvalidSignatureException.java            |  4 +-
 .../InvalidWebSocketException.java            |  4 +-
 .../core/messages/ByteArrayMessageSink.java   |  2 +-
 .../core/messages/ByteBufferMessageSink.java  |  2 +-
 .../websocket/core/util/InvokerUtils.java     |  1 +
 .../websocket/core/util/ReflectUtils.java     |  3 ++
 .../core/autobahn/AutobahnTests.java          |  1 -
 .../AnnotatedClientEndpointConfig.java        |  2 +-
 .../JavaxWebSocketClientContainer.java        |  2 +-
 .../JavaxWebSocketFrameHandlerFactory.java    |  4 +-
 .../JavaxWebSocketFrameHandlerMetadata.java   |  2 +-
 .../common/decoders/AvailableDecoders.java    |  4 +-
 .../common/encoders/AvailableEncoders.java    |  4 +-
 ...ebSocketFrameHandlerBadSignaturesTest.java |  2 +-
 ...SocketFrameHandlerOnMessageBinaryTest.java |  2 +-
 ...ebSocketFrameHandlerOnMessageTextTest.java |  2 +-
 .../JavaxWebSocketServerContainer.java        |  2 +-
 .../server/internal/PathParamIdentifier.java  |  2 +-
 .../tests/coders/AvailableDecodersTest.java   |  2 +-
 .../tests/coders/AvailableEncodersTest.java   |  2 +-
 .../javax/tests/coders/DecoderListTest.java   |  2 +-
 .../tests/server/DeploymentExceptionTest.java |  2 +-
 .../common/JettyWebSocketFrameHandler.java    |  2 +-
 .../JettyWebSocketFrameHandlerFactory.java    |  4 +-
 .../common/LocalEndpointMetadataTest.java     |  4 +-
 .../tests/JettyWebSocketNegotiationTest.java  | 43 +++++++++++++++++++
 27 files changed, 79 insertions(+), 31 deletions(-)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{util => exception}/DuplicateAnnotationException.java (94%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{util => exception}/InvalidSignatureException.java (95%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{util => exception}/InvalidWebSocketException.java (90%)

diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
similarity index 94%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
index 730af9637304..e02985865437 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/DuplicateAnnotationException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
@@ -16,11 +16,13 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
+package org.eclipse.jetty.websocket.core.exception;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+
 @SuppressWarnings("serial")
 public class DuplicateAnnotationException extends InvalidWebSocketException
 {
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
similarity index 95%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
index 0eda3b03bcf4..81119b908d2d 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidSignatureException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
@@ -16,12 +16,14 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
+package org.eclipse.jetty.websocket.core.exception;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
+import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+
 @SuppressWarnings("serial")
 public class InvalidSignatureException extends InvalidWebSocketException
 {
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java
similarity index 90%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java
index 6e4a8650c2ef..294ec23ba5c2 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvalidWebSocketException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java
@@ -16,9 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
-
-import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+package org.eclipse.jetty.websocket.core.exception;
 
 /**
  * Indicating that the provided Class is not a valid WebSocket per the chosen API.
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
index c14d9efca2bd..3fdd833406a1 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
@@ -28,8 +28,8 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 
 public class ByteArrayMessageSink extends AbstractMessageSink
 {
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
index 84978ea17a5e..0d1dadaaa85f 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
@@ -29,8 +29,8 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 
 public class ByteBufferMessageSink extends AbstractMessageSink
 {
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
index a5d3e6437fcb..da5d5596c668 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
@@ -26,6 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
index 8a0aa1d4f229..e54abda25472 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
@@ -31,6 +31,9 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+import org.eclipse.jetty.websocket.core.exception.DuplicateAnnotationException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
+
 public class ReflectUtils
 {
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
index 3a9d7c5a0fee..e0299c984c52 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java
@@ -42,7 +42,6 @@
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
index d123f34df909..979635b51229 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java
@@ -23,7 +23,7 @@
 import javax.websocket.ClientEndpoint;
 import javax.websocket.ClientEndpointConfig;
 
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper;
 
 public class AnnotatedClientEndpointConfig extends ClientEndpointConfigWrapper
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
index 3fe54eac8b79..b13371b5e9f8 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java
@@ -40,9 +40,9 @@
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
index dda8252311d2..7dd72cc9e7c8 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
@@ -43,12 +43,12 @@
 
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
 import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.messages.MessageSink;
 import org.eclipse.jetty.websocket.core.messages.PartialByteArrayMessageSink;
 import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
 import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
index 66e3cbc4604d..f0870bac3a77 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
@@ -23,7 +23,7 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
index a9ce5e7cced9..8d0a7d75a3ce 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
@@ -30,8 +30,8 @@
 import javax.websocket.Decoder;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 
 public class AvailableDecoders implements Iterable<RegisteredDecoder>
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
index 74e8490865fc..a70e9ef46fde 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
@@ -29,8 +29,8 @@
 import javax.websocket.Encoder;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.InitException;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
index b012e8098d7c..8a1cd30e2c6f 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
@@ -25,7 +25,7 @@
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
index d6f00afa3194..bb1e86b84eee 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
@@ -29,7 +29,7 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
index f7dbd053290b..c7c598be805f 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
@@ -29,7 +29,7 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
index 894038de8773..e1de17dfa6aa 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
@@ -37,9 +37,9 @@
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
index 2e7fa162b319..b6751779f690 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Method;
 import javax.websocket.server.PathParam;
 
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 
 /**
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
index 40be5379306d..2059159739e3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java
@@ -31,7 +31,7 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.toolchain.test.Hex;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
index bca0d048710f..6c71fea89e5f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java
@@ -30,7 +30,7 @@
 import javax.websocket.EndpointConfig;
 
 import org.eclipse.jetty.toolchain.test.Hex;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.IntegerEncoder;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
index 52f1cf3d20a7..20ca7096ecae 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderListTest.java
@@ -39,7 +39,7 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.IO;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.common.decoders.AbstractDecoder;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
index 0f54e8de10b8..467c0b87fa7d 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
@@ -29,7 +29,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidCloseIntSocket;
 import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorErrorSocket;
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
index dbdc3a339334..ee189204fbcd 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
@@ -40,13 +40,13 @@
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
 import org.eclipse.jetty.websocket.core.exception.ProtocolException;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
 import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
index da09da6009f6..b3438e816dd9 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
@@ -51,6 +51,8 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
 import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
 import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
@@ -59,8 +61,6 @@
 import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
 import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
 import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.util.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.util.InvokerUtils;
 import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
index 45bbdaf40cfa..916c9bbedef1 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
@@ -19,12 +19,12 @@
 package org.eclipse.jetty.websocket.common;
 
 import org.eclipse.jetty.websocket.api.exceptions.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.DuplicateAnnotationException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
 import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
 import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
 import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
-import org.eclipse.jetty.websocket.core.util.DuplicateAnnotationException;
-import org.eclipse.jetty.websocket.core.util.InvalidSignatureException;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java
index 7e81b1a24af8..af0618d12c73 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java
@@ -22,7 +22,10 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
+import org.eclipse.jetty.client.HttpRequest;
+import org.eclipse.jetty.client.HttpResponse;
 import org.eclipse.jetty.logging.StacklessLogging;
 import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.Server;
@@ -30,11 +33,14 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.client.JettyUpgradeListener;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -110,4 +116,41 @@ public void testServerError() throws Exception
             assertThat(t.getMessage(), containsString("500 Server Error"));
         }
     }
+
+    @Disabled("Work in progress; ServerUpgradeResponse in websocket-core throws NPEs")
+    @Test
+    public void testManualNegotiationInCreator() throws Exception
+    {
+        JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(contextHandler.getServletContext());
+        container.addMapping("/", (req, resp) ->
+        {
+            long matchedExts = req.getExtensions().stream()
+                .filter(ec -> "permessage-deflate".equals(ec.getName()))
+                .filter(ec -> ec.getParameters().containsKey("client_no_context_takeover"))
+                .count();
+            assertThat(matchedExts, Matchers.is(1L));
+
+            // Manually drop the param so it is not negotiated in the extension stack.
+            resp.setHeader("Sec-WebSocket-Extensions", "permessage-deflate");
+            return new EchoSocket();
+        });
+
+        URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/filterPath");
+        EventSocket socket = new EventSocket();
+        AtomicReference<HttpResponse> responseReference = new AtomicReference<>();
+        ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest();
+        upgradeRequest.addExtensions("permessage-deflate;client_no_context_takeover");
+        JettyUpgradeListener upgradeListener = new JettyUpgradeListener()
+        {
+            @Override
+            public void onHandshakeResponse(HttpRequest request, HttpResponse response)
+            {
+                responseReference.set(response);
+            }
+        };
+
+        client.connect(socket, uri, upgradeRequest, upgradeListener).get(5, TimeUnit.SECONDS);
+        HttpResponse httpResponse = responseReference.get();
+        System.err.println(httpResponse.getHeaders());
+    }
 }

From 31cd606d5947dfa933d24ea932b47eb81202ad6b Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 20 Nov 2020 16:20:46 +1100
Subject: [PATCH 07/21] move MessageSinks and util to internal package

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../src/main/java/module-info.java            |  2 --
 .../DuplicateAnnotationException.java         |  2 +-
 .../exception/InvalidSignatureException.java  |  2 +-
 .../core/{ => internal}/MessageHandler.java   |  7 ++++++-
 .../messages/AbstractMessageSink.java         |  2 +-
 .../messages/ByteArrayMessageSink.java        |  2 +-
 .../messages/ByteBufferMessageSink.java       |  2 +-
 .../messages/DispatchedMessageSink.java       |  2 +-
 .../messages/InputStreamMessageSink.java      |  2 +-
 .../messages/MessageInputStream.java          |  2 +-
 .../messages/MessageOutputStream.java         |  2 +-
 .../messages/MessageReader.java               |  2 +-
 .../{ => internal}/messages/MessageSink.java  |  2 +-
 .../messages/MessageWriter.java               |  2 +-
 .../messages/PartialByteArrayMessageSink.java |  2 +-
 .../PartialByteBufferMessageSink.java         |  2 +-
 .../messages/PartialStringMessageSink.java    |  2 +-
 .../messages/ReaderMessageSink.java           |  2 +-
 .../messages/StringMessageSink.java           |  2 +-
 .../{ => internal}/util/InvokerUtils.java     |  2 +-
 .../{ => internal}/util/ReflectUtils.java     |  2 +-
 .../core/{ => internal}/util/TextUtils.java   |  2 +-
 .../websocket/core/MessageHandlerTest.java    |  1 +
 .../websocket/core/TestMessageHandler.java    |  1 +
 .../core/autobahn/CoreAutobahnClient.java     |  2 +-
 .../core/chat/ChatWebSocketClient.java        |  2 +-
 .../core/chat/ChatWebSocketServer.java        |  2 +-
 .../core/util/MessageReaderTest.java          |  2 +-
 .../core/util/MessageWriterTest.java          |  2 +-
 .../util/PartialStringMessageSinkTest.java    |  2 +-
 .../core/util/StringMessageSinkTest.java      |  2 +-
 ...vaxWebSocketClientFrameHandlerFactory.java |  2 +-
 .../common/JavaxWebSocketAsyncRemote.java     |  6 +++---
 .../common/JavaxWebSocketBasicRemote.java     |  2 +-
 .../common/JavaxWebSocketFrameHandler.java    | 10 +++++-----
 .../JavaxWebSocketFrameHandlerFactory.java    | 12 +++++------
 .../common/JavaxWebSocketMessageMetadata.java |  2 +-
 .../common/JavaxWebSocketRemoteEndpoint.java  |  4 ++--
 .../javax/common/JavaxWebSocketSession.java   |  2 +-
 .../common/decoders/AvailableDecoders.java    |  2 +-
 .../common/encoders/AvailableEncoders.java    |  2 +-
 .../messages/AbstractDecodedMessageSink.java  |  2 +-
 .../messages/DecodedBinaryMessageSink.java    |  4 ++--
 .../DecodedBinaryStreamMessageSink.java       |  4 ++--
 .../messages/DecodedTextMessageSink.java      |  4 ++--
 .../DecodedTextStreamMessageSink.java         |  4 ++--
 .../common/DummyFrameHandlerFactory.java      |  2 +-
 .../messages/InputStreamMessageSinkTest.java  |  2 +-
 .../messages/ReaderMessageSinkTest.java       |  2 +-
 .../util/InvokerUtilsStaticParamsTest.java    |  4 ++--
 .../javax/common/util/InvokerUtilsTest.java   |  4 ++--
 .../common/util/NameParamIdentifier.java      |  2 +-
 .../javax/common/util/ReflectUtilsTest.java   |  2 +-
 .../JavaxWebSocketServerContainer.java        |  2 +-
 .../server/internal/PathParamIdentifier.java  |  2 +-
 .../tests/CompletableFutureMethodHandle.java  |  4 ++--
 .../framehandlers/FrameHandlerTracker.java    |  2 +-
 .../javax/tests/framehandlers/StaticText.java |  2 +-
 .../tests/framehandlers/WholeMessageEcho.java |  2 +-
 .../tests/matchers/IsMessageHandlerType.java  |  2 +-
 .../client/DecoderReaderManySmallTest.java    |  2 +-
 .../tests/client/MessageReceivingTest.java    |  4 ++--
 .../common/JettyWebSocketFrameHandler.java    |  4 ++--
 .../JettyWebSocketFrameHandlerFactory.java    | 20 +++++++++----------
 .../JettyWebSocketFrameHandlerMetadata.java   |  2 +-
 .../jetty/websocket/common/EndPoints.java     |  2 +-
 .../common/LocalEndpointMetadataTest.java     |  8 ++++----
 .../common/MessageInputStreamTest.java        |  2 +-
 .../common/MessageOutputStreamTest.java       |  2 +-
 .../common/OutgoingMessageCapture.java        |  6 +++---
 .../common/invoke/InvokerUtilsTest.java       |  4 ++--
 .../common/invoke/NameParamIdentifier.java    |  2 +-
 .../server/JettyWebSocketServerContainer.java |  2 +-
 .../tests/server/PartialListenerTest.java     |  2 +-
 74 files changed, 114 insertions(+), 109 deletions(-)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/MessageHandler.java (97%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/AbstractMessageSink.java (95%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/ByteArrayMessageSink.java (98%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/ByteBufferMessageSink.java (98%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/DispatchedMessageSink.java (99%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/InputStreamMessageSink.java (95%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/MessageInputStream.java (99%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/MessageOutputStream.java (99%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/MessageReader.java (98%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/MessageSink.java (95%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/MessageWriter.java (97%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/PartialByteArrayMessageSink.java (96%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/PartialByteBufferMessageSink.java (96%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/PartialStringMessageSink.java (97%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/ReaderMessageSink.java (95%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/messages/StringMessageSink.java (97%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/util/InvokerUtils.java (99%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/util/ReflectUtils.java (99%)
 rename jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/{ => internal}/util/TextUtils.java (98%)

diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
index 18253eb25ca6..43087904262a 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
@@ -25,8 +25,6 @@
 module org.eclipse.jetty.websocket.core.common
 {
     exports org.eclipse.jetty.websocket.core;
-    exports org.eclipse.jetty.websocket.core.util;
-    exports org.eclipse.jetty.websocket.core.messages;
     exports org.eclipse.jetty.websocket.core.exception;
     exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
index e02985865437..f868c5d78644 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 
 @SuppressWarnings("serial")
 public class DuplicateAnnotationException extends InvalidWebSocketException
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
index 81119b908d2d..8c780d7c61b2 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java
@@ -22,7 +22,7 @@
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 
 @SuppressWarnings("serial")
 public class InvalidSignatureException extends InvalidWebSocketException
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java
similarity index 97%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java
index 3c9ee20ca9af..20239959fb96 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core;
+package org.eclipse.jetty.websocket.core.internal;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
@@ -27,6 +27,11 @@
 import org.eclipse.jetty.util.IteratingNestedCallback;
 import org.eclipse.jetty.util.Utf8Appendable;
 import org.eclipse.jetty.util.Utf8StringBuilder;
+import org.eclipse.jetty.websocket.core.CloseStatus;
+import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.Frame;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
 import org.slf4j.Logger;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java
index 906753d05c9d..e91595cb8fe6 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/AbstractMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java
similarity index 98%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java
index 3fdd833406a1..414b353f8198 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteArrayMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java
similarity index 98%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java
index 0d1dadaaa85f..4273d1853cb3 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ByteBufferMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java
similarity index 99%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java
index e6cf09465577..f3a1d3e9bec5 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/DispatchedMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.Closeable;
 import java.lang.invoke.MethodHandle;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java
index 33ede2cbd1ed..373c9dda7d4a 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/InputStreamMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java
similarity index 99%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java
index aec7efe43799..1fdbadcca173 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageInputStream.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java
similarity index 99%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java
index cf9f4c565471..f1083b56549f 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageOutputStream.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java
similarity index 98%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java
index 127b1c9c2372..3e513ce8cd4f 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageReader.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java
index fc60f2424bac..a014ff0ee322 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java
similarity index 97%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java
index f313cbea9dd6..ec4b41f3139d 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/MessageWriter.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java
index 2920268428d2..0f84e79ab55b 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteArrayMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java
similarity index 96%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java
index 2bc1c76c19df..3df06633dec6 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialByteBufferMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java
similarity index 97%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java
index d1addbcc4062..360e6d3ad3c3 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/PartialStringMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java
index 978b0aef241c..37bf49eb3026 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/ReaderMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java
similarity index 97%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java
index aeac579cde16..dabf1024d67e 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/messages/StringMessageSink.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java
similarity index 99%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java
index da5d5596c668..a24f065794c2 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/InvokerUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java
similarity index 99%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java
index e54abda25472..62530c4b854d 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/ReflectUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java
similarity index 98%
rename from jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java
index 3e0a6c39072e..5f96bf616b7d 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/util/TextUtils.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 /**
  * Collection of utility methods for Text content
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
index fc14e360b83a..d14be334d8a0 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
@@ -31,6 +31,7 @@
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
index b03310fabf00..0a026fdf1d37 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
@@ -24,6 +24,7 @@
 
 import org.eclipse.jetty.util.BlockingArrayQueue;
 import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
index 51e339423884..c3d6885789bb 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
@@ -28,10 +28,10 @@
 import org.eclipse.jetty.util.Jetty;
 import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.TestMessageHandler;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
index 9e4f85659d50..491f866a6a6e 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
@@ -28,9 +28,9 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
index 1c9fcb487245..ab54f772b596 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
@@ -37,8 +37,8 @@
 import org.eclipse.jetty.websocket.core.CloseStatus;
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
index 51001b7385d8..b0b198253a41 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java
@@ -31,7 +31,7 @@
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.MessageReader;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageReader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
index 13b60e8b98d0..94362bd661e9 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
index bc24e8eea599..9bf61014db88 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java
@@ -34,7 +34,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
index cecbe355c6a1..ff7c0ea371b3 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
index b93715b619a4..b7c65ca7c8e2 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java
@@ -21,7 +21,7 @@
 import javax.websocket.ClientEndpoint;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
index 553945661955..8f169315ea11 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
@@ -31,9 +31,9 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.core.messages.MessageWriter;
-import org.eclipse.jetty.websocket.core.util.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
index 3d443213e4dc..c7993dc2cd80 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
@@ -31,7 +31,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.util.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
index eb50ec1b72de..29975cd6fc8c 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
@@ -45,11 +45,11 @@
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.ProtocolException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialByteArrayMessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
index 7dd72cc9e7c8..ebdc6630456a 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
@@ -45,12 +45,12 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialByteArrayMessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.common.messages.AbstractDecodedMessageSink;
 import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
index fd168632f427..2dbaf5fd2519 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketMessageMetadata.java
@@ -21,7 +21,7 @@
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 
 public class JavaxWebSocketMessageMetadata
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
index 26f80071c238..e837d4a4776e 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
@@ -34,8 +34,8 @@
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.OutgoingFrames;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.core.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
index c24b25845226..b97389d73297 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
@@ -43,7 +43,7 @@
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
 import org.slf4j.Logger;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
index 8d0a7d75a3ce..25b3b5840328 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
@@ -32,7 +32,7 @@
 
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 
 public class AvailableDecoders implements Iterable<RegisteredDecoder>
 {
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
index a70e9ef46fde..3bd0b70495fa 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
@@ -31,7 +31,7 @@
 
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.InitException;
 
 public class AvailableEncoders implements Predicate<Class<?>>
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
index d8d76cd8f920..1ce2d09fc601 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractDecodedMessageSink.java
@@ -28,7 +28,7 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
index 7b896904f47c..541ee79b20b6 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
@@ -28,8 +28,8 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
-import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.slf4j.Logger;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
index 03b6d0eb276d..1700b8d230c7 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
@@ -29,8 +29,8 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
-import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
index 1c6b4c3bacde..45c40b6b38ee 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
@@ -27,8 +27,8 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.slf4j.Logger;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
index 3e26ee0f5369..e261ef1b44ce 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
@@ -29,8 +29,8 @@
 
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.CloseException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ReaderMessageSink;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
index 868609264b86..3fd09b7e3aa1 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
@@ -22,7 +22,7 @@
 import javax.websocket.ClientEndpointConfig;
 import javax.websocket.EndpointConfig;
 
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 
 public class DummyFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory
 {
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
index 2e6eee2a915c..f381cf7eba0f 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
@@ -35,7 +35,7 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.InputStreamMessageSink;
 import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
index c0ff9b1e20e6..01c796d4daf6 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ReaderMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
index 82f74d695a06..fe352c0543dc 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
@@ -26,8 +26,8 @@
 import javax.websocket.Session;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
index d35d2b755a61..3e7cefa44e06 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
@@ -24,8 +24,8 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
index 5e2374da5a51..05731d67e80c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 
 /**
  * Simple {@link InvokerUtils.ParamIdentifier}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
index 02205fcd529c..ec8e53f9d6e2 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
+++ b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
@@ -18,7 +18,7 @@
 
 package org.eclipse.jetty.websocket.javax.common.util;
 
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
index e1de17dfa6aa..d56a1add71ec 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
@@ -38,9 +38,9 @@
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
 import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
index b6751779f690..173712b1a64f 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
@@ -23,7 +23,7 @@
 import javax.websocket.server.PathParam;
 
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 
 /**
  * Method argument identifier for {@link javax.websocket.server.PathParam} annotations.
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
index eb2d0fb2ba1b..2aedea8bc66d 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
@@ -23,8 +23,8 @@
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletableFuture;
 
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
 
 public class CompletableFutureMethodHandle
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java
index 3326b58f979e..05c7c43e0f53 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java
@@ -28,7 +28,7 @@
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.CloseStatus;
 import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.core.MessageHandler;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 
 public class FrameHandlerTracker extends MessageHandler
 {
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java
index f135c3a44d89..617ab45d8577 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java
@@ -19,7 +19,7 @@
 package org.eclipse.jetty.websocket.javax.tests.framehandlers;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.MessageHandler;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 
 public class StaticText extends MessageHandler
 {
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java
index 12a4d31fcf1e..a9dfe6f767e4 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java
@@ -21,7 +21,7 @@
 import java.nio.ByteBuffer;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.MessageHandler;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 
 public class WholeMessageEcho extends MessageHandler
 {
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
index bc303efaff49..f28de668ab6d 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java
@@ -22,7 +22,7 @@
 import javax.websocket.MessageHandler;
 import javax.websocket.PongMessage;
 
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
 import org.eclipse.jetty.websocket.javax.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.javax.tests.MessageType;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java
index caf99771299f..b187053e1f9c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java
@@ -36,7 +36,7 @@
 import javax.websocket.WebSocketContainer;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.MessageHandler;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.javax.tests.CoreServer;
 import org.eclipse.jetty.websocket.javax.tests.WSEventTracker;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
index 88bdb834f2fa..e4b22c189382 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java
@@ -41,11 +41,11 @@
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.OpCode;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.util.TextUtils;
 import org.eclipse.jetty.websocket.javax.tests.CoreServer;
 import org.eclipse.jetty.websocket.javax.tests.DataUtils;
 import org.junit.jupiter.api.AfterAll;
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
index ee189204fbcd..7303f2445295 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
@@ -46,8 +46,8 @@
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
index b3438e816dd9..935bd46d1c2d 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
@@ -53,16 +53,16 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
-import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.PartialStringMessageSink;
-import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
-import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.ByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 
 /**
  * Factory to create {@link JettyWebSocketFrameHandler} instances suitable for
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
index 99385ddf53fd..3b6b4930fb1c 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.exceptions.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 
 public class JettyWebSocketFrameHandlerMetadata extends Configuration.ConfigurationCustomizer
 {
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
index 43a4217136e9..c9d6f360e348 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EndPoints.java
@@ -38,7 +38,7 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.core.CloseStatus;
-import org.eclipse.jetty.websocket.core.util.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
index 916c9bbedef1..e22401e5f793 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java
@@ -21,10 +21,10 @@
 import org.eclipse.jetty.websocket.api.exceptions.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.exception.DuplicateAnnotationException;
 import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
-import org.eclipse.jetty.websocket.core.messages.ByteArrayMessageSink;
-import org.eclipse.jetty.websocket.core.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.core.messages.ReaderMessageSink;
-import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ReaderMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
index 0b56fc4798c9..46bc68f091d6 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.MessageInputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageInputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
index 73e508791d82..39bd1ccfaf57 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java
@@ -23,7 +23,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.websocket.core.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageOutputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
index cff6767b092d..3beacd8d0bcb 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java
@@ -31,9 +31,9 @@
 import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.core.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.core.messages.MessageSink;
-import org.eclipse.jetty.websocket.core.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
index 8185aa718111..1f1632ceb28b 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java
@@ -24,8 +24,8 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
index b19d8d1c2ec8..3c4c0d3d413a 100644
--- a/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
+++ b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Method;
 
 import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.core.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 
 /**
  * Simple {@link InvokerUtils.ParamIdentifier}
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index 9a8736cd012f..d735dba23db2 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -38,9 +38,9 @@
 import org.eclipse.jetty.websocket.common.SessionTracker;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
 import org.eclipse.jetty.websocket.core.server.WebSocketMapping;
-import org.eclipse.jetty.websocket.core.util.ReflectUtils;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.internal.DelegatedServerUpgradeResponse;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
index f87a54520cfe..48aa15d318a8 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
@@ -40,7 +40,7 @@
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.common.WebSocketSession;
-import org.eclipse.jetty.websocket.core.util.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;

From b63b0fc2910ca37e1adc7fc6210a78f87982ee71 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 20 Nov 2020 17:31:46 +1100
Subject: [PATCH 08/21] create internal package for websocket-core-client

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-core-client/pom.xml | 18 +++++++++++++++
 .../core/client/CoreClientUpgradeRequest.java |  4 +++-
 .../core/client/WebSocketCoreClient.java      |  1 +
 .../{ => internal}/HttpClientProvider.java    |  2 +-
 .../{ => internal}/HttpUpgraderOverHTTP.java  |  3 ++-
 .../{ => internal}/HttpUpgraderOverHTTP2.java |  3 ++-
 .../{ => internal}/XmlHttpClientProvider.java |  4 ++--
 .../src/main/java/module-info.java            | 22 ++++++++++++++++++-
 .../JettyWebSocketFrameHandlerFactory.java    |  4 +---
 9 files changed, 51 insertions(+), 10 deletions(-)
 rename jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/{ => internal}/HttpClientProvider.java (96%)
 rename jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/{ => internal}/HttpUpgraderOverHTTP.java (97%)
 rename jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/{ => internal}/HttpUpgraderOverHTTP2.java (94%)
 rename jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/{ => internal}/XmlHttpClientProvider.java (94%)

diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml
index 5924b6615274..de982a6ccc61 100644
--- a/jetty-websocket/websocket-core-client/pom.xml
+++ b/jetty-websocket/websocket-core-client/pom.xml
@@ -77,6 +77,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Export-Package>*,org.eclipse.jetty.websocket.core.client.internal.*</Export-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java
index b9535643759a..2497210ca2fc 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java
@@ -52,6 +52,8 @@
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP;
+import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP2;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
@@ -281,7 +283,7 @@ protected void customize(EndPoint endPoint)
 
     public abstract FrameHandler getFrameHandler();
 
-    void requestComplete()
+    public void requestComplete()
     {
         // Add extensions header filtering out internal extensions and internal parameters.
         String extensionString = requestedExtensions.stream()
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
index 8e4ab6182b51..3fc29fbf9f55 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
@@ -32,6 +32,7 @@
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
+import org.eclipse.jetty.websocket.core.client.internal.HttpClientProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java
similarity index 96%
rename from jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java
index 935e768482e9..e614233ada60 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java
similarity index 97%
rename from jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java
index 318fd537a8ed..d91d70c22c6d 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -34,6 +34,7 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCore;
 
 public class HttpUpgraderOverHTTP implements HttpUpgrader
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java
similarity index 94%
rename from jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java
index 6b3cd28ba018..a59e6159e584 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import org.eclipse.jetty.client.HttpRequest;
 import org.eclipse.jetty.client.HttpResponse;
@@ -27,6 +27,7 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 
 public class HttpUpgraderOverHTTP2 implements HttpUpgrader
 {
diff --git a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java
similarity index 94%
rename from jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java
index af9962bc3d36..6bc2b5c59dd8 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import java.net.URL;
 
@@ -26,7 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class XmlHttpClientProvider implements HttpClientProvider
+public class XmlHttpClientProvider implements HttpClientProvider
 {
     private static final Logger LOG = LoggerFactory.getLogger(XmlHttpClientProvider.class);
 
diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
index 43087904262a..659ac5ac6609 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
@@ -26,7 +26,27 @@
 {
     exports org.eclipse.jetty.websocket.core;
     exports org.eclipse.jetty.websocket.core.exception;
-    exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.websocket.core.internal to
+        org.eclipse.jetty.websocket.core.client,
+        org.eclipse.jetty.websocket.core.server;
+
+    // The Jetty & Javax API Layers need to access both access some internal utilities which we don't want to expose.
+    exports org.eclipse.jetty.websocket.core.internal.util to
+        org.eclipse.jetty.websocket.jetty.common,
+        org.eclipse.jetty.websocket.jetty.client,
+        org.eclipse.jetty.websocket.jetty.server,
+        org.eclipse.jetty.websocket.javax.common,
+        org.eclipse.jetty.websocket.javax.client,
+        org.eclipse.jetty.websocket.javax.server;
+
+    exports org.eclipse.jetty.websocket.core.internal.messages to
+        org.eclipse.jetty.websocket.jetty.common,
+        org.eclipse.jetty.websocket.jetty.client,
+        org.eclipse.jetty.websocket.jetty.server,
+        org.eclipse.jetty.websocket.javax.common,
+        org.eclipse.jetty.websocket.javax.client,
+        org.eclipse.jetty.websocket.javax.server;
 
     requires org.eclipse.jetty.http;
     requires transitive org.eclipse.jetty.io;
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
index 935bd46d1c2d..c571fd0e60f5 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java
@@ -135,7 +135,7 @@ public JettyWebSocketFrameHandler newJettyFrameHandler(Object endpointInstance)
         final MethodHandle pongHandle = InvokerUtils.bindTo(metadata.getPongHandle(), endpointInstance);
         BatchMode batchMode = metadata.getBatchMode();
 
-        JettyWebSocketFrameHandler frameHandler = new JettyWebSocketFrameHandler(
+        return new JettyWebSocketFrameHandler(
             container,
             endpointInstance,
             openHandle, closeHandle, errorHandle,
@@ -144,8 +144,6 @@ public JettyWebSocketFrameHandler newJettyFrameHandler(Object endpointInstance)
             frameHandle, pingHandle, pongHandle,
             batchMode,
             metadata);
-
-        return frameHandler;
     }
 
     public static MessageSink createMessageSink(MethodHandle msgHandle, Class<? extends MessageSink> sinkClass, Executor executor, WebSocketSession session)

From f01b76b144752fb016e53381d1f822190fcbb989 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 24 Nov 2020 23:16:49 +1100
Subject: [PATCH 09/21] fix JPMS warnings for websocket common modules

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../websocket-javax-common/src/main/java/module-info.java | 8 ++++----
 .../server/internal/AnnotatedServerEndpointConfig.java    | 4 ++--
 .../websocket-jetty-common/src/main/java/module-info.java | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
index 705e6d822f9a..583302864ab5 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
@@ -18,10 +18,10 @@
 
 module org.eclipse.jetty.websocket.javax.common
 {
-    exports org.eclipse.jetty.websocket.javax.common;
-    exports org.eclipse.jetty.websocket.javax.common.decoders;
-    exports org.eclipse.jetty.websocket.javax.common.encoders;
-    exports org.eclipse.jetty.websocket.javax.common.messages;
+    exports org.eclipse.jetty.websocket.javax.common to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
+    exports org.eclipse.jetty.websocket.javax.common.decoders to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
+    exports org.eclipse.jetty.websocket.javax.common.encoders to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
+    exports org.eclipse.jetty.websocket.javax.common.messages to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
 
     requires org.slf4j;
     requires transitive jetty.websocket.api;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java
index 23af02b05753..a3414e8d56aa 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java
@@ -120,9 +120,9 @@ private static Configurator getConfigurator(ServerEndpointConfig baseServerConfi
             // Instantiate the provided configurator
             try
             {
-                return anno.configurator().newInstance();
+                return anno.configurator().getConstructor().newInstance();
             }
-            catch (InstantiationException | IllegalAccessException e)
+            catch (Exception e)
             {
                 StringBuilder err = new StringBuilder();
                 err.append("Unable to instantiate ServerEndpoint.configurator() of ");
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
index 2e235491619f..425d5e93fdc7 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
@@ -21,7 +21,7 @@
 
 module org.eclipse.jetty.websocket.jetty.common
 {
-    exports org.eclipse.jetty.websocket.common;
+    exports org.eclipse.jetty.websocket.common to org.eclipse.jetty.websocket.jetty.client, org.eclipse.jetty.websocket.jetty.server;
 
     requires org.eclipse.jetty.util;
     requires org.slf4j;

From f79cc1e5c154176f529f6c0f67ef606b00c8237c Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Tue, 24 Nov 2020 21:57:42 +0100
Subject: [PATCH 10/21] Fixed exports declarations to make
 MethodHandles.publicLookup() working properly.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../websocket-javax-common/src/main/java/module-info.java | 8 ++++----
 .../websocket-jetty-common/src/main/java/module-info.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
index 583302864ab5..705e6d822f9a 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
@@ -18,10 +18,10 @@
 
 module org.eclipse.jetty.websocket.javax.common
 {
-    exports org.eclipse.jetty.websocket.javax.common to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
-    exports org.eclipse.jetty.websocket.javax.common.decoders to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
-    exports org.eclipse.jetty.websocket.javax.common.encoders to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
-    exports org.eclipse.jetty.websocket.javax.common.messages to org.eclipse.jetty.websocket.javax.server, org.eclipse.jetty.websocket.javax.client;
+    exports org.eclipse.jetty.websocket.javax.common;
+    exports org.eclipse.jetty.websocket.javax.common.decoders;
+    exports org.eclipse.jetty.websocket.javax.common.encoders;
+    exports org.eclipse.jetty.websocket.javax.common.messages;
 
     requires org.slf4j;
     requires transitive jetty.websocket.api;
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
index 425d5e93fdc7..2e235491619f 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
@@ -21,7 +21,7 @@
 
 module org.eclipse.jetty.websocket.jetty.common
 {
-    exports org.eclipse.jetty.websocket.common to org.eclipse.jetty.websocket.jetty.client, org.eclipse.jetty.websocket.jetty.server;
+    exports org.eclipse.jetty.websocket.common;
 
     requires org.eclipse.jetty.util;
     requires org.slf4j;

From d6ff6222fe8cbc2e574c7a16bf8db278461cb9d5 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Wed, 25 Nov 2020 12:12:00 +1100
Subject: [PATCH 11/21] fix broken tests with wrong WebSocketUpgradeFilter
 package name

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../src/test/resources/alt-filter-web.xml                 | 4 ++--
 .../src/test/resources/wsuf-ordering1.xml                 | 2 +-
 .../src/test/resources/wsuf-ordering2.xml                 | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
index c9b422ef725a..33f124437f7e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
+++ b/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
@@ -12,12 +12,12 @@
   </context-param>
 
   <filter>
-    <filter-name>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-name>
+    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
     <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
   </filter>
 
   <filter-mapping>
-    <filter-name>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-name>
+    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
     <url-pattern>/echo/*</url-pattern>
   </filter-mapping>
 </web-app>
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml b/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
index b93d673a43b2..85bad9fa7d53 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
+++ b/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
@@ -8,7 +8,7 @@
 
 <filter>
     <filter-name>wsuf-alt</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>idleTimeout</param-name>
       <param-value>5999</param-value>
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml b/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
index a733873a6712..456e5a178647 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
+++ b/jetty-websocket/websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
@@ -9,7 +9,7 @@
 <!-- Add the custom filter first. -->
   <filter>
     <filter-name>wsuf-alt</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>idleTimeout</param-name>
       <param-value>5999</param-value>
@@ -22,11 +22,11 @@
 
   <!-- The default filter is overridden so it is tried after. -->
   <filter>
-    <filter-name>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-class>
+    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
+    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
   </filter>
   <filter-mapping>
-    <filter-name>org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter</filter-name>
+    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 </web-app>

From fbf8113405071a08bcef07ea08dad042b4e682e1 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Thu, 26 Nov 2020 10:47:07 +1000
Subject: [PATCH 12/21] remove -T3 option to not have parallel build

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 772aca36c8ff..6dec0206ff46 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
           steps {
             container('jetty-build') {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk11", "-T3 clean install", "maven3",
+                mavenBuild( "jdk11", "clean install", "maven3",
                             [[parserName: 'Maven'], [parserName: 'Java'], [parserName: 'JavaDoc']] )
                 // Collect up the jacoco execution results (only on main build)
                 jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
@@ -41,7 +41,7 @@ pipeline {
           steps {
             container( 'jetty-build' ) {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk15", "clean install -T3 -Djacoco.skip=true", "maven3",
+                mavenBuild( "jdk15", "clean install -Djacoco.skip=true", "maven3",
                             [[parserName: 'Maven'], [parserName: 'Java'], [parserName: 'JavaDoc']])
               }
             }

From 85a2976d1830e7bc5aa319883c094db3a30cd65e Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Thu, 26 Nov 2020 12:24:59 +1000
Subject: [PATCH 13/21] no need of jacoco here

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 tests/test-integration/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 3eaf8f5da281..03814541c378 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -69,6 +69,17 @@
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
   <dependencies>
     <dependency>

From edb5b73b6c6dd712c82500bdbe75eba5a97829d2 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Thu, 26 Nov 2020 13:17:58 +1000
Subject: [PATCH 14/21] do no reuse forks

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 tests/test-integration/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 03814541c378..44468f6dd6f1 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -63,7 +63,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- Disabled due to junit5 bug - https://github.com/junit-team/junit5/issues/801 -->
-          <!--<forkMode>always</forkMode>-->
+          <reuseForks>false</reuseForks>
           <useSystemClassLoader>true</useSystemClassLoader>
           <useManifestOnlyJar>false</useManifestOnlyJar>
         </configuration>

From 6d14d482d25d24c1f192474e2fda64467b0cb1d0 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Fri, 27 Nov 2020 11:20:27 +1000
Subject: [PATCH 15/21] remove logback dependency and disable debug log level

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 tests/test-integration/pom.xml                         | 10 +++++-----
 .../src/test/resources/jetty-logging.properties        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 44468f6dd6f1..69d06c736044 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -188,10 +188,10 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>ch.qos.logback</groupId>-->
+<!--      <artifactId>logback-classic</artifactId>-->
+<!--      <version>1.2.3</version>-->
+<!--    </dependency>-->
   </dependencies>
 </project>
diff --git a/tests/test-integration/src/test/resources/jetty-logging.properties b/tests/test-integration/src/test/resources/jetty-logging.properties
index a3b4ac63db8d..0003cced627a 100644
--- a/tests/test-integration/src/test/resources/jetty-logging.properties
+++ b/tests/test-integration/src/test/resources/jetty-logging.properties
@@ -1,4 +1,4 @@
 # Jetty Logging using jetty-slf4j-impl
-org.eclipse.jetty.LEVEL=DEBUG
+#org.eclipse.jetty.LEVEL=DEBUG
 #org.eclipse.jetty.websocket.LEVEL=DEBUG
 #org.eclipse.jetty.util.ssl.KeyStoreScanner.LEVEL=DEBUG

From fee17ecc6cc959e40d70ff9d71e9b727546bc1d2 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Fri, 27 Nov 2020 13:26:00 +1000
Subject: [PATCH 16/21] make this test dynamic instead of hardcoded version...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-maven-plugin/pom.xml                                      | 1 +
 .../postbuild.groovy                                            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 7f7da35f21d4..560b7af48cf6 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -103,6 +103,7 @@
             <jettyStopKey>${jetty.stopKey}</jettyStopKey>
             <jettyStopPort>${jetty.stopPort}</jettyStopPort>
             <maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
+            <servletApiVersion>${servlet.api.version}</servletApiVersion>
           </scriptVariables>
           <goals>
             <goal>clean</goal>
diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
index 97e23b4c98da..959e6925a267 100644
--- a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
+++ b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
@@ -21,7 +21,7 @@ assert buildLog.text.contains( 'Started Server' )
 
 assert buildLog.text.contains( '(1a) >> javax.servlet.ServletContextListener loaded from jar:' )
 
-assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.4/jetty-servlet-api-4.0.4.jar!/javax/servlet/ServletContextListener.class << (1b)' )
+assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/'+servletApiVersion+'/jetty-servlet-api-'+servletApiVersion+'.jar!/javax/servlet/ServletContextListener.class << (1b)' )
 
 assert buildLog.text.contains( '(2a) >> mca.common.CommonService loaded from file:' )
 assert buildLog.text.contains( 'common/target/classes/mca/common/CommonService.class << (2b)' )

From c930bee83024513f9f8e1281da4f2e4424b6ff07 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Fri, 27 Nov 2020 16:56:54 +1000
Subject: [PATCH 17/21] use -fae

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1f3edce87002..07eba8a6dea7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,7 +98,7 @@ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) {
                "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
         configFileProvider(
                 [configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-          sh "mvn -s $GLOBAL_MVN_SETTINGS -DsettingsPath=$GLOBAL_MVN_SETTINGS -Pci -V -B -e -Djetty.testtracker.log=true $cmdline javadoc:jar -Dunix.socket.tmp=" +
+          sh "mvn -fae -s $GLOBAL_MVN_SETTINGS -DsettingsPath=$GLOBAL_MVN_SETTINGS -Pci -V -B -e -Djetty.testtracker.log=true $cmdline javadoc:jar -Dunix.socket.tmp=" +
                      env.JENKINS_HOME
         }
       }

From df09b65cfaa105e0e55079916fa0662129ae472d Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Mon, 30 Nov 2020 11:39:39 +1100
Subject: [PATCH 18/21] change websocket-servlet bundle symbolic name

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-servlet/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index b60a77c7d36f..cc7867879234 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -11,7 +11,7 @@
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Util-Server</name>
 
   <properties>
-    <bundle-symbolic-name>${project.groupId}.util.server</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
   </properties>
 
   <build>

From 3525c76f12d48e0eaaabec91d24445be3e5b7cd5 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Wed, 2 Dec 2020 06:12:24 +1000
Subject: [PATCH 19/21] cleanup changes

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile                    |  2 +-
 tests/test-integration/pom.xml | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 07eba8a6dea7..1f3edce87002 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,7 +98,7 @@ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) {
                "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
         configFileProvider(
                 [configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-          sh "mvn -fae -s $GLOBAL_MVN_SETTINGS -DsettingsPath=$GLOBAL_MVN_SETTINGS -Pci -V -B -e -Djetty.testtracker.log=true $cmdline javadoc:jar -Dunix.socket.tmp=" +
+          sh "mvn -s $GLOBAL_MVN_SETTINGS -DsettingsPath=$GLOBAL_MVN_SETTINGS -Pci -V -B -e -Djetty.testtracker.log=true $cmdline javadoc:jar -Dunix.socket.tmp=" +
                      env.JENKINS_HOME
         }
       }
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 69d06c736044..e2835585f6e6 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -62,24 +62,12 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!-- Disabled due to junit5 bug - https://github.com/junit-team/junit5/issues/801 -->
           <reuseForks>false</reuseForks>
           <useSystemClassLoader>true</useSystemClassLoader>
           <useManifestOnlyJar>false</useManifestOnlyJar>
         </configuration>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
   <dependencies>
     <dependency>
@@ -188,10 +176,5 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>ch.qos.logback</groupId>-->
-<!--      <artifactId>logback-classic</artifactId>-->
-<!--      <version>1.2.3</version>-->
-<!--    </dependency>-->
   </dependencies>
 </project>

From 2f611563f869f76650c7b9fee1fd9249e9d99062 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Wed, 2 Dec 2020 06:50:26 +1000
Subject: [PATCH 20/21] restore bugs....

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 tests/test-integration/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index e2835585f6e6..3eaf8f5da281 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -62,7 +62,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <reuseForks>false</reuseForks>
+          <!-- Disabled due to junit5 bug - https://github.com/junit-team/junit5/issues/801 -->
+          <!--<forkMode>always</forkMode>-->
           <useSystemClassLoader>true</useSystemClassLoader>
           <useManifestOnlyJar>false</useManifestOnlyJar>
         </configuration>
@@ -176,5 +177,10 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+    </dependency>
   </dependencies>
 </project>

From 043d2d1ff748d6529a7550e617e2e1435b775980 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 2 Dec 2020 00:02:37 +0100
Subject: [PATCH 21/21] Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 jetty-websocket/pom.xml                                |  2 +-
 .../jetty/websocket/core/server/WebSocketMappings.java | 10 +++++-----
 .../websocket/core/server/WebSocketUpgradeHandler.java |  4 ----
 ...ndlerTest.java => WebSocketUpgradeHandlerTest.java} |  4 ++--
 .../jetty/websocket/core/proxy/WebSocketProxyTest.java |  2 +-
 .../src/main/java/module-info.java                     |  6 +++---
 .../src/main/java/module-info.java                     |  2 +-
 .../server/JettyWebSocketServerContainer.java          |  2 +-
 .../jetty/websocket/server/JettyWebSocketServlet.java  |  2 +-
 jetty-websocket/websocket-servlet/pom.xml              |  3 +--
 .../websocket-servlet/src/main/java/module-info.java   |  4 ++--
 11 files changed, 18 insertions(+), 23 deletions(-)
 rename jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/{UpgradeHandlerTest.java => WebSocketUpgradeHandlerTest.java} (95%)

diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index c2e4e8f858c8..082b8b56fcbc 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -28,7 +28,7 @@
     <module>websocket-javax-client</module>
     <module>websocket-javax-server</module>
     <module>websocket-javax-tests</module>
-    <!-- Common WebSocket Implementation -->
+    <!-- Common Servlet WebSocket Implementation -->
     <module>websocket-servlet</module>
   </modules>
   <build>
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java
index c82dedfce1e3..ee5dc0f4f081 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java
@@ -59,14 +59,14 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketMappings.class);
     public static final String WEBSOCKET_MAPPING_ATTRIBUTE = WebSocketMappings.class.getName();
 
-    public static WebSocketMappings getMappings(ServletContext servletContext)
+    public static WebSocketMappings getWebSocketNegotiator(ServletContext servletContext)
     {
         return (WebSocketMappings)servletContext.getAttribute(WEBSOCKET_MAPPING_ATTRIBUTE);
     }
 
     public static WebSocketMappings ensureMappings(ServletContext servletContext)
     {
-        WebSocketMappings mapping = getMappings(servletContext);
+        WebSocketMappings mapping = getWebSocketNegotiator(servletContext);
         if (mapping == null)
         {
             mapping = new WebSocketMappings(WebSocketServerComponents.getWebSocketComponents(servletContext));
@@ -153,14 +153,14 @@ public void dump(Appendable out, String indent) throws IOException
         Dumpable.dumpObjects(out, indent, this, mappings);
     }
 
-    public WebSocketNegotiator getMappings(PathSpec pathSpec)
+    public WebSocketNegotiator getWebSocketNegotiator(PathSpec pathSpec)
     {
         return mappings.get(pathSpec);
     }
 
-    public WebSocketCreator getCreator(PathSpec pathSpec)
+    public WebSocketCreator getWebSocketCreator(PathSpec pathSpec)
     {
-        WebSocketNegotiator negotiator = getMappings(pathSpec);
+        WebSocketNegotiator negotiator = getWebSocketNegotiator(pathSpec);
         if (negotiator instanceof CreatorNegotiator)
             return  ((CreatorNegotiator)negotiator).getWebSocketCreator();
         return null;
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index 985384f5019d..9e443b8a9681 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -29,13 +29,9 @@
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class WebSocketUpgradeHandler extends HandlerWrapper
 {
-    private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeHandler.class);
-
     private final WebSocketMappings mappings;
     private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
 
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java
similarity index 95%
rename from jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java
index f4338f5a3750..7f700a385c5d 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeHandlerTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java
@@ -33,7 +33,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class UpgradeHandlerTest
+public class WebSocketUpgradeHandlerTest
 {
     private Server server;
     private WebSocketCoreClient client;
@@ -65,7 +65,7 @@ public void after() throws Exception
     }
 
     @Test
-    public void test() throws Exception
+    public void testUpgradeByWebSocketUpgradeHandler() throws Exception
     {
         TestMessageHandler clientEndpoint = new TestMessageHandler();
         CoreSession coreSession = client.connect(clientEndpoint, serverUri.resolve("/path/echo")).get(5, TimeUnit.SECONDS);
diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
index b5db56eaf34d..a002e710d9c9 100644
--- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
@@ -120,7 +120,7 @@ public void start() throws Exception
         handlers.addHandler(serverContext);
 
         ContextHandler proxyContext = new ContextHandler("/proxy");
-        negotiator = new TestWebSocketNegotiator(proxy.client2Proxy, defaultCustomizer);
+        negotiator = WebSocketNegotiator.from(negotiation -> proxy.client2Proxy, defaultCustomizer);
         upgradeHandler = new WebSocketUpgradeHandler();
         upgradeHandler.addMapping("/*", negotiator);
         proxyContext.setHandler(upgradeHandler);
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
index 60102eb22e1e..e61520f2c6a7 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
@@ -28,14 +28,14 @@
 {
     exports org.eclipse.jetty.websocket.javax.server.config;
 
+    requires org.eclipse.jetty.websocket.core.server;
     requires org.eclipse.jetty.websocket.javax.common;
     requires org.eclipse.jetty.websocket.servlet;
-    requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.javax.client;
 
-    provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;
-    provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator;
     provides Configuration with JavaxWebSocketConfiguration;
+    provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator;
+    provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;
 }
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
index 78cf8a627cc2..13530d914388 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
@@ -28,9 +28,9 @@
     exports org.eclipse.jetty.websocket.server.config;
 
     requires jetty.servlet.api;
+    requires org.eclipse.jetty.websocket.core.server;
     requires org.eclipse.jetty.websocket.jetty.common;
     requires org.eclipse.jetty.websocket.servlet;
-    requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index 9c5e4effe43a..7277dd6cb37d 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -123,7 +123,7 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl
     public void addMapping(String pathSpec, JettyWebSocketCreator creator)
     {
         PathSpec ps = WebSocketMappings.parsePathSpec(pathSpec);
-        if (webSocketMappings.getMappings(ps) != null)
+        if (webSocketMappings.getWebSocketNegotiator(ps) != null)
             throw new WebSocketException("Duplicate WebSocket Mapping for PathSpec");
 
         WebSocketUpgradeFilter.ensureFilter(contextHandler.getServletContext());
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
index 184cbfa8fa3a..8cf98be4ecf5 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
@@ -249,7 +249,7 @@ public void setCreator(JettyWebSocketCreator creator)
         @Override
         public JettyWebSocketCreator getMapping(String pathSpec)
         {
-            WebSocketCreator creator = mapping.getCreator(WebSocketMappings.parsePathSpec(pathSpec));
+            WebSocketCreator creator = mapping.getWebSocketCreator(WebSocketMappings.parsePathSpec(pathSpec));
             if (creator instanceof WrappedJettyCreator)
                 return ((WrappedJettyCreator)creator).getJettyWebSocketCreator();
             return null;
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index cc7867879234..063d33cb1dea 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -8,7 +8,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>websocket-servlet</artifactId>
-  <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Util-Server</name>
+  <name>Jetty :: Websocket :: Servlet</name>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
@@ -55,7 +55,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-websocket/websocket-servlet/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
index 80d8bc15893d..e3912db017ac 100644
--- a/jetty-websocket/websocket-servlet/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
@@ -20,7 +20,7 @@
 {
     exports org.eclipse.jetty.websocket.servlet;
 
-    requires org.slf4j;
-    requires org.eclipse.jetty.websocket.core.server;
     requires transitive org.eclipse.jetty.servlet;
+    requires org.eclipse.jetty.websocket.core.server;
+    requires org.slf4j;
 }