From bc21b354c7529891f9129ff2e98965f2a10444bf Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 20 Dec 2019 15:41:50 +1100 Subject: [PATCH 1/3] Rename websocket modules and directories with new naming convention. Signed-off-by: Lachlan Roberts --- jetty-websocket/pom.xml | 18 +++++++++--------- .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../client/AnnotatedClientEndpointConfig.java | 0 .../client/BasicClientEndpointConfig.java | 0 .../DelegatedJavaxClientUpgradeRequest.java | 0 .../DelegatedJavaxClientUpgradeResponse.java | 0 .../javax/client/EmptyConfigurator.java | 0 .../client/JavaxClientUpgradeRequest.java | 0 .../client/JavaxWebSocketClientContainer.java | 0 ...JavaxWebSocketClientContainerProvider.java | 0 ...vaxWebSocketClientFrameHandlerFactory.java | 0 .../javax/client/JsrUpgradeListener.java | 0 .../javax.websocket.ContainerProvider | 0 .../src/test/java/examples/EchoEndpoint.java | 0 .../examples/OriginServerConfigurator.java | 0 .../SecureClientContainerExample.java | 0 .../SecureWebSocketContainerExample.java | 0 .../test/resources/jetty-logging.properties | 0 .../resources/jetty-websocket-httpclient.xml | 0 .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../common/ClientEndpointConfigWrapper.java | 0 .../common/CompletableFutureCallback.java | 0 .../javax/common/ConfiguredEndpoint.java | 0 .../javax/common/DuplicateCoderException.java | 0 .../javax/common/EndpointConfigWrapper.java | 0 .../websocket/javax/common/InitException.java | 0 .../common/InvalidWebSocketException.java | 0 .../common/JavaxWebSocketAsyncRemote.java | 0 .../common/JavaxWebSocketBasicRemote.java | 0 .../javax/common/JavaxWebSocketContainer.java | 0 .../javax/common/JavaxWebSocketExtension.java | 0 .../common/JavaxWebSocketExtensionConfig.java | 0 .../common/JavaxWebSocketFrameHandler.java | 0 .../JavaxWebSocketFrameHandlerFactory.java | 0 .../JavaxWebSocketFrameHandlerMetadata.java | 0 .../common/JavaxWebSocketPongMessage.java | 0 .../common/JavaxWebSocketRemoteEndpoint.java | 0 .../javax/common/JavaxWebSocketSession.java | 0 .../common/JavaxWebSocketSessionListener.java | 0 .../common/JavaxWebSocketUpgradeRequest.java | 0 .../common/JavaxWebSocketUpgradeResponse.java | 0 .../websocket/javax/common/MessageSink.java | 0 .../javax/common/PathParamProvider.java | 0 .../javax/common/PutListenerMap.java | 0 .../common/RegisteredMessageHandler.java | 0 .../javax/common/SendHandlerCallback.java | 0 .../common/ServerEndpointConfigWrapper.java | 0 .../javax/common/SessionTracker.java | 0 .../javax/common/UpgradeRequest.java | 0 .../javax/common/UpgradeRequestAdapter.java | 0 .../javax/common/UpgradeResponse.java | 0 .../javax/common/UpgradeResponseAdapter.java | 0 .../common/decoders/AbstractDecoder.java | 0 .../common/decoders/AvailableDecoders.java | 0 .../javax/common/decoders/BooleanDecoder.java | 0 .../common/decoders/ByteArrayDecoder.java | 0 .../common/decoders/ByteBufferDecoder.java | 0 .../javax/common/decoders/ByteDecoder.java | 0 .../common/decoders/CharacterDecoder.java | 0 .../javax/common/decoders/DoubleDecoder.java | 0 .../javax/common/decoders/FloatDecoder.java | 0 .../common/decoders/InputStreamDecoder.java | 0 .../javax/common/decoders/IntegerDecoder.java | 0 .../javax/common/decoders/LongDecoder.java | 0 .../common/decoders/PongMessageDecoder.java | 0 .../javax/common/decoders/ReaderDecoder.java | 0 .../javax/common/decoders/ShortDecoder.java | 0 .../javax/common/decoders/StringDecoder.java | 0 .../common/encoders/AbstractEncoder.java | 0 .../common/encoders/AvailableEncoders.java | 0 .../javax/common/encoders/BooleanEncoder.java | 0 .../common/encoders/ByteArrayEncoder.java | 0 .../common/encoders/ByteBufferEncoder.java | 0 .../javax/common/encoders/ByteEncoder.java | 0 .../common/encoders/CharacterEncoder.java | 0 .../javax/common/encoders/DoubleEncoder.java | 0 .../common/encoders/EncodeFailedFuture.java | 0 .../javax/common/encoders/FloatEncoder.java | 0 .../javax/common/encoders/IntegerEncoder.java | 0 .../javax/common/encoders/LongEncoder.java | 0 .../javax/common/encoders/ShortEncoder.java | 0 .../javax/common/encoders/StringEncoder.java | 0 .../common/messages/AbstractMessageSink.java | 0 .../common/messages/ByteArrayMessageSink.java | 0 .../messages/ByteBufferMessageSink.java | 0 .../javax/common/messages/CallbackBuffer.java | 0 .../messages/DecodedBinaryMessageSink.java | 0 .../DecodedBinaryStreamMessageSink.java | 0 .../common/messages/DecodedMessageSink.java | 0 .../messages/DecodedTextMessageSink.java | 0 .../DecodedTextStreamMessageSink.java | 0 .../messages/DispatchedMessageSink.java | 0 .../messages/InputStreamMessageSink.java | 0 .../common/messages/MessageInputStream.java | 0 .../common/messages/MessageOutputStream.java | 0 .../javax/common/messages/MessageReader.java | 0 .../javax/common/messages/MessageWriter.java | 0 .../messages/PartialByteArrayMessageSink.java | 0 .../PartialByteBufferMessageSink.java | 0 .../messages/PartialStringMessageSink.java | 0 .../common/messages/ReaderMessageSink.java | 0 .../common/messages/StringMessageSink.java | 0 .../util/DuplicateAnnotationException.java | 0 .../util/InvalidSignatureException.java | 0 .../javax/common/util/InvokerUtils.java | 0 .../javax/common/util/ReflectUtils.java | 0 .../websocket/javax/common/util/TextUtil.java | 0 ...bstractJavaxWebSocketFrameHandlerTest.java | 0 .../javax/common/AbstractSessionTest.java | 0 .../websocket/javax/common/Defaults.java | 0 .../javax/common/DummyContainer.java | 0 .../common/DummyFrameHandlerFactory.java | 0 ...bSocketFrameHandler_BadSignaturesTest.java | 0 ...avaxWebSocketFrameHandler_OnCloseTest.java | 0 ...avaxWebSocketFrameHandler_OnErrorTest.java | 0 ...ameHandler_OnMessage_BinaryStreamTest.java | 0 ...cketFrameHandler_OnMessage_BinaryTest.java | 0 ...FrameHandler_OnMessage_TextStreamTest.java | 0 ...SocketFrameHandler_OnMessage_TextTest.java | 0 ...JavaxWebSocketFrameHandler_OnOpenTest.java | 0 .../common/coders/tests/BadDualDecoder.java | 0 .../common/coders/tests/BadDualEncoder.java | 0 .../javax/common/coders/tests/ExtDecoder.java | 0 .../javax/common/coders/tests/Fruit.java | 0 .../coders/tests/FruitBinaryEncoder.java | 0 .../common/coders/tests/FruitDecoder.java | 0 .../common/coders/tests/FruitTextEncoder.java | 0 .../endpoints/AbstractStringEndpoint.java | 0 .../javax/common/endpoints/DummyEndpoint.java | 0 .../common/endpoints/EchoStringEndpoint.java | 0 .../common/handlers/BaseMessageHandler.java | 0 .../handlers/ByteArrayPartialHandler.java | 0 .../handlers/ByteArrayWholeHandler.java | 0 .../handlers/ByteBufferPartialHandler.java | 0 .../handlers/ByteBufferWholeHandler.java | 0 .../common/handlers/ComboMessageHandler.java | 0 .../handlers/ExtendedMessageHandler.java | 0 .../handlers/InputStreamWholeHandler.java | 0 .../common/handlers/LongMessageHandler.java | 0 .../common/handlers/ReaderWholeHandler.java | 0 .../common/handlers/StringPartialHandler.java | 0 .../common/handlers/StringWholeHandler.java | 0 .../messages/AbstractMessageSinkTest.java | 0 .../DecodedBinaryMessageSinkTest.java | 0 .../DecodedBinaryStreamMessageSinkTest.java | 0 .../messages/DecodedTextMessageSinkTest.java | 0 .../DecodedTextStreamMessageSinkTest.java | 0 .../messages/InputStreamMessageSinkTest.java | 0 .../common/messages/MessageWriterTest.java | 0 .../messages/ReaderMessageSinkTest.java | 0 .../javax/common/sockets/TrackingSocket.java | 0 .../javax/common/util/InvokerUtilsTest.java | 0 .../util/InvokerUtils_StaticParamsTest.java | 0 .../common/util/NameParamIdentifier.java | 0 .../javax/common/util/ReflectUtilsTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../src/test/resources/quotes-ben.txt | 0 .../src/test/resources/quotes-twain.txt | 0 .../pom.xml | 0 .../src/main/config/modules/websocket.mod | 0 .../src/main/java/module-info.java | 0 .../config/ContainerDefaultConfigurator.java | 1 - .../config/JavaxWebSocketConfiguration.java | 0 ...xWebSocketServletContainerInitializer.java | 0 .../AnnotatedServerEndpointConfig.java | 0 .../internal/BasicServerEndpointConfig.java | 0 .../DelegatedJavaxServletUpgradeRequest.java | 0 .../internal/JavaxWebSocketCreator.java | 0 .../JavaxWebSocketServerContainer.java | 0 ...vaxWebSocketServerFrameHandlerFactory.java | 0 .../server/internal/JsrHandshakeRequest.java | 0 .../server/internal/JsrHandshakeResponse.java | 0 .../server/internal/PathParamIdentifier.java | 0 .../PathParamServerEndpointConfig.java | 0 .../internal/UpgradeResponseAdapter.java | 0 .../javax.servlet.ServletContainerInitializer | 0 ...t.server.ServerEndpointConfig$Configurator | 0 .../org.eclipse.jetty.webapp.Configuration | 0 .../browser/JsrBrowserConfigurator.java | 0 .../server/browser/JsrBrowserDebugTool.java | 0 .../server/browser/JsrBrowserSocket.java | 0 .../examples/GetHttpSessionConfigurator.java | 0 .../server/examples/GetHttpSessionSocket.java | 0 .../server/examples/MyAuthedConfigurator.java | 0 .../javax/server/examples/MyAuthedSocket.java | 0 .../server/examples/StreamingEchoSocket.java | 0 .../examples/WebSocketServerExamplesTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../resources/jetty-websocket-httpclient.xml | 0 .../jsr-browser-debug-tool/index.html | 0 .../resources/jsr-browser-debug-tool/main.css | 0 .../jsr-browser-debug-tool/websocket.js | 0 .../fuzzingclient.json | 0 .../fuzzingserver.json | 0 .../pom.xml | 0 .../jetty/websocket/javax/tests/BadFrame.java | 0 .../javax/tests/BiConsumerServiceServlet.java | 0 .../tests/CompletableFutureMethodHandle.java | 0 .../websocket/javax/tests/CoreServer.java | 0 .../websocket/javax/tests/DataUtils.java | 0 .../websocket/javax/tests/DummyEndpoint.java | 0 .../websocket/javax/tests/EventSocket.java | 0 .../websocket/javax/tests/FunctionMethod.java | 0 .../jetty/websocket/javax/tests/Fuzzer.java | 0 .../websocket/javax/tests/LocalFuzzer.java | 0 .../websocket/javax/tests/LocalServer.java | 0 .../websocket/javax/tests/MessageType.java | 0 .../websocket/javax/tests/NetworkFuzzer.java | 0 .../websocket/javax/tests/ParserCapture.java | 0 .../javax/tests/RawFrameBuilder.java | 0 .../javax/tests/SessionMatchers.java | 0 .../jetty/websocket/javax/tests/Sha1Sum.java | 0 .../jetty/websocket/javax/tests/Timeouts.java | 0 .../websocket/javax/tests/UnitGenerator.java | 0 .../websocket/javax/tests/UpgradeUtils.java | 0 .../javax/tests/WSEndpointTracker.java | 0 .../websocket/javax/tests/WSEventTracker.java | 0 .../jetty/websocket/javax/tests/WSServer.java | 0 .../jetty/websocket/javax/tests/WSURI.java | 0 .../javax/tests/framehandlers/FrameEcho.java | 0 .../framehandlers/FrameHandlerTracker.java | 0 .../javax/tests/framehandlers/StaticText.java | 0 .../tests/framehandlers/WholeMessageEcho.java | 0 .../tests/matchers/IsMessageHandlerType.java | 0 .../IsMessageHandlerTypeRegistered.java | 0 .../com/acme/websocket/BasicEchoEndpoint.java | 0 ...asicEchoEndpointConfigContextListener.java | 0 .../websocket/IdleTimeoutContextListener.java | 0 .../websocket/IdleTimeoutOnOpenEndpoint.java | 0 .../websocket/IdleTimeoutOnOpenSocket.java | 0 .../websocket/LargeEchoContextListener.java | 0 .../websocket/LargeEchoDefaultSocket.java | 0 .../websocket/OnOpenIdleTimeoutEndpoint.java | 0 .../acme/websocket/PongContextListener.java | 0 .../acme/websocket/PongMessageEndpoint.java | 0 .../java/com/acme/websocket/PongSocket.java | 0 .../javax/tests/JettySpecificConfigTest.java | 0 .../websocket/javax/tests/PathParamTest.java | 0 .../javax/tests/RestartContextTest.java | 0 .../tests/autobahn/JavaxAutobahnClient.java | 0 .../tests/autobahn/JavaxAutobahnServer.java | 0 .../tests/autobahn/JavaxAutobahnSocket.java | 0 .../client/AbstractClientSessionTest.java | 0 .../client/AnnotatedClientEndpointTest.java | 0 .../tests/client/AnnotatedEchoClient.java | 0 .../javax/tests/client/AnnotatedEchoTest.java | 0 .../javax/tests/client/ConfiguratorTest.java | 0 .../javax/tests/client/CookiesTest.java | 0 .../client/DecoderReaderManySmallTest.java | 0 .../tests/client/DelayedStartClientTest.java | 0 .../javax/tests/client/EndpointEchoTest.java | 0 .../client/JsrClientEchoTrackingSocket.java | 0 .../tests/client/JsrClientTrackingSocket.java | 0 .../tests/client/MessageReceivingTest.java | 1 - .../javax/tests/client/OnCloseTest.java | 0 .../client/SessionAddMessageHandlerTest.java | 0 .../javax/tests/client/WriteTimeoutTest.java | 0 .../misbehaving/AnnotatedRuntimeOnOpen.java | 0 .../misbehaving/EndpointRuntimeOnOpen.java | 0 .../misbehaving/MisbehavingClassTest.java | 0 .../samples/CloseEndpointConfigSocket.java | 0 .../samples/CloseReasonSessionSocket.java | 0 .../client/samples/CloseReasonSocket.java | 0 .../samples/CloseSessionReasonSocket.java | 0 .../client/samples/CloseSessionSocket.java | 0 .../tests/client/samples/CloseSocket.java | 0 .../javax/tests/client/samples/IntSocket.java | 0 .../tests/coders/AvailableDecodersTest.java | 0 .../tests/coders/AvailableEncodersTest.java | 0 .../javax/tests/coders/BadDualDecoder.java | 0 .../javax/tests/coders/BadDualEncoder.java | 0 .../tests/coders/CoderEventTracking.java | 0 .../javax/tests/coders/DateDecoder.java | 0 .../javax/tests/coders/DateEncoder.java | 0 .../javax/tests/coders/DateTimeDecoder.java | 0 .../javax/tests/coders/DateTimeEncoder.java | 0 .../tests/coders/DecoderTextStreamTest.java | 0 .../javax/tests/coders/DecoderTextTest.java | 0 .../javax/tests/coders/EncoderTextTest.java | 0 .../javax/tests/coders/ExtDecoder.java | 0 .../javax/tests/coders/FloatDecoderTest.java | 0 .../websocket/javax/tests/coders/Fruit.java | 0 .../tests/coders/FruitBinaryEncoder.java | 0 .../javax/tests/coders/FruitDecoder.java | 0 .../javax/tests/coders/FruitTextEncoder.java | 0 .../tests/coders/IntegerDecoderTest.java | 0 .../javax/tests/coders/LongDecoderTest.java | 0 .../websocket/javax/tests/coders/Quotes.java | 0 .../javax/tests/coders/QuotesDecoder.java | 0 .../javax/tests/coders/QuotesEncoder.java | 0 .../javax/tests/coders/QuotesUtil.java | 0 .../javax/tests/coders/ShortDecoderTest.java | 0 .../javax/tests/coders/TimeDecoder.java | 0 .../javax/tests/coders/TimeEncoder.java | 0 .../javax/tests/coders/ValidDualDecoder.java | 0 .../javax/tests/coders/ValidDualEncoder.java | 0 .../tests/handlers/BaseMessageHandler.java | 0 .../handlers/ByteArrayPartialHandler.java | 0 .../tests/handlers/ByteArrayWholeHandler.java | 0 .../handlers/ByteBufferPartialHandler.java | 0 .../handlers/ByteBufferWholeHandler.java | 0 .../tests/handlers/ComboMessageHandler.java | 0 .../handlers/ExtendedMessageHandler.java | 0 .../handlers/InputStreamWholeHandler.java | 0 .../tests/handlers/LongMessageHandler.java | 0 .../tests/handlers/ReaderWholeHandler.java | 0 .../tests/handlers/StringPartialHandler.java | 0 .../tests/handlers/StringWholeHandler.java | 0 .../websocket/javax/tests/quotes/Quotes.java | 0 .../javax/tests/quotes/QuotesDecoder.java | 0 .../javax/tests/quotes/QuotesDecoderTest.java | 0 .../quotes/QuotesDecoderTextStreamTest.java | 0 .../javax/tests/quotes/QuotesEncoder.java | 0 .../javax/tests/quotes/QuotesEncoderTest.java | 0 .../javax/tests/quotes/QuotesSocket.java | 0 .../javax/tests/quotes/QuotesUtil.java | 0 ...tJavaxWebSocketServerFrameHandlerTest.java | 0 .../javax/tests/server/AltFilterTest.java | 0 .../server/AnnotatedServerEndpointTest.java | 0 ...asicEchoEndpointConfigContextListener.java | 0 .../BasicEchoEndpointContextListener.java | 0 .../BasicEchoSocketConfigContextListener.java | 0 .../BasicEchoSocketContextListener.java | 0 .../javax/tests/server/BinaryStreamTest.java | 0 .../javax/tests/server/ConfiguratorTest.java | 0 .../tests/server/DeploymentExceptionTest.java | 0 .../tests/server/EndpointViaConfigTest.java | 0 .../server/IdleTimeoutContextListener.java | 0 .../javax/tests/server/IdleTimeoutTest.java | 0 .../tests/server/InputStreamEchoTest.java | 0 ...FrameHandler_OnMessage_TextStreamTest.java | 0 .../JettyServerEndpointConfiguratorTest.java | 0 .../javax/tests/server/JsrBatchModeTest.java | 0 .../javax/tests/server/JsrEchoTest.java | 0 .../tests/server/LargeAnnotatedTest.java | 0 .../tests/server/LargeContainerTest.java | 0 .../server/LargeEchoContextListener.java | 0 .../javax/tests/server/MemoryUsageTest.java | 0 .../tests/server/OnMessageReturnTest.java | 0 .../javax/tests/server/PartialEchoTest.java | 0 .../javax/tests/server/PingPongTest.java | 0 .../tests/server/PongContextListener.java | 0 .../javax/tests/server/PongSocket.java | 0 .../server/PrimitivesBinaryEchoTest.java | 0 .../tests/server/PrimitivesTextEchoTest.java | 0 .../javax/tests/server/ReaderEchoTest.java | 0 .../javax/tests/server/SessionTest.java | 0 .../tests/server/SessionTrackingTest.java | 0 .../javax/tests/server/StreamTest.java | 0 .../javax/tests/server/TextStreamTest.java | 0 .../server/UriTemplateParameterTest.java | 0 .../WebSocketServerContainerExecutorTest.java | 0 .../configs/EchoSocketConfigurator.java | 0 .../BasicBinaryMessageByteBufferSocket.java | 0 .../BasicCloseReasonSessionSocket.java | 0 .../sockets/BasicCloseReasonSocket.java | 0 .../BasicCloseSessionReasonSocket.java | 0 .../server/sockets/BasicCloseSocket.java | 0 .../tests/server/sockets/BasicEchoSocket.java | 0 .../sockets/BasicErrorSessionSocket.java | 0 .../BasicErrorSessionThrowableSocket.java | 0 .../server/sockets/BasicErrorSocket.java | 0 .../BasicErrorThrowableSessionSocket.java | 0 .../sockets/BasicErrorThrowableSocket.java | 0 .../sockets/BasicOpenCloseSessionSocket.java | 0 .../server/sockets/BasicOpenCloseSocket.java | 0 .../sockets/BasicOpenSessionSocket.java | 0 .../tests/server/sockets/BasicOpenSocket.java | 0 .../sockets/BasicPongMessageSocket.java | 0 .../sockets/BasicTextMessageStringSocket.java | 0 .../server/sockets/ByteBufferSocket.java | 0 .../server/sockets/ConfiguredEchoSocket.java | 0 .../tests/server/sockets/DateTextSocket.java | 0 .../sockets/IdleTimeoutOnOpenEndpoint.java | 0 .../sockets/IdleTimeoutOnOpenSocket.java | 0 .../server/sockets/InvalidCloseIntSocket.java | 0 .../sockets/InvalidErrorErrorSocket.java | 0 .../server/sockets/InvalidErrorIntSocket.java | 0 .../sockets/InvalidOpenCloseReasonSocket.java | 0 .../server/sockets/InvalidOpenIntSocket.java | 0 .../sockets/InvalidOpenSessionIntSocket.java | 0 .../StatelessTextMessageStringSocket.java | 0 .../tests/server/sockets/TrackingSocket.java | 0 .../sockets/binary/ByteBufferSocket.java | 0 .../sockets/echo/BasicEchoEndpoint.java | 0 .../server/sockets/echo/BasicEchoSocket.java | 0 .../sockets/echo/EchoAsyncTextSocket.java | 0 .../sockets/echo/EchoBasicTextSocket.java | 0 .../sockets/echo/EchoReturnEndpoint.java | 0 .../sockets/echo/EchoReturnTextSocket.java | 0 .../echo/EchoStatelessAsyncTextSocket.java | 0 .../echo/EchoStatelessBasicTextSocket.java | 0 .../echo/LargeEchoConfiguredSocket.java | 0 .../sockets/echo/LargeEchoDefaultSocket.java | 0 .../OnOpenIdleTimeoutEndpoint.java | 0 .../idletimeout/OnOpenIdleTimeoutSocket.java | 0 .../partial/PartialTextSessionSocket.java | 0 .../sockets/partial/PartialTextSocket.java | 0 .../partial/PartialTrackingSocket.java | 0 .../sockets/pong/PongMessageEndpoint.java | 0 .../BooleanObjectTextParamSocket.java | 0 .../primitives/BooleanObjectTextSocket.java | 0 .../primitives/BooleanTextParamSocket.java | 0 .../sockets/primitives/BooleanTextSocket.java | 0 .../primitives/ByteObjectTextSocket.java | 0 .../sockets/primitives/ByteTextSocket.java | 0 .../sockets/primitives/CharTextSocket.java | 0 .../primitives/CharacterObjectTextSocket.java | 0 .../primitives/DoubleObjectTextSocket.java | 0 .../sockets/primitives/DoubleTextSocket.java | 0 .../primitives/FloatObjectTextSocket.java | 0 .../sockets/primitives/FloatTextSocket.java | 0 .../primitives/IntParamTextSocket.java | 0 .../sockets/primitives/IntTextSocket.java | 0 .../IntegerObjectParamTextSocket.java | 0 .../primitives/IntegerObjectTextSocket.java | 0 .../primitives/LongObjectTextSocket.java | 0 .../sockets/primitives/LongTextSocket.java | 0 .../primitives/ShortObjectTextSocket.java | 0 .../sockets/primitives/ShortTextSocket.java | 0 .../sockets/streaming/InputStreamSocket.java | 0 .../sockets/streaming/ReaderParamSocket.java | 0 .../sockets/streaming/ReaderSocket.java | 0 .../StringReturnReaderParamSocket.java | 0 .../src/test/resources/alt-filter-web.xml | 0 .../basic-echo-endpoint-config-web.xml | 0 .../src/test/resources/data/larger.png | Bin .../src/test/resources/data/larger.png.sha | 0 .../src/test/resources/data/largest.jpg | Bin .../src/test/resources/data/largest.jpg.sha | 0 .../src/test/resources/data/medium.png | Bin .../src/test/resources/data/medium.png.sha | 0 .../src/test/resources/data/small.png | Bin .../src/test/resources/data/small.png.sha | 0 .../src/test/resources/empty-web.xml | 0 .../resources/idle-timeout-config-web.xml | 0 .../test/resources/jetty-logging.properties | 0 .../src/test/resources/keystore | Bin .../test/resources/large-echo-config-web.xml | 0 .../src/test/resources/logback-test.xml | 0 .../src/test/resources/pong-config-web.xml | 0 .../src/test/resources/quotes-ben.txt | 0 .../src/test/resources/quotes-twain.txt | 0 .../simple/jetty-websocket-httpclient.xml | 0 .../wsuf-alt-config-via-listener.xml | 0 .../resources/wsuf-config-via-listener.xml | 0 .../wsuf-config-via-servlet-init.xml | 0 .../src/test/webapp/index.html | 0 .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../websocket/api/BadPayloadException.java | 0 .../jetty/websocket/api/BatchMode.java | 0 .../jetty/websocket/api/CloseException.java | 0 .../jetty/websocket/api/CloseStatus.java | 0 .../eclipse/jetty/websocket/api/Frame.java | 0 .../api/InvalidWebSocketException.java | 0 .../api/MessageTooLargeException.java | 0 .../api/PolicyViolationException.java | 0 .../websocket/api/ProtocolException.java | 0 .../jetty/websocket/api/RemoteEndpoint.java | 0 .../eclipse/jetty/websocket/api/Session.java | 0 .../jetty/websocket/api/StatusCode.java | 0 .../jetty/websocket/api/SuspendToken.java | 0 .../jetty/websocket/api/UpgradeException.java | 0 .../jetty/websocket/api/UpgradeRequest.java | 0 .../jetty/websocket/api/UpgradeResponse.java | 0 .../jetty/websocket/api/WebSocketAdapter.java | 0 .../websocket/api/WebSocketBehavior.java | 0 .../api/WebSocketConnectionListener.java | 0 .../websocket/api/WebSocketConstants.java | 0 .../websocket/api/WebSocketException.java | 0 .../websocket/api/WebSocketFrameListener.java | 0 .../websocket/api/WebSocketListener.java | 0 .../api/WebSocketPartialListener.java | 0 .../api/WebSocketPingPongListener.java | 0 .../jetty/websocket/api/WebSocketPolicy.java | 0 .../api/WebSocketSessionListener.java | 0 .../api/WebSocketTimeoutException.java | 0 .../jetty/websocket/api/WriteCallback.java | 0 .../api/annotations/OnWebSocketClose.java | 0 .../api/annotations/OnWebSocketConnect.java | 0 .../api/annotations/OnWebSocketError.java | 0 .../api/annotations/OnWebSocketFrame.java | 0 .../api/annotations/OnWebSocketMessage.java | 0 .../websocket/api/annotations/WebSocket.java | 0 .../api/annotations/package-info.java | 0 .../api/extensions/ExtensionConfig.java | 0 .../api/extensions/package-info.java | 0 .../jetty/websocket/api/package-info.java | 0 .../jetty/websocket/api/util/WSURI.java | 0 .../websocket/api/util/package-info.java | 0 .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../client/ClientUpgradeRequest.java | 0 .../client/JettyUpgradeListener.java | 0 .../websocket/client/WebSocketClient.java | 0 .../DelegatedJettyClientUpgradeRequest.java | 0 .../DelegatedJettyClientUpgradeResponse.java | 0 .../impl/JettyClientUpgradeRequest.java | 0 .../jetty/websocket/client/package-info.java | 0 .../src/test/java/examples/ClientDemo.java | 0 .../test/java/examples/SimpleEchoClient.java | 0 .../test/java/examples/SimpleEchoSocket.java | 0 .../websocket/client/HttpClientInitTest.java | 0 .../client/WebSocketClientBadUriTest.java | 0 .../client/WebSocketClientInitTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../websocket/common/AbstractMessageSink.java | 0 .../common/CompletableFutureCallback.java | 0 .../common/ExtensionConfigParser.java | 0 .../common/FunctionCallException.java | 0 .../common/JettyExtensionConfig.java | 0 .../websocket/common/JettyWebSocketFrame.java | 0 .../common/JettyWebSocketFrameHandler.java | 0 .../JettyWebSocketFrameHandlerFactory.java | 0 .../JettyWebSocketFrameHandlerMetadata.java | 0 .../common/JettyWebSocketRemoteEndpoint.java | 0 .../jetty/websocket/common/MessageSink.java | 0 .../websocket/common/SessionTracker.java | 0 .../websocket/common/WebSocketContainer.java | 0 .../websocket/common/WebSocketSession.java | 0 .../invoke/InvalidSignatureException.java | 0 .../websocket/common/invoke/InvokerUtils.java | 0 .../common/message/ByteArrayMessageSink.java | 0 .../common/message/ByteBufferMessageSink.java | 0 .../common/message/CallbackBuffer.java | 0 .../common/message/DispatchedMessageSink.java | 0 .../message/InputStreamMessageSink.java | 0 .../common/message/MessageInputStream.java | 0 .../common/message/MessageOutputStream.java | 0 .../common/message/MessageReader.java | 0 .../common/message/MessageWriter.java | 0 .../message/PartialBinaryMessageSink.java | 0 .../message/PartialTextMessageSink.java | 0 .../common/message/ReaderMessageSink.java | 0 .../common/message/StringMessageSink.java | 0 .../common/message/package-info.java | 0 .../jetty/websocket/common/package-info.java | 0 .../util/DuplicateAnnotationException.java | 0 .../websocket/common/util/ReflectUtils.java | 0 .../jetty/websocket/common/util/TextUtil.java | 0 .../websocket/common/util/Utf8CharBuffer.java | 0 ...cket.api.extensions.ExtensionConfig$Parser | 0 ...tty.websocket.common.reflect.ArgIdentifier | 0 .../websocket/common/DummyContainer.java | 0 .../jetty/websocket/common/EventQueue.java | 0 .../JettyWebSocketFrameHandlerTest.java | 0 .../common/LocalEndpointMetadataTest.java | 0 .../common/MessageInputStreamTest.java | 0 .../common/MessageOutputStreamTest.java | 0 .../websocket/common/MessageWriterTest.java | 0 .../common/OutgoingMessageCapture.java | 0 .../TestableLeakTrackingBufferPool.java | 0 .../endpoints/adapters/AdapterEchoSocket.java | 0 .../adapters/AnnotatedEchoSocket.java | 0 .../adapters/ListenerEchoSocket.java | 0 .../annotated/AnnotatedBinaryArraySocket.java | 0 .../AnnotatedBinaryStreamSocket.java | 0 .../annotated/AnnotatedTextSocket.java | 0 .../annotated/AnnotatedTextStreamSocket.java | 0 .../annotated/BadBinarySignatureSocket.java | 0 .../annotated/BadDuplicateBinarySocket.java | 0 .../annotated/BadDuplicateFrameSocket.java | 0 .../annotated/BadTextSignatureSocket.java | 0 .../endpoints/annotated/FrameSocket.java | 0 .../annotated/MyEchoBinarySocket.java | 0 .../endpoints/annotated/MyEchoSocket.java | 0 .../annotated/MyStatelessEchoSocket.java | 0 .../endpoints/annotated/NoopSocket.java | 0 .../endpoints/annotated/NotASocket.java | 0 .../listeners/ListenerBasicSocket.java | 0 .../listeners/ListenerFrameSocket.java | 0 .../listeners/ListenerPartialSocket.java | 0 .../listeners/ListenerPingPongSocket.java | 0 .../common/handshake/DummyUpgradeRequest.java | 0 .../handshake/DummyUpgradeResponse.java | 0 .../common/invoke/InvokerUtilsTest.java | 0 .../common/invoke/NameParamIdentifier.java | 0 .../common/util/Utf8CharBufferTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../pom.xml | 0 .../src/main/java/module-info.java | 0 .../server/JettyServerUpgradeRequest.java | 0 .../server/JettyServerUpgradeResponse.java | 0 .../server/JettyWebSocketCreator.java | 0 .../server/JettyWebSocketServerContainer.java | 0 .../server/JettyWebSocketServlet.java | 0 .../server/JettyWebSocketServletFactory.java | 0 .../config/JettyWebSocketConfiguration.java | 0 ...yWebSocketServletContainerInitializer.java | 0 .../JettyServerFrameHandlerFactory.java | 0 .../internal/UpgradeRequestAdapter.java | 0 .../internal/UpgradeResponseAdapter.java | 0 .../javax.servlet.ServletContainerInitializer | 0 .../org.eclipse.jetty.webapp.Configuration | 0 .../server/browser/BrowserDebugTool.java | 0 .../server/browser/BrowserSocket.java | 0 .../resources/browser-debug-tool/index.html | 0 .../resources/browser-debug-tool/main.css | 0 .../resources/browser-debug-tool/websocket.js | 0 .../fuzzingclient.json | 0 .../fuzzingserver.json | 0 .../pom.xml | 0 .../tests/AnnoMaxMessageEndpoint.java | 0 .../tests/CloseTrackingEndpoint.java | 0 .../tests/ConcurrentConnectTest.java | 0 .../tests/ConnectMessageEndpoint.java | 0 .../jetty/websocket/tests/EchoCreator.java | 0 .../jetty/websocket/tests/EchoSocket.java | 0 .../jetty/websocket/tests/EventSocket.java | 0 .../tests/GetAuthHeaderEndpoint.java | 0 .../JettyWebSocketExtensionConfigTest.java | 0 .../tests/JettyWebSocketFilterTest.java | 0 .../tests/JettyWebSocketNegotiationTest.java | 0 .../tests/JettyWebSocketServletTest.java | 0 .../jetty/websocket/tests/ParamsEndpoint.java | 0 .../websocket/tests/SimpleStatusServlet.java | 0 .../websocket/tests/SuspendResumeTest.java | 0 .../tests/WebSocketOverHTTP2Test.java | 0 .../tests/WebSocketServletExamplesTest.java | 0 .../websocket/tests/WebSocketStatsTest.java | 0 .../websocket/tests/WebSocketStopTest.java | 0 .../tests/autobahn/JettyAutobahnClient.java | 0 .../tests/autobahn/JettyAutobahnServer.java | 0 .../tests/autobahn/JettyAutobahnSocket.java | 0 .../tests/client/BadNetworkTest.java | 0 .../tests/client/ClientCloseTest.java | 0 .../tests/client/ClientConfigTest.java | 0 .../tests/client/ClientConnectTest.java | 0 .../client/ClientOpenSessionTracker.java | 0 .../tests/client/ClientSessionsTest.java | 0 .../tests/client/ClientWriteThread.java | 0 .../tests/client/InvalidUpgradeServlet.java | 0 .../tests/client/SlowClientTest.java | 0 .../tests/client/WebSocketClientTest.java | 0 .../tests/examples/MyAdvancedEchoCreator.java | 0 .../tests/examples/MyAdvancedEchoServlet.java | 0 .../tests/examples/MyAuthedCreator.java | 0 .../tests/examples/MyAuthedServlet.java | 0 .../tests/examples/MyBinaryEchoSocket.java | 0 .../tests/examples/MyEchoServlet.java | 0 .../tests/examples/MyEchoSocket.java | 0 .../tests/extensions/ExtensionConfigTest.java | 0 .../tests/server/AbstractCloseEndpoint.java | 0 .../tests/server/ContainerEndpoint.java | 0 .../tests/server/FastCloseEndpoint.java | 0 .../tests/server/FastFailEndpoint.java | 0 .../tests/server/FrameAnnotationTest.java | 0 .../tests/server/FrameListenerTest.java | 0 .../tests/server/PartialListenerTest.java | 0 .../tests/server/ServerCloseCreator.java | 0 .../tests/server/ServerCloseTest.java | 0 .../tests/server/ServerConfigTest.java | 0 .../tests/server/SlowServerEndpoint.java | 0 .../tests/server/SlowServerTest.java | 0 .../tests/util/FutureWriteCallback.java | 0 .../jetty/websocket/tests/util/WSURITest.java | 0 .../test/resources/jetty-logging.properties | 0 .../src/test/resources/keystore.p12 | Bin 663 files changed, 9 insertions(+), 11 deletions(-) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/pom.xml (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/module-info.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeRequest.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeResponse.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/main/resources/META-INF/services/javax.websocket.ContainerProvider (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/java/examples/EchoEndpoint.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/java/examples/OriginServerConfigurator.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/java/examples/SecureClientContainerExample.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/java/examples/SecureWebSocketContainerExample.java (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{javax-websocket-client => websocket-javax-client}/src/test/resources/jetty-websocket-httpclient.xml (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/pom.xml (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/module-info.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/resources/quotes-ben.txt (100%) rename jetty-websocket/{javax-websocket-common => websocket-javax-common}/src/test/resources/quotes-twain.txt (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/pom.xml (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/config/modules/websocket.mod (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/module-info.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java (98%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/DelegatedJavaxServletUpgradeRequest.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/resources/jetty-websocket-httpclient.xml (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/resources/jsr-browser-debug-tool/index.html (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/resources/jsr-browser-debug-tool/main.css (100%) rename jetty-websocket/{javax-websocket-server => websocket-javax-server}/src/test/resources/jsr-browser-debug-tool/websocket.js (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/fuzzingclient.json (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/fuzzingserver.json (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/pom.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/BasicEchoEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/LargeEchoContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/PongContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/PongMessageEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/com/acme/websocket/PongSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java (99%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/alt-filter-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/basic-echo-endpoint-config-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/larger.png (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/larger.png.sha (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/largest.jpg (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/largest.jpg.sha (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/medium.png (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/medium.png.sha (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/small.png (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/data/small.png.sha (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/empty-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/idle-timeout-config-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/keystore (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/large-echo-config-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/logback-test.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/pong-config-web.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/quotes-ben.txt (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/quotes-twain.txt (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/simple/jetty-websocket-httpclient.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/wsuf-alt-config-via-listener.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/wsuf-config-via-listener.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/resources/wsuf-config-via-servlet-init.xml (100%) rename jetty-websocket/{javax-websocket-tests => websocket-javax-tests}/src/test/webapp/index.html (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/pom.xml (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/module-info.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/BatchMode.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/CloseStatus.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/Frame.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/Session.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/SuspendToken.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnectionListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConstants.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketFrameListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPartialListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPingPongListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WebSocketTimeoutException.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketClose.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketConnect.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketError.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketFrame.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketMessage.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/annotations/package-info.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/extensions/package-info.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/package-info.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java (100%) rename jetty-websocket/{jetty-websocket-api => websocket-jetty-api}/src/main/java/org/eclipse/jetty/websocket/api/util/package-info.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/pom.xml (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/module-info.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/JettyUpgradeListener.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/impl/JettyClientUpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/main/java/org/eclipse/jetty/websocket/client/package-info.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/examples/ClientDemo.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/examples/SimpleEchoClient.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/examples/SimpleEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientBadUriTest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java (100%) rename jetty-websocket/{jetty-websocket-client => websocket-jetty-client}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/pom.xml (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/module-info.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/AbstractMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/CompletableFutureCallback.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/FunctionCallException.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrame.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/MessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvalidSignatureException.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtils.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/ByteArrayMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/ByteBufferMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/CallbackBuffer.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/DispatchedMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/InputStreamMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/PartialBinaryMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/PartialTextMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/StringMessageSink.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/message/package-info.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/package-info.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/util/DuplicateAnnotationException.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/util/ReflectUtils.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/util/TextUtil.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/java/org/eclipse/jetty/websocket/common/util/Utf8CharBuffer.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.api.extensions.ExtensionConfig$Parser (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.common.reflect.ArgIdentifier (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/EventQueue.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/MessageWriterTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/TestableLeakTrackingBufferPool.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryArraySocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryStreamSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextStreamSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadBinarySignatureSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateBinarySocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateFrameSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadTextSignatureSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/FrameSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoBinarySocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyStatelessEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NoopSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NotASocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerBasicSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerFrameSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPartialSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPingPongSocket.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeResponse.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8CharBufferTest.java (100%) rename jetty-websocket/{jetty-websocket-common => websocket-jetty-common}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/pom.xml (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/module-info.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServletFactory.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/test/resources/browser-debug-tool/index.html (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/test/resources/browser-debug-tool/main.css (100%) rename jetty-websocket/{jetty-websocket-server => websocket-jetty-server}/src/test/resources/browser-debug-tool/websocket.js (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/fuzzingclient.json (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/fuzzingserver.json (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/pom.xml (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/AnnoMaxMessageEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/ConnectMessageEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/EchoCreator.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/GetAuthHeaderEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketServletTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/ParamsEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/SimpleStatusServlet.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/SuspendResumeTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStatsTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStopTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnSocket.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/InvalidUpgradeServlet.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/FastCloseEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/FastFailEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameAnnotationTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameListenerTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/java/org/eclipse/jetty/websocket/tests/util/WSURITest.java (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/resources/jetty-logging.properties (100%) rename jetty-websocket/{jetty-websocket-tests => websocket-jetty-tests}/src/test/resources/keystore.p12 (100%) diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index e4c5bbe58371..ef53e976f330 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -17,16 +17,16 @@ websocket-core websocket-servlet - jetty-websocket-api - jetty-websocket-common - jetty-websocket-client - jetty-websocket-server - jetty-websocket-tests + websocket-jetty-api + websocket-jetty-common + websocket-jetty-client + websocket-jetty-server + websocket-jetty-tests - javax-websocket-common - javax-websocket-client - javax-websocket-server - javax-websocket-tests + websocket-javax-common + websocket-javax-client + websocket-javax-server + websocket-javax-tests diff --git a/jetty-websocket/javax-websocket-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml similarity index 100% rename from jetty-websocket/javax-websocket-client/pom.xml rename to jetty-websocket/websocket-javax-client/pom.xml diff --git a/jetty-websocket/javax-websocket-client/src/main/java/module-info.java b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/module-info.java rename to jetty-websocket/websocket-javax-client/src/main/java/module-info.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeRequest.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeRequest.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeRequest.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeRequest.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeResponse.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeResponse.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeResponse.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedJavaxClientUpgradeResponse.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java rename to jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java diff --git a/jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider b/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider similarity index 100% rename from jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider rename to jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider diff --git a/jetty-websocket/javax-websocket-client/src/test/java/examples/EchoEndpoint.java b/jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/java/examples/EchoEndpoint.java rename to jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java diff --git a/jetty-websocket/javax-websocket-client/src/test/java/examples/OriginServerConfigurator.java b/jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/java/examples/OriginServerConfigurator.java rename to jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java diff --git a/jetty-websocket/javax-websocket-client/src/test/java/examples/SecureClientContainerExample.java b/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/java/examples/SecureClientContainerExample.java rename to jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java diff --git a/jetty-websocket/javax-websocket-client/src/test/java/examples/SecureWebSocketContainerExample.java b/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/java/examples/SecureWebSocketContainerExample.java rename to jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java diff --git a/jetty-websocket/javax-websocket-client/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/javax-websocket-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/javax-websocket-client/src/test/resources/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/javax-websocket-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml similarity index 100% rename from jetty-websocket/javax-websocket-common/pom.xml rename to jetty-websocket/websocket-javax-common/pom.xml diff --git a/jetty-websocket/javax-websocket-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/module-info.java rename to jetty-websocket/websocket-javax-common/src/main/java/module-info.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java rename to jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java b/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java rename to jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java diff --git a/jetty-websocket/javax-websocket-common/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/javax-websocket-common/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/resources/quotes-ben.txt rename to jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt diff --git a/jetty-websocket/javax-websocket-common/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt similarity index 100% rename from jetty-websocket/javax-websocket-common/src/test/resources/quotes-twain.txt rename to jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt diff --git a/jetty-websocket/javax-websocket-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml similarity index 100% rename from jetty-websocket/javax-websocket-server/pom.xml rename to jetty-websocket/websocket-javax-server/pom.xml diff --git a/jetty-websocket/javax-websocket-server/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/config/modules/websocket.mod rename to jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod diff --git a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/module-info.java rename to jetty-websocket/websocket-javax-server/src/main/java/module-info.java diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java similarity index 98% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java index 4a5ac1bb7e6a..613bd1f7ee64 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java @@ -29,7 +29,6 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.core.ExtensionConfig; /** * The "Container Default Configurator" per the JSR-356 spec. diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/DelegatedJavaxServletUpgradeRequest.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/DelegatedJavaxServletUpgradeRequest.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/DelegatedJavaxServletUpgradeRequest.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/DelegatedJavaxServletUpgradeRequest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java rename to jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer rename to jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator rename to jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration similarity index 100% rename from jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration rename to jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java b/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java rename to jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/index.html b/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/index.html rename to jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/main.css b/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/main.css rename to jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/websocket.js b/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js similarity index 100% rename from jetty-websocket/javax-websocket-server/src/test/resources/jsr-browser-debug-tool/websocket.js rename to jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js diff --git a/jetty-websocket/javax-websocket-tests/fuzzingclient.json b/jetty-websocket/websocket-javax-tests/fuzzingclient.json similarity index 100% rename from jetty-websocket/javax-websocket-tests/fuzzingclient.json rename to jetty-websocket/websocket-javax-tests/fuzzingclient.json diff --git a/jetty-websocket/javax-websocket-tests/fuzzingserver.json b/jetty-websocket/websocket-javax-tests/fuzzingserver.json similarity index 100% rename from jetty-websocket/javax-websocket-tests/fuzzingserver.json rename to jetty-websocket/websocket-javax-tests/fuzzingserver.json diff --git a/jetty-websocket/javax-websocket-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/pom.xml rename to jetty-websocket/websocket-javax-tests/pom.xml diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java rename to jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/com/acme/websocket/PongSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java index 62bbace21bde..8dd935eaba9d 100644 --- a/jetty-websocket/javax-websocket-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 @@ -28,7 +28,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; - import javax.websocket.ClientEndpointConfig; import javax.websocket.CloseReason; import javax.websocket.ContainerProvider; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/alt-filter-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/alt-filter-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/larger.png b/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/larger.png rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/larger.png.sha b/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/larger.png.sha rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/largest.jpg b/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/largest.jpg rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/largest.jpg.sha b/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/largest.jpg.sha rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/medium.png b/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/medium.png rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/medium.png.sha b/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/medium.png.sha rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/small.png b/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/small.png rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/data/small.png.sha b/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/data/small.png.sha rename to jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/empty-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/empty-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/keystore b/jetty-websocket/websocket-javax-tests/src/test/resources/keystore similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/keystore rename to jetty-websocket/websocket-javax-tests/src/test/resources/keystore diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/logback-test.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/logback-test.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/quotes-ben.txt rename to jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/quotes-twain.txt rename to jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/simple/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/wsuf-alt-config-via-listener.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/wsuf-config-via-listener.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/wsuf-config-via-listener.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml diff --git a/jetty-websocket/javax-websocket-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 similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/resources/wsuf-config-via-servlet-init.xml rename to jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml diff --git a/jetty-websocket/javax-websocket-tests/src/test/webapp/index.html b/jetty-websocket/websocket-javax-tests/src/test/webapp/index.html similarity index 100% rename from jetty-websocket/javax-websocket-tests/src/test/webapp/index.html rename to jetty-websocket/websocket-javax-tests/src/test/webapp/index.html diff --git a/jetty-websocket/jetty-websocket-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml similarity index 100% rename from jetty-websocket/jetty-websocket-api/pom.xml rename to jetty-websocket/websocket-jetty-api/pom.xml diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/module-info.java rename to jetty-websocket/websocket-jetty-api/src/main/java/module-info.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/BatchMode.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/BatchMode.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/BatchMode.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/BatchMode.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/CloseStatus.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/CloseStatus.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/CloseStatus.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/CloseStatus.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Frame.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/Frame.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Frame.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/Frame.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/SuspendToken.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/SuspendToken.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/SuspendToken.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/SuspendToken.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnectionListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnectionListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnectionListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnectionListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConstants.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConstants.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConstants.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConstants.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketFrameListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketFrameListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketFrameListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketFrameListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPartialListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPartialListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPartialListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPartialListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPingPongListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPingPongListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPingPongListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPingPongListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketTimeoutException.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketTimeoutException.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketTimeoutException.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketTimeoutException.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketClose.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketClose.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketClose.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketClose.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketConnect.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketConnect.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketConnect.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketConnect.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketError.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketError.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketError.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketError.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketFrame.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketFrame.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketFrame.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketFrame.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketMessage.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketMessage.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketMessage.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/OnWebSocketMessage.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/WebSocket.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/package-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/package-info.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/annotations/package-info.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/package-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/package-info.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/package-info.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/package-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/package-info.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/package-info.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java diff --git a/jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/package-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/util/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/package-info.java rename to jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/util/package-info.java diff --git a/jetty-websocket/jetty-websocket-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml similarity index 100% rename from jetty-websocket/jetty-websocket-client/pom.xml rename to jetty-websocket/websocket-jetty-client/pom.xml diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/module-info.java rename to jetty-websocket/websocket-jetty-client/src/main/java/module-info.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/JettyUpgradeListener.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/JettyUpgradeListener.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/JettyUpgradeListener.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/JettyUpgradeListener.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/impl/JettyClientUpgradeRequest.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/JettyClientUpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/impl/JettyClientUpgradeRequest.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/JettyClientUpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/package-info.java b/jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/main/java/org/eclipse/jetty/websocket/client/package-info.java rename to jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/package-info.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/examples/ClientDemo.java b/jetty-websocket/websocket-jetty-client/src/test/java/examples/ClientDemo.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/examples/ClientDemo.java rename to jetty-websocket/websocket-jetty-client/src/test/java/examples/ClientDemo.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoClient.java b/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoClient.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoClient.java rename to jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoClient.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoSocket.java b/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoSocket.java rename to jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java b/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java rename to jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientBadUriTest.java b/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientBadUriTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientBadUriTest.java rename to jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientBadUriTest.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java b/jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java rename to jetty-websocket/websocket-jetty-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java diff --git a/jetty-websocket/jetty-websocket-client/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jetty-client/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/jetty-websocket-client/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jetty-client/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/jetty-websocket-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml similarity index 100% rename from jetty-websocket/jetty-websocket-common/pom.xml rename to jetty-websocket/websocket-jetty-common/pom.xml diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/module-info.java rename to jetty-websocket/websocket-jetty-common/src/main/java/module-info.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/AbstractMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/AbstractMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/AbstractMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/AbstractMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/CompletableFutureCallback.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/CompletableFutureCallback.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/CompletableFutureCallback.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/CompletableFutureCallback.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/FunctionCallException.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/FunctionCallException.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/FunctionCallException.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/FunctionCallException.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrame.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrame.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrame.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrame.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerFactory.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerMetadata.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketRemoteEndpoint.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/MessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/MessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/MessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/MessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketContainer.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvalidSignatureException.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvalidSignatureException.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvalidSignatureException.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvalidSignatureException.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtils.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtils.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtils.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtils.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteArrayMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteArrayMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteArrayMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteArrayMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteBufferMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteBufferMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteBufferMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ByteBufferMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/CallbackBuffer.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/CallbackBuffer.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/CallbackBuffer.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/CallbackBuffer.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/DispatchedMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/DispatchedMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/DispatchedMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/DispatchedMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/InputStreamMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/InputStreamMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/InputStreamMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/InputStreamMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageOutputStream.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageReader.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageWriter.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialBinaryMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialBinaryMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialBinaryMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialBinaryMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialTextMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialTextMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialTextMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/PartialTextMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/StringMessageSink.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/StringMessageSink.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/StringMessageSink.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/StringMessageSink.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/package-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/package-info.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/message/package-info.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/package-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/package-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/package-info.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/package-info.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/DuplicateAnnotationException.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/DuplicateAnnotationException.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/DuplicateAnnotationException.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/DuplicateAnnotationException.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/ReflectUtils.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/ReflectUtils.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/ReflectUtils.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/ReflectUtils.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/TextUtil.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/TextUtil.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/TextUtil.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/TextUtil.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/Utf8CharBuffer.java b/jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/Utf8CharBuffer.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/util/Utf8CharBuffer.java rename to jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/util/Utf8CharBuffer.java diff --git a/jetty-websocket/jetty-websocket-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.api.extensions.ExtensionConfig$Parser b/jetty-websocket/websocket-jetty-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.api.extensions.ExtensionConfig$Parser similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.api.extensions.ExtensionConfig$Parser rename to jetty-websocket/websocket-jetty-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.api.extensions.ExtensionConfig$Parser diff --git a/jetty-websocket/jetty-websocket-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.common.reflect.ArgIdentifier b/jetty-websocket/websocket-jetty-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.common.reflect.ArgIdentifier similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.common.reflect.ArgIdentifier rename to jetty-websocket/websocket-jetty-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.common.reflect.ArgIdentifier diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/DummyContainer.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/EventQueue.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EventQueue.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/EventQueue.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/EventQueue.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandlerTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/LocalEndpointMetadataTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageInputStreamTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageOutputStreamTest.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/MessageWriterTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageWriterTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/MessageWriterTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/MessageWriterTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/OutgoingMessageCapture.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TestableLeakTrackingBufferPool.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/TestableLeakTrackingBufferPool.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TestableLeakTrackingBufferPool.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/TestableLeakTrackingBufferPool.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryArraySocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryArraySocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryArraySocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryArraySocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryStreamSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryStreamSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryStreamSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedBinaryStreamSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextStreamSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextStreamSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextStreamSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/AnnotatedTextStreamSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadBinarySignatureSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadBinarySignatureSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadBinarySignatureSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadBinarySignatureSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateBinarySocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateBinarySocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateBinarySocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateBinarySocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateFrameSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateFrameSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateFrameSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadDuplicateFrameSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadTextSignatureSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadTextSignatureSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadTextSignatureSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/BadTextSignatureSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/FrameSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/FrameSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/FrameSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/FrameSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoBinarySocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoBinarySocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoBinarySocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoBinarySocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyStatelessEchoSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyStatelessEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyStatelessEchoSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/MyStatelessEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NoopSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NoopSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NoopSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NoopSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NotASocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NotASocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NotASocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/annotated/NotASocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerBasicSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerBasicSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerBasicSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerBasicSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerFrameSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerFrameSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerFrameSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerFrameSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPartialSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPartialSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPartialSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPartialSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPingPongSocket.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPingPongSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPingPongSocket.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/listeners/ListenerPingPongSocket.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeRequest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeRequest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeResponse.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeResponse.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeResponse.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/handshake/DummyUpgradeResponse.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/InvokerUtilsTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/invoke/NameParamIdentifier.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8CharBufferTest.java b/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8CharBufferTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8CharBufferTest.java rename to jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8CharBufferTest.java diff --git a/jetty-websocket/jetty-websocket-common/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jetty-common/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/jetty-websocket-common/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jetty-common/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/jetty-websocket-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml similarity index 100% rename from jetty-websocket/jetty-websocket-server/pom.xml rename to jetty-websocket/websocket-jetty-server/pom.xml diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/module-info.java rename to jetty-websocket/websocket-jetty-server/src/main/java/module-info.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServletFactory.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServletFactory.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServletFactory.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServletFactory.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java rename to jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java diff --git a/jetty-websocket/jetty-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-jetty-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer rename to jetty-websocket/websocket-jetty-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer diff --git a/jetty-websocket/jetty-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-jetty-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration rename to jetty-websocket/websocket-jetty-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration diff --git a/jetty-websocket/jetty-websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java rename to jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java diff --git a/jetty-websocket/jetty-websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java b/jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java rename to jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java diff --git a/jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/index.html b/jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/index.html similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/index.html rename to jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/index.html diff --git a/jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/main.css b/jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/main.css similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/main.css rename to jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/main.css diff --git a/jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/websocket.js b/jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/websocket.js similarity index 100% rename from jetty-websocket/jetty-websocket-server/src/test/resources/browser-debug-tool/websocket.js rename to jetty-websocket/websocket-jetty-server/src/test/resources/browser-debug-tool/websocket.js diff --git a/jetty-websocket/jetty-websocket-tests/fuzzingclient.json b/jetty-websocket/websocket-jetty-tests/fuzzingclient.json similarity index 100% rename from jetty-websocket/jetty-websocket-tests/fuzzingclient.json rename to jetty-websocket/websocket-jetty-tests/fuzzingclient.json diff --git a/jetty-websocket/jetty-websocket-tests/fuzzingserver.json b/jetty-websocket/websocket-jetty-tests/fuzzingserver.json similarity index 100% rename from jetty-websocket/jetty-websocket-tests/fuzzingserver.json rename to jetty-websocket/websocket-jetty-tests/fuzzingserver.json diff --git a/jetty-websocket/jetty-websocket-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml similarity index 100% rename from jetty-websocket/jetty-websocket-tests/pom.xml rename to jetty-websocket/websocket-jetty-tests/pom.xml diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/AnnoMaxMessageEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/AnnoMaxMessageEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/AnnoMaxMessageEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/AnnoMaxMessageEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConnectMessageEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConnectMessageEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConnectMessageEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConnectMessageEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoCreator.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoCreator.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoCreator.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoCreator.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EchoSocket.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/GetAuthHeaderEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/GetAuthHeaderEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/GetAuthHeaderEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/GetAuthHeaderEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketFilterTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketNegotiationTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketServletTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketServletTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketServletTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketServletTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ParamsEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ParamsEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ParamsEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ParamsEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/SimpleStatusServlet.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/SimpleStatusServlet.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/SimpleStatusServlet.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/SimpleStatusServlet.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/SuspendResumeTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/SuspendResumeTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/SuspendResumeTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/SuspendResumeTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStatsTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStatsTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStatsTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStatsTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStopTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStopTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStopTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketStopTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnSocket.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnSocket.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/InvalidUpgradeServlet.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/InvalidUpgradeServlet.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/InvalidUpgradeServlet.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/InvalidUpgradeServlet.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/AbstractCloseEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastCloseEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastCloseEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastCloseEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastCloseEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastFailEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastFailEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastFailEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FastFailEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameAnnotationTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameAnnotationTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameAnnotationTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameAnnotationTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameListenerTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameListenerTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameListenerTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/FrameListenerTest.java diff --git a/jetty-websocket/jetty-websocket-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 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerEndpoint.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/FutureWriteCallback.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/WSURITest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/WSURITest.java similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/WSURITest.java rename to jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/util/WSURITest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jetty-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jetty-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/jetty-websocket-tests/src/test/resources/keystore.p12 b/jetty-websocket/websocket-jetty-tests/src/test/resources/keystore.p12 similarity index 100% rename from jetty-websocket/jetty-websocket-tests/src/test/resources/keystore.p12 rename to jetty-websocket/websocket-jetty-tests/src/test/resources/keystore.p12 From 78c57131ae1d4efd4db5eccd09ad954a00768e75 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 20 Dec 2019 16:21:34 +1100 Subject: [PATCH 2/3] update values for bundle-symbolic-name Signed-off-by: Lachlan Roberts --- .../osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java | 6 +++--- jetty-websocket/websocket-javax-client/pom.xml | 2 +- jetty-websocket/websocket-javax-common/pom.xml | 2 +- jetty-websocket/websocket-javax-server/pom.xml | 2 +- jetty-websocket/websocket-javax-tests/pom.xml | 2 +- jetty-websocket/websocket-jetty-client/pom.xml | 2 +- jetty-websocket/websocket-jetty-tests/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java index 07741e557e7c..600fc6ec3dd0 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java @@ -107,9 +107,9 @@ public void assertAllBundlesActiveOrResolved() @Test public void testWebsocket() throws Exception { - startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.common"); - startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.client"); - startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.server"); + startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.common"); + startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.client"); + startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.server"); startBundle(bundleContext, "org.eclipse.jetty.tests.webapp"); if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG)) diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index bdbaea8cb23c..10d6d3f35ba3 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: javax.websocket :: Client Implementation - ${project.groupId}.javax.websocket.client + ${project.groupId}.javax.client diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 9fd8f573acd3..1323269d215e 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: javax.websocket :: Common Impl - ${project.groupId}.javax.websocket.common + ${project.groupId}.javax.common diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index c4d3ee0e98d8..8339f1691fbe 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: javax.websocket.server :: Server Implementation - ${project.groupId}.javax.websocket.server + ${project.groupId}.javax.server diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 0976122edeed..f0b7ddee4ede 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: javax.websocket :: Integration Tests - ${project.groupId}.javax.websocket.tests + ${project.groupId}.javax.tests diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index caeae04bc804..b11a303cfd64 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: org.eclipse.jetty.websocket :: Client - ${project.groupId}.client.api + ${project.groupId}.client diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 99eca30543a6..8e16786add24 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -11,7 +11,7 @@ Jetty :: Websocket :: org.eclipse.jetty.websocket :: Tests - ${project.groupId}.jetty.websocket.tests + ${project.groupId}.tests From db0edf23de7d9bd308bcbf1879a509bbbcb01b49 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 23 Dec 2019 13:32:21 +1100 Subject: [PATCH 3/3] Update websocket artifact IDs Signed-off-by: Lachlan Roberts --- aggregates/jetty-all/pom.xml | 4 ++-- aggregates/jetty-websocket-all/pom.xml | 2 +- examples/embedded/pom.xml | 6 +++--- jetty-bom/pom.xml | 14 +++++++------- .../startup/startup-base-vs-home.adoc | 4 ++-- .../startup/startup-classpath.adoc | 4 ++-- .../server/websockets/jetty/chapter.adoc | 18 +++++++++--------- .../jetty/jetty-websocket-api-adapter.adoc | 4 ++-- .../jetty/jetty-websocket-api-annotations.adoc | 4 ++-- .../jetty/jetty-websocket-api-events.adoc | 2 +- .../jetty/jetty-websocket-api-listener.adoc | 4 ++-- .../jetty-websocket-api-send-message.adoc | 2 +- .../jetty/jetty-websocket-api-session.adoc | 2 +- .../websockets/jetty/jetty-websocket-api.adoc | 2 +- .../jetty/jetty-websocket-client-api.adoc | 6 +++--- .../jetty/jetty-websocket-server-api.adoc | 8 ++++---- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-home/pom.xml | 4 ++-- jetty-maven-plugin/pom.xml | 4 ++-- jetty-osgi/test-jetty-osgi/pom.xml | 12 ++++++------ .../eclipse/jetty/osgi/test/TestOSGiUtil.java | 15 +++++++-------- jetty-runner/pom.xml | 2 +- jetty-websocket/websocket-core/pom.xml | 2 +- jetty-websocket/websocket-javax-client/pom.xml | 6 +++--- jetty-websocket/websocket-javax-common/pom.xml | 4 ++-- jetty-websocket/websocket-javax-server/pom.xml | 6 +++--- jetty-websocket/websocket-javax-tests/pom.xml | 8 ++++---- .../tests/autobahn/JavaxAutobahnClient.java | 4 ++-- .../tests/autobahn/JavaxAutobahnServer.java | 4 ++-- jetty-websocket/websocket-jetty-api/pom.xml | 2 +- jetty-websocket/websocket-jetty-client/pom.xml | 6 +++--- jetty-websocket/websocket-jetty-common/pom.xml | 4 ++-- jetty-websocket/websocket-jetty-server/pom.xml | 6 +++--- jetty-websocket/websocket-jetty-tests/pom.xml | 8 ++++---- .../tests/autobahn/JettyAutobahnClient.java | 4 ++-- .../tests/autobahn/JettyAutobahnServer.java | 4 ++-- jetty-websocket/websocket-servlet/pom.xml | 4 ++-- tests/test-integration/pom.xml | 6 +++--- tests/test-quickstart/pom.xml | 4 ++-- tests/test-webapps/test-jetty-webapp/pom.xml | 6 +++--- 41 files changed, 107 insertions(+), 108 deletions(-) diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index dd6db29871e2..6e60cc36d63d 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -183,12 +183,12 @@ org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} org.eclipse.jetty.websocket - jetty-websocket-client + websocket-jetty-client ${project.version} diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index df9eb5f59b5d..fec0ba1be952 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -113,7 +113,7 @@ org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} provided diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index cd11566a15b9..04785ddabf4f 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} @@ -62,7 +62,7 @@ org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} @@ -136,7 +136,7 @@ org.eclipse.jetty.websocket - jetty-websocket-client + websocket-jetty-client ${project.version} test diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index fcdf3fe7d3de..4b073072d345 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -341,37 +341,37 @@ org.eclipse.jetty.websocket - javax-websocket-client + websocket-javax-client 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - javax-websocket-common + websocket-javax-common 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - jetty-websocket-api + websocket-jetty-api 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - jetty-websocket-client + websocket-jetty-client 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - jetty-websocket-common + websocket-jetty-common 10.0.0-SNAPSHOT org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server 10.0.0-SNAPSHOT diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc index 13763bd37321..8f145d714a68 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc @@ -189,8 +189,8 @@ Note: order presented here is how they would appear on the classpath. 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar 34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar -35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar -36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar +35: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar +36: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc index 5bfa599f6faa..adb889b30184 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc @@ -98,8 +98,8 @@ Note: order presented here is how they would appear on the classpath. 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar 34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar -35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar -36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar +35: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar +36: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc index 177c3564d372..3258ad272348 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc @@ -21,12 +21,12 @@ These pages are works in progress that have not been moved to their respective sections yet. -include::jetty-websocket-api.adoc[] -include::jetty-websocket-api-events.adoc[] -include::jetty-websocket-api-session.adoc[] -include::jetty-websocket-api-send-message.adoc[] -include::jetty-websocket-api-annotations.adoc[] -include::jetty-websocket-api-listener.adoc[] -include::jetty-websocket-api-adapter.adoc[] -include::jetty-websocket-server-api.adoc[] -include::jetty-websocket-client-api.adoc[] +include::websocket-jetty-api.adoc[] +include::websocket-jetty-api-events.adoc[] +include::websocket-jetty-api-session.adoc[] +include::websocket-jetty-api-send-message.adoc[] +include::websocket-jetty-api-annotations.adoc[] +include::websocket-jetty-api-listener.adoc[] +include::websocket-jetty-api-adapter.adoc[] +include::websocket-jetty-server-api.adoc[] +include::websocket-jetty-client-api.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc index 369ac5d74308..a9e0dce3dcb4 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc @@ -16,14 +16,14 @@ // ======================================================================== // -[[jetty-websocket-api-adapter]] +[[websocket-jetty-api-adapter]] === Using the WebSocketAdapter A basic adapter for managing the Session object on the WebSocketListener. [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java[] ---- This is a convenience class to make using the WebSocketListener easier, and provides some useful methods to check the state of the Session. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc index 752044d871be..b23889af8cae 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-api-annotations]] +[[websocket-jetty-api-annotations]] === Using WebSocket Annotations The most basic form of WebSocket is a marked up POJO with annotations @@ -24,7 +24,7 @@ provided by the Jetty WebSocket API. [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java[] ---- The above example is a simple WebSocket echo endpoint that will echo back any TEXT messages it receives. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc index 0352059229bb..fbc4f94658db 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-api-events]] +[[websocket-jetty-api-events]] === WebSocket Events Every WebSocket can receive various events: diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc index e2ebc802a2f0..34a6bc4bbde1 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc @@ -16,14 +16,14 @@ // ======================================================================== // -[[jetty-websocket-api-listener]] +[[websocket-jetty-api-listener]] === Using WebSocketListener The basic form of a WebSocket using the link:{JDURL}/org/eclipse/jetty/websocket/api/WebSocketListener.html[`org.eclipse.jetty.websocket.api.WebSocketListener`] for incoming events. [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java[] ---- This is by far the most basic and best performing (speed and memory wise) WebSocket implementation you can create. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc index bccad70f3a3a..27314a8eb64c 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-api-send-message]] +[[websocket-jetty-api-send-message]] === Send Messages to Remote Endpoint The most important feature of the Session is access to the link:{JDURL}/org/eclipse/jetty/websocket/api/RemoteEndpoint.html[`org.eclipse.jetty.websocket.api.RemoteEndpoint`] needed to send messages. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc index 13f96ef9c721..869f6ae0038e 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-api-session]] +[[websocket-jetty-api-session]] === WebSocket Session The link:{JDURL}/org/eclipse/jetty/websocket/api/Session.html[Session] object can be used to: diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc index 861d11a96dcd..15006069c3f9 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-api]] +[[websocket-jetty-api]] === Jetty WebSocket API Usage Jetty provides its own more powerful WebSocket API, with a common core API for both server and client use of WebSockets. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc index 1be100478cf2..34cb3fb8d1c2 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-client-api]] +[[websocket-jetty-client-api]] === Jetty WebSocket Client API Jetty also provides a Jetty WebSocket Client Library to write make talking to WebSocket servers easier. @@ -38,14 +38,14 @@ To use the WebSocketClient you will need to hook up a WebSocket object instance [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoClient.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoClient.java[] ---- The above example connects to a remote WebSocket server and hands off a SimpleEchoSocket to perform the logic on the websocket once connected, waiting for the socket to register that it has closed. [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoSocket.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoSocket.java[] ---- When the SimpleEchoSocket connects, it sends 2 Text messages and then closes the socket. diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc index acc99bd7a549..8b11e9557109 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc @@ -16,7 +16,7 @@ // ======================================================================== // -[[jetty-websocket-server-api]] +[[websocket-jetty-server-api]] === Jetty WebSocket Server API Jetty provides the ability to wire up WebSocket endpoints to Servlet Path Specs via the use of a `JettyWebSocketServlet` bridge servlet. @@ -31,7 +31,7 @@ To wire up your WebSocket to a specific path via the `JettyWebSocketServlet`, yo [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java[] ---- This example will create a Servlet mapped via the http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/WebServlet.html[@WebServlet] annotation to the Servlet path spec of `"/echo"` (or you can do this manually in the `WEB-INF/web.xml` of your web application) which will create MyEchoSocket instances when encountering HTTP Upgrade requests. @@ -57,7 +57,7 @@ If you have a more complicated creation scenario, you might want to provide your [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java[] ---- Here we show a `JettyWebSocketCreator` that will utilize the http://tools.ietf.org/html/rfc6455#section-1.9[WebSocket subprotocol] information from request to determine what WebSocket type should be @@ -65,7 +65,7 @@ created. [source, java, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java[] +include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java[] ---- When you want a custom `JettyWebSocketCreator`, use link:{JDURL}/org/eclipse/jetty/websocket/servlet/JettyWebSocketServletFactory.html#setCreator(org.eclipse.jetty.websocket.servlet.JettyWebSocketCreator)[`JettyWebSocketServletFactory.setCreator(JettyWebSocketCreator creator)`] and the `JettyWebSocketServletFactory` will use your creator for all incoming Upgrade requests on this servlet. diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 4e2c291d2b70..b4e02b8e0725 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -71,7 +71,7 @@ org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} test diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 5ed593439491..40b33f9657af 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -58,7 +58,7 @@ org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} test diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 08acbaa9a8b9..85c5da337716 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -636,12 +636,12 @@ org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 515eb74cfe98..1b1c0c0f06b2 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -218,12 +218,12 @@ org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4dd970f92ddc..d9ea34535450 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -280,25 +280,25 @@ org.eclipse.jetty.websocket - jetty-websocket-api + websocket-jetty-api ${project.version} runtime org.eclipse.jetty.websocket - jetty-websocket-common + websocket-jetty-common ${project.version} runtime org.eclipse.jetty.websocket - jetty-websocket-client + websocket-jetty-client ${project.version} runtime org.eclipse.jetty.websocket - javax-websocket-client + websocket-javax-client ${project.version} runtime @@ -310,7 +310,7 @@ org.eclipse.jetty.websocket - jetty-websocket-server + websocket-jetty-server ${project.version} runtime @@ -321,7 +321,7 @@ org.eclipse.jetty.websocket - javax-websocket-server + websocket-javax-server ${project.version} runtime 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 0652508ffbb2..f53ef2d475e2 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -148,15 +147,15 @@ public static List