From e8ba0309042306cb5117a65f93b791d0462110b5 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Thu, 29 Nov 2018 17:28:48 +0100 Subject: [PATCH] Issue #3129 - refactor of javax websocket package names Signed-off-by: Lachlan Roberts --- .../jetty/embedded/WebSocketJsrServer.java | 2 +- .../jetty-osgi-boot/jettyhome/etc/jetty.xml | 2 +- .../config/etc/jetty-with-custom-class.xml | 2 +- .../src/test/config/etc/jetty.xml | 2 +- .../src/main/java/module-info.java | 4 +- .../client/AnnotatedClientEndpointConfig.java | 4 +- .../client/ClientUpgradeRequestImpl.java | 8 +- .../client/DelegatedClientUpgradeRequest.java | 4 +- .../DelegatedClientUpgradeResponse.java | 4 +- .../client/EmptyClientEndpointConfig.java | 2 +- .../client/EmptyConfigurator.java | 2 +- .../client/JavaxWebSocketClientContainer.java | 12 +- ...JavaxWebSocketClientContainerProvider.java | 2 +- ...vaxWebSocketClientFrameHandlerFactory.java | 10 +- .../client/JsrUpgradeListener.java | 2 +- .../javax.websocket.ContainerProvider | 2 +- .../src/main/java/module-info.java | 10 +- .../common}/BasicEndpointConfig.java | 2 +- .../common}/CompletableFutureCallback.java | 2 +- .../common}/ConfiguredEndpoint.java | 2 +- .../common}/DuplicateCoderException.java | 2 +- .../common}/InitException.java | 2 +- .../common}/InvalidWebSocketException.java | 2 +- .../common}/JavaxWebSocketAsyncRemote.java | 8 +- .../common}/JavaxWebSocketBasicRemote.java | 4 +- .../common}/JavaxWebSocketContainer.java | 2 +- .../common}/JavaxWebSocketExtension.java | 2 +- .../JavaxWebSocketExtensionConfig.java | 2 +- .../common}/JavaxWebSocketFrameHandler.java | 46 +++--- .../JavaxWebSocketFrameHandlerFactory.java | 131 +++++++++--------- .../JavaxWebSocketFrameHandlerMetadata.java | 6 +- .../common}/JavaxWebSocketPongMessage.java | 2 +- .../common}/JavaxWebSocketRemoteEndpoint.java | 6 +- .../common}/JavaxWebSocketSession.java | 9 +- .../common}/JavaxWebSocketUpgradeRequest.java | 2 +- .../JavaxWebSocketUpgradeResponse.java | 2 +- .../{jsr356 => javax/common}/MessageSink.java | 2 +- .../common}/PathParamProvider.java | 4 +- .../common}/RegisteredMessageHandler.java | 2 +- .../common}/SendHandlerCallback.java | 2 +- .../common}/UpgradeRequest.java | 2 +- .../common}/UpgradeRequestAdapter.java | 2 +- .../common}/UpgradeResponse.java | 2 +- .../common}/UpgradeResponseAdapter.java | 2 +- .../common}/decoders/AbstractDecoder.java | 2 +- .../common}/decoders/AvailableDecoders.java | 10 +- .../common}/decoders/BooleanDecoder.java | 2 +- .../common}/decoders/ByteArrayDecoder.java | 2 +- .../common}/decoders/ByteBufferDecoder.java | 2 +- .../common}/decoders/ByteDecoder.java | 2 +- .../common}/decoders/CharacterDecoder.java | 2 +- .../common}/decoders/DoubleDecoder.java | 2 +- .../common}/decoders/FloatDecoder.java | 2 +- .../common}/decoders/InputStreamDecoder.java | 2 +- .../common}/decoders/IntegerDecoder.java | 2 +- .../common}/decoders/LongDecoder.java | 2 +- .../common}/decoders/PongMessageDecoder.java | 2 +- .../common}/decoders/ReaderDecoder.java | 2 +- .../common}/decoders/ShortDecoder.java | 2 +- .../common}/decoders/StringDecoder.java | 2 +- .../common}/encoders/AbstractEncoder.java | 2 +- .../common}/encoders/AvailableEncoders.java | 10 +- .../common}/encoders/BooleanEncoder.java | 2 +- .../common}/encoders/ByteArrayEncoder.java | 2 +- .../common}/encoders/ByteBufferEncoder.java | 2 +- .../common}/encoders/ByteEncoder.java | 2 +- .../common}/encoders/CharacterEncoder.java | 2 +- .../common}/encoders/DoubleEncoder.java | 2 +- .../common}/encoders/EncodeFailedFuture.java | 2 +- .../common}/encoders/FloatEncoder.java | 2 +- .../common}/encoders/IntegerEncoder.java | 2 +- .../common}/encoders/LongEncoder.java | 2 +- .../common}/encoders/ShortEncoder.java | 2 +- .../common}/encoders/StringEncoder.java | 2 +- .../common}/messages/AbstractMessageSink.java | 6 +- .../messages/ByteArrayMessageSink.java | 6 +- .../messages/ByteBufferMessageSink.java | 4 +- .../common}/messages/CallbackBuffer.java | 2 +- .../messages/DecodedBinaryMessageSink.java | 6 +- .../DecodedBinaryStreamMessageSink.java | 6 +- .../common}/messages/DecodedMessageSink.java | 6 +- .../messages/DecodedTextMessageSink.java | 6 +- .../DecodedTextStreamMessageSink.java | 6 +- .../messages/DispatchedMessageSink.java | 6 +- .../messages/InputStreamMessageSink.java | 6 +- .../common}/messages/MessageInputStream.java | 4 +- .../common}/messages/MessageOutputStream.java | 2 +- .../common}/messages/MessageReader.java | 4 +- .../common}/messages/MessageWriter.java | 2 +- .../messages/PartialByteArrayMessageSink.java | 6 +- .../PartialByteBufferMessageSink.java | 4 +- .../messages/PartialStringMessageSink.java | 4 +- .../common}/messages/ReaderMessageSink.java | 4 +- .../common}/messages/StringMessageSink.java | 4 +- .../util/DuplicateAnnotationException.java | 4 +- .../util/InvalidSignatureException.java | 4 +- .../common}/util/InvokerUtils.java | 2 +- .../common}/util/ReflectUtils.java | 4 +- .../common}/util/TextUtil.java | 2 +- ...bstractJavaxWebSocketFrameHandlerTest.java | 6 +- .../common}/AbstractSessionTest.java | 2 +- .../{jsr356 => javax/common}/Defaults.java | 2 +- .../common}/DummyContainer.java | 2 +- .../common}/DummyFrameHandlerFactory.java | 4 +- ...bSocketFrameHandler_BadSignaturesTest.java | 4 +- ...avaxWebSocketFrameHandler_OnCloseTest.java | 4 +- ...avaxWebSocketFrameHandler_OnErrorTest.java | 4 +- ...ameHandler_OnMessage_BinaryStreamTest.java | 4 +- ...cketFrameHandler_OnMessage_BinaryTest.java | 6 +- ...FrameHandler_OnMessage_TextStreamTest.java | 4 +- ...SocketFrameHandler_OnMessage_TextTest.java | 6 +- ...JavaxWebSocketFrameHandler_OnOpenTest.java | 4 +- .../common}/coders/tests/BadDualDecoder.java | 2 +- .../common}/coders/tests/BadDualEncoder.java | 2 +- .../common}/coders/tests/ExtDecoder.java | 2 +- .../common}/coders/tests/Fruit.java | 2 +- .../coders/tests/FruitBinaryEncoder.java | 2 +- .../common/coders/tests}/FruitDecoder.java | 2 +- .../coders/tests/FruitTextEncoder.java | 2 +- .../endpoints/AbstractStringEndpoint.java | 4 +- .../common}/endpoints/DummyEndpoint.java | 2 +- .../common}/endpoints/EchoStringEndpoint.java | 2 +- .../common}/handlers/BaseMessageHandler.java | 2 +- .../handlers/ByteArrayPartialHandler.java | 2 +- .../handlers/ByteArrayWholeHandler.java | 2 +- .../handlers/ByteBufferPartialHandler.java | 2 +- .../handlers/ByteBufferWholeHandler.java | 2 +- .../common}/handlers/ComboMessageHandler.java | 2 +- .../handlers/ExtendedMessageHandler.java | 2 +- .../handlers/InputStreamWholeHandler.java | 2 +- .../common}/handlers/LongMessageHandler.java | 2 +- .../common}/handlers/ReaderWholeHandler.java | 2 +- .../handlers/StringPartialHandler.java | 2 +- .../common}/handlers/StringWholeHandler.java | 2 +- .../messages/AbstractMessageSinkTest.java | 4 +- .../DecodedBinaryMessageSinkTest.java | 9 +- .../DecodedBinaryStreamMessageSinkTest.java | 4 +- .../messages/DecodedTextMessageSinkTest.java | 4 +- .../DecodedTextStreamMessageSinkTest.java | 4 +- .../messages/InputStreamMessageSinkTest.java | 13 +- .../common}/messages/MessageWriterTest.java | 2 +- .../messages/ReaderMessageSinkTest.java | 4 +- .../common}/sockets/TrackingSocket.java | 2 +- .../common}/util/InvokerUtilsTest.java | 2 +- .../util/InvokerUtils_StaticParamsTest.java | 6 +- .../common}/util/NameParamIdentifier.java | 2 +- .../common}/util/ReflectUtilsTest.java | 2 +- .../src/main/java/module-info.java | 8 +- .../server/ContainerDefaultConfigurator.java | 2 +- .../server/JavaxWebSocketConfiguration.java | 2 +- .../server/JavaxWebSocketServerContainer.java | 12 +- ...axWebSocketServerContainerInitializer.java | 2 +- ...vaxWebSocketServerFrameHandlerFactory.java | 14 +- .../AnnotatedServerEndpointConfig.java | 6 +- .../internal/JavaxWebSocketCreator.java | 8 +- .../server/internal/JsrHandshakeRequest.java | 2 +- .../server/internal/JsrHandshakeResponse.java | 2 +- .../server/internal/PathParamIdentifier.java | 4 +- .../PathParamServerEndpointConfig.java | 4 +- .../internal/ServerEndpointConfigWrapper.java | 2 +- .../UndefinedServerEndpointConfig.java | 4 +- .../internal/UpgradeRequestAdapter.java | 4 +- .../internal/UpgradeResponseAdapter.java | 4 +- .../javax.servlet.ServletContainerInitializer | 2 +- ...t.server.ServerEndpointConfig$Configurator | 2 +- .../org.eclipse.jetty.webapp.Configuration | 2 +- .../java/examples/JsrBrowserDebugTool.java | 4 +- .../server/DummyServerContainer.java | 2 +- .../server/PathParamTest.java | 2 +- .../{jsr356 => javax}/tests/BadFrame.java | 2 +- .../tests/BiConsumerServiceServlet.java | 2 +- .../tests/CompletableFutureMethodHandle.java | 6 +- .../{jsr356 => javax}/tests/CoreServer.java | 6 +- .../{jsr356 => javax}/tests/DataUtils.java | 2 +- .../tests/DummyEndpoint.java | 2 +- .../tests/FunctionMethod.java | 2 +- .../{jsr356 => javax}/tests/Fuzzer.java | 2 +- .../{jsr356 => javax}/tests/LocalFuzzer.java | 2 +- .../{jsr356 => javax}/tests/LocalServer.java | 4 +- .../{jsr356 => javax}/tests/MessageType.java | 2 +- .../tests/NetworkFuzzer.java | 2 +- .../tests/ParserCapture.java | 2 +- .../tests/RawFrameBuilder.java | 2 +- .../tests/SessionMatchers.java | 8 +- .../{jsr356 => javax}/tests/Sha1Sum.java | 2 +- .../{jsr356 => javax}/tests/Timeouts.java | 2 +- .../tests/UnitGenerator.java | 2 +- .../{jsr356 => javax}/tests/UpgradeUtils.java | 2 +- .../tests/WSEndpointTracker.java | 2 +- .../tests/WSEventTracker.java | 2 +- .../{jsr356 => javax}/tests/WSServer.java | 4 +- .../{jsr356 => javax}/tests/WSURI.java | 2 +- .../tests/framehandlers/FrameEcho.java | 2 +- .../framehandlers/FrameHandlerTracker.java | 2 +- .../tests/framehandlers/StaticText.java | 2 +- .../tests/framehandlers/WholeMessageEcho.java | 2 +- .../tests/matchers/IsMessageHandlerType.java | 10 +- .../IsMessageHandlerTypeRegistered.java | 10 +- .../client/AbstractClientSessionTest.java | 20 +-- .../tests/client/AnnotatedEchoClient.java | 2 +- .../tests/client/AnnotatedEchoTest.java | 4 +- .../client/AnnotatedEndpointConfigTest.java | 8 +- .../tests/client/ConfiguratorTest.java | 6 +- .../tests/client/CookiesTest.java | 10 +- .../client/DecoderReaderManySmallTest.java | 6 +- .../tests/client/DelayedStartClientTest.java | 2 +- .../tests/client/EndpointEchoTest.java | 8 +- .../client/JsrClientEchoTrackingSocket.java | 6 +- .../tests/client/JsrClientTrackingSocket.java | 6 +- .../tests/client/MessageReceivingTest.java | 8 +- .../tests/client/OnCloseTest.java | 28 ++-- .../client/SessionAddMessageHandlerTest.java | 122 ++++++++-------- .../misbehaving/AnnotatedRuntimeOnOpen.java | 2 +- .../misbehaving/EndpointRuntimeOnOpen.java | 2 +- .../misbehaving/MisbehavingClassTest.java | 4 +- .../samples/CloseEndpointConfigSocket.java | 4 +- .../samples/CloseReasonSessionSocket.java | 4 +- .../client/samples/CloseReasonSocket.java | 4 +- .../samples/CloseSessionReasonSocket.java | 4 +- .../client/samples/CloseSessionSocket.java | 4 +- .../tests/client/samples/CloseSocket.java | 4 +- .../tests/client/samples/IntSocket.java | 4 +- .../tests/coders/AvailableDecodersTest.java | 10 +- .../tests/coders/AvailableEncodersTest.java | 10 +- .../tests/coders/BadDualDecoder.java | 2 +- .../tests/coders/BadDualEncoder.java | 2 +- .../tests/coders/CoderEventTracking.java | 2 +- .../tests/coders/DateDecoder.java | 2 +- .../tests/coders/DateEncoder.java | 2 +- .../tests/coders/DateTimeDecoder.java | 2 +- .../tests/coders/DateTimeEncoder.java | 2 +- .../tests/coders/DecoderTextStreamTest.java | 10 +- .../tests/coders/DecoderTextTest.java | 2 +- .../tests/coders/EncoderTextTest.java | 2 +- .../tests/coders/ExtDecoder.java | 2 +- .../{jsr356 => javax}/tests/coders/Fruit.java | 2 +- .../tests/coders/FruitBinaryEncoder.java | 2 +- .../javax/tests/coders}/FruitDecoder.java | 2 +- .../tests/coders/FruitTextEncoder.java | 2 +- .../tests/coders/IntegerDecoderTest.java | 4 +- .../tests/coders/Quotes.java | 2 +- .../tests/coders/QuotesDecoder.java | 2 +- .../tests/coders/QuotesEncoder.java | 2 +- .../tests/coders/QuotesUtil.java | 2 +- .../tests/coders/TimeDecoder.java | 2 +- .../tests/coders/TimeEncoder.java | 2 +- .../tests/coders/ValidDualDecoder.java | 2 +- .../tests/coders/ValidDualEncoder.java | 2 +- .../tests}/handlers/BaseMessageHandler.java | 2 +- .../handlers/ByteArrayPartialHandler.java | 2 +- .../handlers/ByteArrayWholeHandler.java | 2 +- .../handlers/ByteBufferPartialHandler.java | 2 +- .../handlers/ByteBufferWholeHandler.java | 2 +- .../tests}/handlers/ComboMessageHandler.java | 2 +- .../handlers/ExtendedMessageHandler.java | 2 +- .../handlers/InputStreamWholeHandler.java | 2 +- .../tests}/handlers/LongMessageHandler.java | 2 +- .../tests}/handlers/ReaderWholeHandler.java | 2 +- .../tests}/handlers/StringPartialHandler.java | 2 +- .../tests}/handlers/StringWholeHandler.java | 2 +- .../tests/quotes/Quotes.java | 2 +- .../tests/quotes/QuotesDecoder.java | 2 +- .../tests/quotes/QuotesDecoderTest.java | 6 +- .../quotes/QuotesDecoderTextStreamTest.java | 8 +- .../tests/quotes/QuotesEncoder.java | 2 +- .../tests/quotes/QuotesEncoderTest.java | 6 +- .../tests/quotes/QuotesSocket.java | 4 +- .../tests/quotes/QuotesUtil.java | 2 +- ...tJavaxWebSocketServerFrameHandlerTest.java | 10 +- .../tests/server/AltFilterTest.java | 8 +- .../server/AnnotatedServerEndpointTest.java | 16 +-- ...asicEchoEndpointConfigContextListener.java | 4 +- .../BasicEchoEndpointContextListener.java | 4 +- .../BasicEchoSocketConfigContextListener.java | 4 +- .../BasicEchoSocketContextListener.java | 4 +- .../tests/server/BinaryStreamTest.java | 8 +- .../tests/server/ConfiguratorTest.java | 10 +- .../tests/server/DeploymentExceptionTest.java | 18 +-- .../tests/server/EndpointViaConfigTest.java | 8 +- .../server/IdleTimeoutContextListener.java | 4 +- .../tests/server/IdleTimeoutTest.java | 10 +- .../tests/server/InputStreamEchoTest.java | 6 +- ...FrameHandler_OnMessage_TextStreamTest.java | 14 +- .../JettyServerEndpointConfiguratorTest.java | 4 +- .../tests/server/JsrBatchModeTest.java | 4 +- .../tests/server/JsrEchoTest.java | 6 +- .../tests/server/LargeAnnotatedTest.java | 6 +- .../tests/server/LargeContainerTest.java | 6 +- .../server/LargeEchoContextListener.java | 2 +- .../tests/server/MemoryUsageTest.java | 4 +- .../tests/server/OnMessageReturnTest.java | 6 +- .../tests/server/PartialEchoTest.java | 8 +- .../tests/server/PingPongTest.java | 8 +- .../tests/server/PongContextListener.java | 4 +- .../tests/server/PongSocket.java | 2 +- .../server/PrimitivesBinaryEchoTest.java | 6 +- .../tests/server/PrimitivesTextEchoTest.java | 6 +- .../tests/server/ReaderEchoTest.java | 6 +- .../tests/server/SessionTest.java | 6 +- .../tests/server/SessionTrackingTest.java | 6 +- .../tests/server/StreamTest.java | 8 +- .../tests/server/TextStreamTest.java | 8 +- .../server/UriTemplateParameterTest.java | 6 +- .../WebSocketServerContainerExecutorTest.java | 10 +- .../configs/EchoSocketConfigurator.java | 2 +- .../BasicBinaryMessageByteBufferSocket.java | 2 +- .../BasicCloseReasonSessionSocket.java | 2 +- .../sockets/BasicCloseReasonSocket.java | 2 +- .../BasicCloseSessionReasonSocket.java | 2 +- .../server/sockets/BasicCloseSocket.java | 2 +- .../tests/server/sockets/BasicEchoSocket.java | 2 +- .../sockets/BasicErrorSessionSocket.java | 2 +- .../BasicErrorSessionThrowableSocket.java | 2 +- .../server/sockets/BasicErrorSocket.java | 2 +- .../BasicErrorThrowableSessionSocket.java | 2 +- .../sockets/BasicErrorThrowableSocket.java | 2 +- .../sockets/BasicOpenCloseSessionSocket.java | 2 +- .../server/sockets/BasicOpenCloseSocket.java | 2 +- .../sockets/BasicOpenSessionSocket.java | 2 +- .../tests/server/sockets/BasicOpenSocket.java | 2 +- .../sockets/BasicPongMessageSocket.java | 2 +- .../sockets/BasicTextMessageStringSocket.java | 2 +- .../server/sockets/ByteBufferSocket.java | 2 +- .../server/sockets/ConfiguredEchoSocket.java | 8 +- .../tests/server/sockets/DateTextSocket.java | 6 +- .../sockets/IdleTimeoutOnOpenEndpoint.java | 2 +- .../sockets/IdleTimeoutOnOpenSocket.java | 2 +- .../server/sockets/InvalidCloseIntSocket.java | 2 +- .../sockets/InvalidErrorErrorSocket.java | 2 +- .../server/sockets/InvalidErrorIntSocket.java | 2 +- .../sockets/InvalidOpenCloseReasonSocket.java | 2 +- .../server/sockets/InvalidOpenIntSocket.java | 2 +- .../sockets/InvalidOpenSessionIntSocket.java | 2 +- .../StatelessTextMessageStringSocket.java | 2 +- .../tests/server/sockets/TrackingSocket.java | 2 +- .../sockets/binary/ByteBufferSocket.java | 2 +- .../sockets/echo/BasicEchoEndpoint.java | 2 +- .../server/sockets/echo/BasicEchoSocket.java | 2 +- .../sockets/echo/EchoAsyncTextSocket.java | 2 +- .../sockets/echo/EchoBasicTextSocket.java | 2 +- .../sockets/echo/EchoReturnEndpoint.java | 2 +- .../sockets/echo/EchoReturnTextSocket.java | 2 +- .../echo/EchoStatelessAsyncTextSocket.java | 2 +- .../echo/EchoStatelessBasicTextSocket.java | 2 +- .../echo/LargeEchoConfiguredSocket.java | 2 +- .../sockets/echo/LargeEchoDefaultSocket.java | 2 +- .../OnOpenIdleTimeoutEndpoint.java | 2 +- .../idletimeout/OnOpenIdleTimeoutSocket.java | 2 +- .../partial/PartialTextSessionSocket.java | 2 +- .../sockets/partial/PartialTextSocket.java | 2 +- .../partial/PartialTrackingSocket.java | 4 +- .../sockets/pong/PongMessageEndpoint.java | 2 +- .../BooleanObjectTextParamSocket.java | 2 +- .../primitives/BooleanObjectTextSocket.java | 2 +- .../primitives/BooleanTextParamSocket.java | 2 +- .../sockets/primitives/BooleanTextSocket.java | 2 +- .../primitives/ByteObjectTextSocket.java | 2 +- .../sockets/primitives/ByteTextSocket.java | 2 +- .../sockets/primitives/CharTextSocket.java | 2 +- .../primitives/CharacterObjectTextSocket.java | 2 +- .../primitives/DoubleObjectTextSocket.java | 2 +- .../sockets/primitives/DoubleTextSocket.java | 2 +- .../primitives/FloatObjectTextSocket.java | 2 +- .../sockets/primitives/FloatTextSocket.java | 2 +- .../primitives/IntParamTextSocket.java | 2 +- .../sockets/primitives/IntTextSocket.java | 2 +- .../IntegerObjectParamTextSocket.java | 2 +- .../primitives/IntegerObjectTextSocket.java | 2 +- .../primitives/LongObjectTextSocket.java | 2 +- .../sockets/primitives/LongTextSocket.java | 2 +- .../primitives/ShortObjectTextSocket.java | 2 +- .../sockets/primitives/ShortTextSocket.java | 2 +- .../sockets/streaming/InputStreamSocket.java | 2 +- .../sockets/streaming/ReaderParamSocket.java | 2 +- .../sockets/streaming/ReaderSocket.java | 2 +- .../StringReturnReaderParamSocket.java | 2 +- .../basic-echo-endpoint-config-web.xml | 2 +- .../resources/idle-timeout-config-web.xml | 2 +- .../test/resources/large-echo-config-web.xml | 2 +- .../src/test/resources/pong-config-web.xml | 2 +- 380 files changed, 836 insertions(+), 838 deletions(-) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/AnnotatedClientEndpointConfig.java (96%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/ClientUpgradeRequestImpl.java (90%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/DelegatedClientUpgradeRequest.java (93%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/DelegatedClientUpgradeResponse.java (94%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/EmptyClientEndpointConfig.java (97%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/EmptyConfigurator.java (96%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/JavaxWebSocketClientContainer.java (95%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/JavaxWebSocketClientContainerProvider.java (98%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/JavaxWebSocketClientFrameHandlerFactory.java (83%) rename jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/client/JsrUpgradeListener.java (98%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/BasicEndpointConfig.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/CompletableFutureCallback.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/ConfiguredEndpoint.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/DuplicateCoderException.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/InitException.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/InvalidWebSocketException.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketAsyncRemote.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketBasicRemote.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketContainer.java (98%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketExtension.java (98%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketExtensionConfig.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler.java (91%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandlerFactory.java (87%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandlerMetadata.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketPongMessage.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketRemoteEndpoint.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketSession.java (98%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketUpgradeRequest.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketUpgradeResponse.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/MessageSink.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/PathParamProvider.java (87%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/RegisteredMessageHandler.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/SendHandlerCallback.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/UpgradeRequest.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/UpgradeRequestAdapter.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/UpgradeResponse.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/UpgradeResponseAdapter.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/AbstractDecoder.java (94%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/AvailableDecoders.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/BooleanDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/ByteArrayDecoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/ByteBufferDecoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/ByteDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/CharacterDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/DoubleDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/FloatDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/InputStreamDecoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/IntegerDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/LongDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/PongMessageDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/ReaderDecoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/ShortDecoder.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/decoders/StringDecoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/AbstractEncoder.java (94%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/AvailableEncoders.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/BooleanEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/ByteArrayEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/ByteBufferEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/ByteEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/CharacterEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/DoubleEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/EncodeFailedFuture.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/FloatEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/IntegerEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/LongEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/ShortEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/encoders/StringEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/AbstractMessageSink.java (87%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/ByteArrayMessageSink.java (94%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/ByteBufferMessageSink.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/CallbackBuffer.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedBinaryMessageSink.java (93%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedBinaryStreamMessageSink.java (93%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedMessageSink.java (91%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedTextMessageSink.java (93%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedTextStreamMessageSink.java (92%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DispatchedMessageSink.java (97%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/InputStreamMessageSink.java (86%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/MessageInputStream.java (98%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/MessageOutputStream.java (99%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/MessageReader.java (92%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/MessageWriter.java (99%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/PartialByteArrayMessageSink.java (91%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/PartialByteBufferMessageSink.java (93%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/PartialStringMessageSink.java (96%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/ReaderMessageSink.java (90%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/StringMessageSink.java (95%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/DuplicateAnnotationException.java (93%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/InvalidSignatureException.java (94%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/InvokerUtils.java (99%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/ReflectUtils.java (99%) rename jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/TextUtil.java (98%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/AbstractJavaxWebSocketFrameHandlerTest.java (92%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/AbstractSessionTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/Defaults.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/DummyContainer.java (98%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/DummyFrameHandlerFactory.java (93%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_BadSignaturesTest.java (98%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnCloseTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnErrorTest.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnMessage_TextTest.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/JavaxWebSocketFrameHandler_OnOpenTest.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/BadDualDecoder.java (98%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/BadDualEncoder.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/ExtDecoder.java (94%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/Fruit.java (93%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/FruitBinaryEncoder.java (96%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests}/FruitDecoder.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/coders/tests/FruitTextEncoder.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/endpoints/AbstractStringEndpoint.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/endpoints/DummyEndpoint.java (94%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/endpoints/EchoStringEndpoint.java (95%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/BaseMessageHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ByteArrayPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ByteArrayWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ByteBufferPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ByteBufferWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ComboMessageHandler.java (95%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ExtendedMessageHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/InputStreamWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/LongMessageHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/ReaderWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/StringPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests => javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common}/handlers/StringWholeHandler.java (94%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/AbstractMessageSinkTest.java (92%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedBinaryMessageSinkTest.java (94%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedBinaryStreamMessageSinkTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedTextMessageSinkTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/DecodedTextStreamMessageSinkTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/InputStreamMessageSinkTest.java (95%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/MessageWriterTest.java (99%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/messages/ReaderMessageSinkTest.java (97%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/sockets/TrackingSocket.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/InvokerUtilsTest.java (99%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/InvokerUtils_StaticParamsTest.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/NameParamIdentifier.java (96%) rename jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax/common}/util/ReflectUtilsTest.java (98%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/ContainerDefaultConfigurator.java (98%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/JavaxWebSocketConfiguration.java (97%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/JavaxWebSocketServerContainer.java (95%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/JavaxWebSocketServerContainerInitializer.java (99%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/JavaxWebSocketServerFrameHandlerFactory.java (84%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/AnnotatedServerEndpointConfig.java (97%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/JavaxWebSocketCreator.java (96%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/JsrHandshakeRequest.java (97%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/JsrHandshakeResponse.java (96%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/PathParamIdentifier.java (93%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/PathParamServerEndpointConfig.java (93%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/ServerEndpointConfigWrapper.java (97%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/UndefinedServerEndpointConfig.java (95%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/UpgradeRequestAdapter.java (91%) rename jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/internal/UpgradeResponseAdapter.java (92%) rename jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/DummyServerContainer.java (96%) rename jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/server/PathParamTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/BadFrame.java (96%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/BiConsumerServiceServlet.java (96%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/CompletableFutureMethodHandle.java (87%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/CoreServer.java (96%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/DataUtils.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/DummyEndpoint.java (95%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/FunctionMethod.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/Fuzzer.java (99%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/LocalFuzzer.java (99%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/LocalServer.java (98%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/MessageType.java (94%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/NetworkFuzzer.java (99%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/ParserCapture.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/RawFrameBuilder.java (98%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/SessionMatchers.java (82%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/Sha1Sum.java (98%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/Timeouts.java (95%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/UnitGenerator.java (98%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/UpgradeUtils.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/WSEndpointTracker.java (99%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/WSEventTracker.java (99%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/WSServer.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/WSURI.java (98%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/framehandlers/FrameEcho.java (96%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/framehandlers/FrameHandlerTracker.java (97%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/framehandlers/StaticText.java (94%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/framehandlers/WholeMessageEcho.java (95%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/matchers/IsMessageHandlerType.java (91%) rename jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/matchers/IsMessageHandlerTypeRegistered.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/AbstractClientSessionTest.java (75%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/AnnotatedEchoClient.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/AnnotatedEchoTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/AnnotatedEndpointConfigTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/ConfiguratorTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/CookiesTest.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/DecoderReaderManySmallTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/DelayedStartClientTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/EndpointEchoTest.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/JsrClientEchoTrackingSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/JsrClientTrackingSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/MessageReceivingTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/OnCloseTest.java (80%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/SessionAddMessageHandlerTest.java (62%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/misbehaving/EndpointRuntimeOnOpen.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/misbehaving/MisbehavingClassTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseEndpointConfigSocket.java (92%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseReasonSessionSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseReasonSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseSessionReasonSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseSessionSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/CloseSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/client/samples/IntSocket.java (90%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/AvailableDecodersTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/AvailableEncodersTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/BadDualDecoder.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/BadDualEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/CoderEventTracking.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DateDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DateEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DateTimeDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DateTimeEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DecoderTextStreamTest.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/DecoderTextTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/EncoderTextTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/ExtDecoder.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/Fruit.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/FruitBinaryEncoder.java (97%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders}/FruitDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/FruitTextEncoder.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/IntegerDecoderTest.java (90%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/Quotes.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/QuotesDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/QuotesEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/QuotesUtil.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/TimeDecoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/TimeEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/ValidDualDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/coders/ValidDualEncoder.java (96%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/BaseMessageHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ByteArrayPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ByteArrayWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ByteBufferPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ByteBufferWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ComboMessageHandler.java (95%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ExtendedMessageHandler.java (95%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/InputStreamWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/LongMessageHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/ReaderWholeHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/StringPartialHandler.java (94%) rename jetty-websocket/{javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356 => javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/handlers/StringWholeHandler.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/Quotes.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesDecoder.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesDecoderTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesDecoderTextStreamTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesEncoder.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesEncoderTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesSocket.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/quotes/QuotesUtil.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java (87%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/AltFilterTest.java (92%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/AnnotatedServerEndpointTest.java (87%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/BasicEchoEndpointConfigContextListener.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/BasicEchoEndpointContextListener.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/BasicEchoSocketConfigContextListener.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/BasicEchoSocketContextListener.java (92%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/BinaryStreamTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/ConfiguratorTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/DeploymentExceptionTest.java (83%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/EndpointViaConfigTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/IdleTimeoutContextListener.java (92%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/IdleTimeoutTest.java (90%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/InputStreamEchoTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java (90%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/JettyServerEndpointConfiguratorTest.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/JsrBatchModeTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/JsrEchoTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/LargeAnnotatedTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/LargeContainerTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/LargeEchoContextListener.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/MemoryUsageTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/OnMessageReturnTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PartialEchoTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PingPongTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PongContextListener.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PongSocket.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PrimitivesBinaryEchoTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/PrimitivesTextEchoTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/ReaderEchoTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/SessionTest.java (98%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/SessionTrackingTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/StreamTest.java (97%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/TextStreamTest.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/UriTemplateParameterTest.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/WebSocketServerContainerExecutorTest.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/configs/EchoSocketConfigurator.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicCloseReasonSessionSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicCloseReasonSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicCloseSessionReasonSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicCloseSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicEchoSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicErrorSessionSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicErrorSessionThrowableSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicErrorSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicErrorThrowableSessionSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicErrorThrowableSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicOpenCloseSessionSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicOpenCloseSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicOpenSessionSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicOpenSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicPongMessageSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/BasicTextMessageStringSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/ByteBufferSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/ConfiguredEchoSocket.java (92%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/DateTextSocket.java (91%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/IdleTimeoutOnOpenSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidCloseIntSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidErrorErrorSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidErrorIntSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidOpenCloseReasonSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidOpenIntSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/InvalidOpenSessionIntSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/StatelessTextMessageStringSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/TrackingSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/binary/ByteBufferSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/BasicEchoEndpoint.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/BasicEchoSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoAsyncTextSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoBasicTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoReturnEndpoint.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoReturnTextSocket.java (93%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/LargeEchoConfiguredSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/echo/LargeEchoDefaultSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java (94%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/partial/PartialTextSessionSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/partial/PartialTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/partial/PartialTrackingSocket.java (88%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/pong/PongMessageEndpoint.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/BooleanObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/BooleanTextParamSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/BooleanTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/ByteObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/ByteTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/CharTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/CharacterObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/DoubleObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/DoubleTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/FloatObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/FloatTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/IntParamTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/IntTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/IntegerObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/LongObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/LongTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/ShortObjectTextSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/primitives/ShortTextSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/streaming/InputStreamSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/streaming/ReaderParamSocket.java (96%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/streaming/ReaderSocket.java (95%) rename jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/{jsr356 => javax}/tests/server/sockets/streaming/StringReturnReaderParamSocket.java (96%) diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java index 5173994dc87..d0b16bc65f2 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java @@ -25,7 +25,7 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; /** * Example of setting up a javax.websocket server with Jetty embedded diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index 048c50a5c26..1637a9d5f46 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -95,7 +95,7 @@ org.eclipse.jetty.plus.webapp.EnvConfiguration org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig + JavaxWebSocketExtensionConfig org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml index 80743f54f8d..3639658bdfa 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -82,7 +82,7 @@ org.eclipse.jetty.plus.webapp.EnvConfiguration org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig + org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml index 047c127f112..e64c5c028a9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml @@ -86,7 +86,7 @@ org.eclipse.jetty.plus.webapp.EnvConfiguration org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig + org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-websocket/javax-websocket-client/src/main/java/module-info.java b/jetty-websocket/javax-websocket-client/src/main/java/module-info.java index 938f905a19d..1115c1451ac 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/module-info.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/module-info.java @@ -18,11 +18,11 @@ import javax.websocket.ContainerProvider; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; module org.eclipse.jetty.websocket.javax.client { - exports org.eclipse.jetty.websocket.jsr356.client; + exports org.eclipse.jetty.websocket.javax.client; requires javax.websocket.api; requires org.eclipse.jetty.util; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointConfig.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java similarity index 96% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointConfig.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java index 1d2fc4487d5..a22067f42a2 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointConfig.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpointConfig; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/ClientUpgradeRequestImpl.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/ClientUpgradeRequestImpl.java similarity index 90% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/ClientUpgradeRequestImpl.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/ClientUpgradeRequestImpl.java index 4c98f0725da..17770254826 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/ClientUpgradeRequestImpl.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/ClientUpgradeRequestImpl.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; import javax.websocket.Session; import java.net.URI; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeRequest.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeRequest.java similarity index 93% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeRequest.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeRequest.java index 1130ccf63b8..4a9e1475f5a 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeRequest.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeRequest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; import java.net.URI; import java.security.Principal; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeResponse.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeResponse.java similarity index 94% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeResponse.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeResponse.java index 6b5a37be534..272b0f4251e 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeResponse.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeResponse.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.websocket.core.ExtensionConfig; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; import java.util.Collections; import java.util.List; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyClientEndpointConfig.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyClientEndpointConfig.java similarity index 97% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyClientEndpointConfig.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyClientEndpointConfig.java index 53a18925676..30061d713eb 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyClientEndpointConfig.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyClientEndpointConfig.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import javax.websocket.ClientEndpointConfig; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyConfigurator.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java similarity index 96% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyConfigurator.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java index 053d280c5f3..0906418ba08 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyConfigurator.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import javax.websocket.ClientEndpointConfig; import javax.websocket.HandshakeResponse; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainer.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java similarity index 95% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainer.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java index 1a283d54c76..7ba1c7fca90 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainer.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.io.ByteBufferPool; @@ -24,11 +24,11 @@ import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpointConfig; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainerProvider.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java similarity index 98% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainerProvider.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java index b9decb06b62..28f575fa0f9 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainerProvider.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.thread.ShutdownThread; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java similarity index 83% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientFrameHandlerFactory.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java index e3845529bf2..2b22237c693 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientFrameHandlerFactory.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; import javax.websocket.ClientEndpoint; import javax.websocket.Endpoint; diff --git a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrUpgradeListener.java b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java similarity index 98% rename from jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrUpgradeListener.java rename to jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java index 990f924e013..995cb8f86f3 100644 --- a/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrUpgradeListener.java +++ b/jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.client; +package org.eclipse.jetty.websocket.javax.client; import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpResponse; diff --git a/jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider b/jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider index 6d4c9c6c138..283ed9d2000 100644 --- a/jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider +++ b/jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider @@ -1 +1 @@ -org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider \ No newline at end of file +org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-common/src/main/java/module-info.java b/jetty-websocket/javax-websocket-common/src/main/java/module-info.java index e62b3b70f9d..8fe7337d0fa 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/module-info.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/module-info.java @@ -18,11 +18,11 @@ module org.eclipse.jetty.websocket.javax.common { - exports org.eclipse.jetty.websocket.jsr356; - exports org.eclipse.jetty.websocket.jsr356.decoders; - exports org.eclipse.jetty.websocket.jsr356.encoders; - exports org.eclipse.jetty.websocket.jsr356.messages; - exports org.eclipse.jetty.websocket.jsr356.util; + exports org.eclipse.jetty.websocket.javax.common; + exports org.eclipse.jetty.websocket.javax.common.decoders; + exports org.eclipse.jetty.websocket.javax.common.encoders; + exports org.eclipse.jetty.websocket.javax.common.messages; + exports org.eclipse.jetty.websocket.javax.common.util; requires javax.websocket.api; requires org.eclipse.jetty.util; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/BasicEndpointConfig.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/BasicEndpointConfig.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/BasicEndpointConfig.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/BasicEndpointConfig.java index dd787c50c52..a6a7938bddc 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/BasicEndpointConfig.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/BasicEndpointConfig.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import javax.websocket.Decoder; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/CompletableFutureCallback.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/CompletableFutureCallback.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java index a315356db77..1f0659d8628 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/CompletableFutureCallback.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/ConfiguredEndpoint.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/ConfiguredEndpoint.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java index a436759146b..5171c7bbf4f 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/ConfiguredEndpoint.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/DuplicateCoderException.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/DuplicateCoderException.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java index 8150f285edf..8a2b9a9a231 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/DuplicateCoderException.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; /** * Thrown when a duplicate coder is encountered when attempting to identify a Endpoint's metadata ({@link javax.websocket.Decoder} or {@link javax.websocket.Encoder}) diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InitException.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InitException.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java index fc6b6d9ab22..a06f31208d7 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InitException.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; /** * Exception during initialization of the Endpoint diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InvalidWebSocketException.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InvalidWebSocketException.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java index ca3735b6c05..0ccaeccac87 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InvalidWebSocketException.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.WebSocketException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketAsyncRemote.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketAsyncRemote.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java index 80bf2d5b24a..3acd93acc6d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketAsyncRemote.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; @@ -25,9 +25,9 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; -import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; -import org.eclipse.jetty.websocket.jsr356.util.TextUtil; +import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream; +import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter; +import org.eclipse.jetty.websocket.javax.common.util.TextUtil; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketBasicRemote.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketBasicRemote.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java index 699849f592d..22097c1f6fc 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketBasicRemote.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.SharedBlockingCallback; @@ -25,7 +25,7 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.util.TextUtil; +import org.eclipse.jetty.websocket.javax.common.util.TextUtil; import javax.websocket.EncodeException; import javax.websocket.RemoteEndpoint; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketContainer.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketContainer.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java index 3380f4effd4..6a4dda41c83 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketContainer.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.DecoratedObjectFactory; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtension.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtension.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java index 34c9b1c9356..ac346276c9e 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtension.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.ExtensionConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtensionConfig.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtensionConfig.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java index 5b7e7b1c166..dbebb9252da 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtensionConfig.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.ExtensionConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java similarity index 91% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java index 297c1952d97..14b00652318 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -29,15 +29,15 @@ import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.ProtocolException; import org.eclipse.jetty.websocket.core.WebSocketConstants; import org.eclipse.jetty.websocket.core.WebSocketException; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; import javax.websocket.CloseReason; import javax.websocket.Decoder; @@ -57,8 +57,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; - public class JavaxWebSocketFrameHandler implements FrameHandler { private final Logger LOG; @@ -94,8 +92,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler private MethodHandle openHandle; private MethodHandle closeHandle; private MethodHandle errorHandle; - private MessageMetadata textMetadata; - private MessageMetadata binaryMetadata; + private JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata; + private JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata; // TODO: need pingHandle ? private MethodHandle pongHandle; /** @@ -124,8 +122,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler Object endpointInstance, UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse, MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle, - MessageMetadata textMetadata, - MessageMetadata binaryMetadata, + JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata, + JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata, MethodHandle pongHandle, String id, EndpointConfig endpointConfig, @@ -245,8 +243,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler closeHandle = InvokerUtils.bindTo(closeHandle, session); errorHandle = InvokerUtils.bindTo(errorHandle, session); - MessageMetadata actualTextMetadata = MessageMetadata.copyOf(textMetadata); - MessageMetadata actualBinaryMetadata = MessageMetadata.copyOf(binaryMetadata); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata); pongHandle = InvokerUtils.bindTo(pongHandle, session); @@ -333,12 +331,12 @@ public class JavaxWebSocketFrameHandler implements FrameHandler return messageHandlerMap; } - public MessageMetadata getBinaryMetadata() + public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata() { return binaryMetadata; } - public MessageMetadata getTextMetadata() + public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata() { return textMetadata; } @@ -368,7 +366,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialByteArrayMessageSink(session, partialMessageHandler); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); - MessageMetadata metadata = new MessageMetadata(); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialByteArrayMessageSink.class; this.binaryMetadata = metadata; @@ -378,7 +376,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialByteBufferMessageSink(session, partialMessageHandler); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); - MessageMetadata metadata = new MessageMetadata(); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialByteBufferMessageSink.class; this.binaryMetadata = metadata; @@ -388,7 +386,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialStringMessageSink(session, partialMessageHandler); this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink); - MessageMetadata metadata = new MessageMetadata(); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialStringMessageSink.class; this.textMetadata = metadata; @@ -435,7 +433,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler throw new IllegalStateException("Unable to find Decoder for type: " + clazz); } - MessageMetadata metadata = new MessageMetadata(); + JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = wholeMsgMethodHandle; metadata.registeredDecoder = registeredDecoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java similarity index 87% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerFactory.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java index f2b0e9d7013..20b498780b6 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerFactory.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java @@ -16,26 +16,26 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.messages.ByteArrayMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.ByteBufferMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.InputStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.ReaderMessageSink; -import org.eclipse.jetty.websocket.jsr356.messages.StringMessageSink; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.messages.ByteArrayMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.ByteBufferMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.InputStreamMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.ReaderMessageSink; +import org.eclipse.jetty.websocket.javax.common.messages.StringMessageSink; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import javax.websocket.CloseReason; import javax.websocket.Decoder; @@ -63,8 +63,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; -import static org.eclipse.jetty.websocket.jsr356.util.InvokerUtils.Arg; +import static org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; public abstract class JavaxWebSocketFrameHandlerFactory { @@ -396,8 +395,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory if (onmethod != null) { assertSignatureValid(endpointClass, onmethod, OnOpen.class); - final Arg SESSION = new Arg(Session.class); - final Arg ENDPOINT_CONFIG = new Arg(EndpointConfig.class); + final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class); + final InvokerUtils.Arg ENDPOINT_CONFIG = new InvokerUtils.Arg(EndpointConfig.class); MethodHandle methodHandle = InvokerUtils .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, ENDPOINT_CONFIG); metadata.setOpenHandler(methodHandle, onmethod); @@ -408,8 +407,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory if (onmethod != null) { assertSignatureValid(endpointClass, onmethod, OnClose.class); - final Arg SESSION = new Arg(Session.class); - final Arg CLOSE_REASON = new Arg(CloseReason.class); + final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class); + final InvokerUtils.Arg CLOSE_REASON = new InvokerUtils.Arg(CloseReason.class); MethodHandle methodHandle = InvokerUtils .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CLOSE_REASON); metadata.setCloseHandler(methodHandle, onmethod); @@ -419,8 +418,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory if (onmethod != null) { assertSignatureValid(endpointClass, onmethod, OnError.class); - final Arg SESSION = new Arg(Session.class); - final Arg CAUSE = new Arg(Throwable.class).required(); + final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class); + final InvokerUtils.Arg CAUSE = new InvokerUtils.Arg(Throwable.class).required(); MethodHandle methodHandle = InvokerUtils .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CAUSE); metadata.setErrorHandler(methodHandle, onmethod); @@ -431,52 +430,52 @@ public abstract class JavaxWebSocketFrameHandlerFactory if (onMessages != null && onMessages.length > 0) { // The different kind of @OnMessage method parameter signatures expected - Arg textCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(String.class).required() + InvokerUtils.Arg textCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(String.class).required() }; - Arg textPartialCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(String.class).required(), - new Arg(boolean.class).required() + InvokerUtils.Arg textPartialCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(String.class).required(), + new InvokerUtils.Arg(boolean.class).required() }; - Arg binaryBufferCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(ByteBuffer.class).required() + InvokerUtils.Arg binaryBufferCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(ByteBuffer.class).required() }; - Arg binaryPartialBufferCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(ByteBuffer.class).required(), - new Arg(boolean.class).required() + InvokerUtils.Arg binaryPartialBufferCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(ByteBuffer.class).required(), + new InvokerUtils.Arg(boolean.class).required() }; - Arg binaryArrayCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(byte[].class).required() + InvokerUtils.Arg binaryArrayCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(byte[].class).required() }; - Arg binaryPartialArrayCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(byte[].class).required(), - new Arg(boolean.class).required() + InvokerUtils.Arg binaryPartialArrayCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(byte[].class).required(), + new InvokerUtils.Arg(boolean.class).required() }; - Arg inputStreamCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(InputStream.class).required() + InvokerUtils.Arg inputStreamCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(InputStream.class).required() }; - Arg readerCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(Reader.class).required() + InvokerUtils.Arg readerCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(Reader.class).required() }; - Arg pongCallingArgs[] = new Arg[] { - new Arg(Session.class), - new Arg(PongMessage.class).required() + InvokerUtils.Arg pongCallingArgs[] = new InvokerUtils.Arg[] { + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(PongMessage.class).required() }; List decodedTextCallingArgs = new ArrayList<>(); @@ -490,8 +489,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory { decodedTextCallingArgs.add( new DecodedArgs(decoder, - new Arg(Session.class), - new Arg(decoder.objectType).required() + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(decoder.objectType).required() )); } @@ -499,8 +498,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory { decodedTextStreamCallingArgs.add( new DecodedArgs(decoder, - new Arg(Session.class), - new Arg(decoder.objectType).required() + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(decoder.objectType).required() )); } @@ -508,8 +507,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory { decodedBinaryCallingArgs.add( new DecodedArgs(decoder, - new Arg(Session.class), - new Arg(decoder.objectType).required() + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(decoder.objectType).required() )); } @@ -517,8 +516,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory { decodedBinaryStreamCallingArgs.add( new DecodedArgs(decoder, - new Arg(Session.class), - new Arg(decoder.objectType).required() + new InvokerUtils.Arg(Session.class), + new InvokerUtils.Arg(decoder.objectType).required() )); } } @@ -767,9 +766,9 @@ public abstract class JavaxWebSocketFrameHandlerFactory private static class DecodedArgs { public final AvailableDecoders.RegisteredDecoder registeredDecoder; - public final Arg[] args; + public final InvokerUtils.Arg[] args; - public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, Arg... args) + public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, InvokerUtils.Arg... args) { this.registeredDecoder = registeredDecoder; this.args = args; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerMetadata.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerMetadata.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java index c0f0f97a6e2..512fad688e5 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerMetadata.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; import javax.websocket.Decoder; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketPongMessage.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketPongMessage.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java index 5f9b4c8506a..563db137467 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketPongMessage.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketRemoteEndpoint.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java index 890731409cf..033a7b5d405 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketRemoteEndpoint.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -28,8 +28,8 @@ import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OutgoingFrames; import org.eclipse.jetty.websocket.core.WebSocketException; -import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; -import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; +import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream; +import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketSession.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketSession.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java index ddac79d875d..cc24efcc9b9 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketSession.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.component.AbstractLifeCycle; @@ -24,9 +24,9 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import javax.websocket.CloseReason; import javax.websocket.EndpointConfig; @@ -37,7 +37,6 @@ import javax.websocket.RemoteEndpoint.Basic; import javax.websocket.Session; import javax.websocket.WebSocketContainer; import java.io.IOException; -import java.lang.invoke.MethodHandle; import java.net.URI; import java.security.Principal; import java.time.Duration; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeRequest.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeRequest.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java index 2395931033a..b8b68e543f5 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeRequest.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.net.URI; import java.util.List; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeResponse.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeResponse.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java index 7de91ccdca7..6a3f25b2a95 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeResponse.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.ExtensionConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java index 85ae970a146..a1b83bbcba9 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/PathParamProvider.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java similarity index 87% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/PathParamProvider.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java index 30274fab038..bcafced891d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/PathParamProvider.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.util.Map; /** * Optional interface for custom {@link javax.websocket.EndpointConfig} implementations - * in Jetty to expose Path Param values used during the {@link org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler} + * in Jetty to expose Path Param values used during the {@link JavaxWebSocketFrameHandler} * resolution of methods. *

* Mostly a feature of the JSR356 Server implementation and its {@code @javax.websocket.server.PathParam} annotation. diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/RegisteredMessageHandler.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/RegisteredMessageHandler.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java index 57ab8468eef..ab0a72d6c7e 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/RegisteredMessageHandler.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/SendHandlerCallback.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/SendHandlerCallback.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java index bfcb64ee9a5..cc689fc747b 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/SendHandlerCallback.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequest.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequest.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java index 448ba47e864..34cb31fa477 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequest.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.net.URI; import java.security.Principal; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequestAdapter.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequestAdapter.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java index 02dc979d78e..9786eba79bb 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequestAdapter.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.net.URI; import java.security.Principal; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponse.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponse.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java index 4a7d7a84375..a9a5ba4d895 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponse.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.ExtensionConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponseAdapter.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponseAdapter.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java index 52aeaaa5f70..cbfebbfee50 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponseAdapter.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.websocket.core.ExtensionConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AbstractDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AbstractDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java index 0dfb4f63bc9..e2f8badfd91 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AbstractDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.Decoder; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AvailableDecoders.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AvailableDecoders.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java index cd43c611e39..5511d9503cf 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AvailableDecoders.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; -import org.eclipse.jetty.websocket.jsr356.InitException; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.InitException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/BooleanDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/BooleanDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java index 77ea6a7d851..ca9903f41d4 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/BooleanDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteArrayDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteArrayDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java index 990f582bb67..3dbdc236022 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteArrayDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteBufferDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteBufferDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java index 11630c69ba4..3903a6ce6c7 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteBufferDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java index cdea0936fa9..d49086b97f0 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/CharacterDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/CharacterDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java index 6148078bdb9..4941a769c33 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/CharacterDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/DoubleDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/DoubleDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java index 823a6c2faa5..37eafbda969 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/DoubleDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/FloatDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/FloatDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java index dc906762992..ede2cd726b6 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/FloatDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java index 2756e9c6d86..7e72683bcfd 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/IntegerDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/IntegerDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java index c1885d55c17..3e05d1f4dc9 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/IntegerDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/LongDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/LongDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java index bab4b2a72dd..62f536d573e 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/LongDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PongMessageDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PongMessageDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java index 7420f6257b8..67b47e7bc00 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PongMessageDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ReaderDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ReaderDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java index d1baa6a6d0e..b05693d16e3 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ReaderDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ShortDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ShortDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java index 0da5e77f520..79fa25d5387 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ShortDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/StringDecoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/StringDecoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java index b642871c592..c4ab794dd9d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/StringDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.decoders; +package org.eclipse.jetty.websocket.javax.common.decoders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AbstractEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AbstractEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java index 0c47b9834df..435bb2b1c47 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AbstractEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.Encoder; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AvailableEncoders.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AvailableEncoders.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java index 9c52a785922..eec45bdca0d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AvailableEncoders.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; -import org.eclipse.jetty.websocket.jsr356.InitException; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.InitException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import javax.websocket.Encoder; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/BooleanEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/BooleanEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java index ba8afea4a7a..f7e169d0ac4 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/BooleanEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteArrayEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteArrayEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java index 4a1cbb0b358..9401e12bf3c 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteArrayEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteBufferEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteBufferEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java index c8fd9a35439..85d33d3fe4e 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteBufferEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java index 10abc86050e..d5a8d7c3bd8 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/CharacterEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/CharacterEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java index 36b1f0901f7..90e9b550584 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/CharacterEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/DoubleEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/DoubleEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java index 0977f8b926d..d01079936ae 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/DoubleEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/EncodeFailedFuture.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/EncodeFailedFuture.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java index 6ffb840e8db..cae63e0dba7 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/EncodeFailedFuture.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.Encoder; import java.util.concurrent.ExecutionException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/FloatEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/FloatEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java index b8621aa947e..d55693de62c 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/FloatEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/IntegerEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/IntegerEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java index 8d89be27240..a196be6d1b8 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/IntegerEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/LongEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/LongEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java index 6f5612021ef..50d1cf7f406 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/LongEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ShortEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ShortEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java index 6682ab359cf..69027254b2a 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ShortEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/StringEncoder.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/StringEncoder.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java index 95a2bde92a7..906bacc378a 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/StringEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.encoders; +package org.eclipse.jetty.websocket.javax.common.encoders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java similarity index 87% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java index 4f6bb4c8fc7..93c8f05ce72 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import java.lang.invoke.MethodHandle; import java.util.Objects; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteArrayMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteArrayMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java index ee907acba1d..b1cb339b52d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteArrayMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.MessageTooLargeException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import java.io.ByteArrayOutputStream; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteBufferMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteBufferMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java index aef96d36664..5779a1495dd 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteBufferMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.MessageTooLargeException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import java.io.ByteArrayOutputStream; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/CallbackBuffer.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/CallbackBuffer.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java index eb058ac5ecc..f720dbf6ce2 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/CallbackBuffer.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java index 9e8c3fdecd0..605bccec1a0 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.CloseException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import javax.websocket.CloseReason; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java index d1aceb88662..2c065f088dc 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.CloseException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import javax.websocket.CloseReason; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java similarity index 91% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java index c0d304ede39..c25e3f76fc0 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import javax.websocket.Decoder; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java index 9c1861784c0..806331fa33b 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.CloseException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import javax.websocket.CloseReason; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java similarity index 92% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java index 8931d79ea8f..4b470a07638 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.CloseException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import javax.websocket.CloseReason; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DispatchedMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DispatchedMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java index 46dbd0c526a..a853bdb435b 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DispatchedMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import java.lang.invoke.MethodHandle; import java.util.Objects; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java similarity index 86% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java index b31631293e0..52c9c0eb192 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import java.io.InputStream; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageInputStream.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageInputStream.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java index 58da0daeb9b..fe88dfd40be 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageInputStream.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import java.io.IOException; import java.io.InputStream; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageOutputStream.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageOutputStream.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java index 1cae4c72de2..c5e5004637c 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageOutputStream.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageReader.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java similarity index 92% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageReader.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java index 7d4734c1936..577ca704fc2 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageReader.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.MessageSink; +import org.eclipse.jetty.websocket.javax.common.MessageSink; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriter.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriter.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java index 4dd06ec4f27..60b99522d65 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriter.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteArrayMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java similarity index 91% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteArrayMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java index 4fbaaf1c092..b373c1e208d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteArrayMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteBufferMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteBufferMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java index 165c125dfd6..030d17d0cab 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteBufferMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import java.lang.invoke.MethodHandle; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialStringMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialStringMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java index e5ce676ca25..6d3a30a0baa 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialStringMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -24,7 +24,7 @@ import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import java.lang.invoke.MethodHandle; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java similarity index 90% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java index 0ae42c8f18c..59e9ba2d5b7 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import java.io.Reader; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/StringMessageSink.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/StringMessageSink.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java index 580b8e79858..c34fd00e08d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/StringMessageSink.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -25,7 +25,7 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.MessageTooLargeException; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import java.lang.invoke.MethodHandle; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/DuplicateAnnotationException.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/DuplicateAnnotationException.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java index 6edefdcba5f..0c08fe3f0b8 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/DuplicateAnnotationException.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvalidSignatureException.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvalidSignatureException.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java index 279a931b5b7..f864b111a63 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvalidSignatureException.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; import java.lang.annotation.Annotation; import java.lang.invoke.MethodType; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java index e9c593d2446..b42a2572a9d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtils.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtils.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java index a6797447e71..59a44a9b2a4 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtils.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; import java.lang.annotation.Annotation; import java.lang.invoke.MethodType; diff --git a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/TextUtil.java b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/TextUtil.java rename to jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java index 5da5020eaa9..606e0be609d 100644 --- a/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/TextUtil.java +++ b/jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; /** * Collection of utility methods for Text content diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractJavaxWebSocketFrameHandlerTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java similarity index 92% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractJavaxWebSocketFrameHandlerTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java index 4d803aab36e..2697fd1a36d 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractJavaxWebSocketFrameHandlerTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.util.HashMap; import java.util.Map; @@ -25,8 +25,8 @@ import java.util.concurrent.CompletableFuture; import javax.websocket.EndpointConfig; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractSessionTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractSessionTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java index d26038a4260..02f7b037e81 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractSessionTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/Defaults.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/Defaults.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java index 1f03acc9d21..ed543e6a34f 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/Defaults.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import java.util.concurrent.TimeUnit; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyContainer.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyContainer.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java index af4660d8d59..edad8566516 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyContainer.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyFrameHandlerFactory.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyFrameHandlerFactory.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java index 4bb74485179..e15e11bd1eb 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/DummyFrameHandlerFactory.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; import javax.websocket.ClientEndpoint; import javax.websocket.Endpoint; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_BadSignaturesTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_BadSignaturesTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java index d5ccd49976f..f565e1df71a 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_BadSignaturesTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_BadSignaturesTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import org.junit.jupiter.api.Test; import javax.websocket.ClientEndpoint; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnCloseTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnCloseTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java index 51364f99592..1948cdad024 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnCloseTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnCloseTest.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnErrorTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnErrorTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java index efb14575b01..5e2c3dc5e7d 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnErrorTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnErrorTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java index 687dc53f676..b891676424b 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryStreamTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; import org.junit.jupiter.api.Test; import javax.websocket.ClientEndpoint; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java index 2052da579e9..f4ef9b249c1 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_BinaryTest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java index bc56a31711c..db7a2bb3bdd 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; import org.junit.jupiter.api.Test; import javax.websocket.ClientEndpoint; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java index 2873bfdf580..3c9646efa7a 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnMessage_TextTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnMessage_TextTest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnOpenTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnOpenTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java index 39a374eedd5..cb716fe27af 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler_OnOpenTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler_OnOpenTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356; +package org.eclipse.jetty.websocket.javax.common; -import org.eclipse.jetty.websocket.jsr356.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualDecoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualDecoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java index 56e7d9553a6..a2d878b0ec5 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualEncoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualEncoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java index 4539e87b95f..f751ed457a4 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/BadDualEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/ExtDecoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/ExtDecoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java index e3d21bc3384..b0f333a38f9 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/ExtDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/Fruit.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java similarity index 93% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/Fruit.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java index 1fe77821808..dc2582a2c43 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/Fruit.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; public class Fruit { diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitBinaryEncoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitBinaryEncoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java index ced29e90f06..c2d66d56bed 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitBinaryEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitDecoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitDecoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java index 877f5927ca7..f946358e1dc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitDecoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import javax.websocket.DecodeException; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitTextEncoder.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitTextEncoder.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java index 121d62793e4..85ba2319a26 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitTextEncoder.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.common.coders.tests; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractStringEndpoint.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractStringEndpoint.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java index df29b42c077..d8a59236984 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractStringEndpoint.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.endpoints; +package org.eclipse.jetty.websocket.javax.common.endpoints; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; -import org.eclipse.jetty.websocket.jsr356.Defaults; +import org.eclipse.jetty.websocket.javax.common.Defaults; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/DummyEndpoint.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/DummyEndpoint.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java index a3460de7321..c36b261c5af 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/DummyEndpoint.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.endpoints; +package org.eclipse.jetty.websocket.javax.common.endpoints; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/EchoStringEndpoint.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/EchoStringEndpoint.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java index 4525dd94a3e..fefaad00a2e 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/EchoStringEndpoint.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.endpoints; +package org.eclipse.jetty.websocket.javax.common.endpoints; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/BaseMessageHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/BaseMessageHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java index 4878d099e52..c6a307f1845 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/BaseMessageHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayPartialHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java index 9d1955bd39f..b17f93fdb03 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayPartialHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayWholeHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java index 8609441706b..d60720f81d8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteArrayWholeHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferPartialHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java index 3cf4b0623a8..c51e0ad2893 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferPartialHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferWholeHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java index df8a623cf74..60585abcf7d 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ByteBufferWholeHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ComboMessageHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ComboMessageHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java index f8f694a71a9..763abd9449d 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ComboMessageHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ExtendedMessageHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ExtendedMessageHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java index 28e532c304c..1a1f4dc4f3e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ExtendedMessageHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/InputStreamWholeHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/InputStreamWholeHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java index 8fe875b8022..06b845ecef2 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/InputStreamWholeHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.io.InputStream; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/LongMessageHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/LongMessageHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java index 9ab0eed6dd7..99e5301f4a7 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/LongMessageHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ReaderWholeHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ReaderWholeHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java index ff7afaa5485..91d409a0a25 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/ReaderWholeHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; import java.io.Reader; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringPartialHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringPartialHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java index 6a02ad36fa6..567845f5482 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringPartialHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringWholeHandler.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringWholeHandler.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java index 16d76e644a1..7a1b1a9c74f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/handlers/StringWholeHandler.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.handlers; +package org.eclipse.jetty.websocket.javax.common.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java similarity index 92% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java index e00a4d65255..3b6c5ca4e00 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; -import org.eclipse.jetty.websocket.jsr356.AbstractSessionTest; +import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java index 5dc5e6304cb..46f718bde10 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import javax.websocket.DecodeException; @@ -49,7 +50,7 @@ public class DecodedBinaryMessageSinkTest extends AbstractMessageSinkTest DecodedCalendarCopy copy = new DecodedCalendarCopy(copyFuture); MethodHandle copyHandle = getAcceptHandle(copy, Calendar.class); Decoder.Binary decoder = new GmtDecoder(); - DecodedBinaryMessageSink sink = new DecodedBinaryMessageSink(session, decoder, copyHandle); + DecodedBinaryMessageSink sink = new DecodedBinaryMessageSink(AbstractSessionTest.session, decoder, copyHandle); CompletableFutureCallback finCallback = new CompletableFutureCallback(); ByteBuffer data = ByteBuffer.allocate(16); @@ -72,7 +73,7 @@ public class DecodedBinaryMessageSinkTest extends AbstractMessageSinkTest DecodedCalendarCopy copy = new DecodedCalendarCopy(copyFuture); MethodHandle copyHandle = getAcceptHandle(copy, Calendar.class); Decoder.Binary decoder = new GmtDecoder(); - DecodedBinaryMessageSink sink = new DecodedBinaryMessageSink(session, decoder, copyHandle); + DecodedBinaryMessageSink sink = new DecodedBinaryMessageSink(AbstractSessionTest.session, decoder, copyHandle); CompletableFutureCallback callback1 = new CompletableFutureCallback(); CompletableFutureCallback callback2 = new CompletableFutureCallback(); diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java index e2c1bfde0b5..7a529e3fcad 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java index 76b077791bc..c90d3891da6 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java index 1e96cddb7f6..70b1f4cbd58 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java index efefdc28df4..fc9a599b121 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; @@ -48,7 +49,7 @@ public class InputStreamMessageSinkTest extends AbstractMessageSinkTest { InputStreamCopy copy = new InputStreamCopy(); MethodHandle copyHandle = getAcceptHandle(copy, InputStream.class); - InputStreamMessageSink sink = new InputStreamMessageSink(session, copyHandle); + InputStreamMessageSink sink = new InputStreamMessageSink(AbstractSessionTest.session, copyHandle); CompletableFutureCallback finCallback = new CompletableFutureCallback(); ByteBuffer data = BufferUtil.toBuffer("Hello World", UTF_8); @@ -65,7 +66,7 @@ public class InputStreamMessageSinkTest extends AbstractMessageSinkTest { InputStreamCopy copy = new InputStreamCopy(); MethodHandle copyHandle = getAcceptHandle(copy, InputStream.class); - InputStreamMessageSink sink = new InputStreamMessageSink(session, copyHandle); + InputStreamMessageSink sink = new InputStreamMessageSink(AbstractSessionTest.session, copyHandle); CompletableFutureCallback fin1Callback = new CompletableFutureCallback(); ByteBuffer data1 = BufferUtil.toBuffer("Hello World", UTF_8); @@ -91,7 +92,7 @@ public class InputStreamMessageSinkTest extends AbstractMessageSinkTest { InputStreamCopy copy = new InputStreamCopy(); MethodHandle copyHandle = getAcceptHandle(copy, InputStream.class); - InputStreamMessageSink sink = new InputStreamMessageSink(session, copyHandle); + InputStreamMessageSink sink = new InputStreamMessageSink(AbstractSessionTest.session, copyHandle); CompletableFutureCallback callback1 = new CompletableFutureCallback(); CompletableFutureCallback callback2 = new CompletableFutureCallback(); @@ -115,7 +116,7 @@ public class InputStreamMessageSinkTest extends AbstractMessageSinkTest { InputStreamCopy copy = new InputStreamCopy(); MethodHandle copyHandle = getAcceptHandle(copy, InputStream.class); - InputStreamMessageSink sink = new InputStreamMessageSink(session, copyHandle); + InputStreamMessageSink sink = new InputStreamMessageSink(AbstractSessionTest.session, copyHandle); CompletableFutureCallback callback1 = new CompletableFutureCallback(); CompletableFutureCallback callback2 = new CompletableFutureCallback(); diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriterTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriterTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java index a393687e61f..2fa59a99faa 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriterTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriterTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import java.io.IOException; import java.util.Arrays; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSinkTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSinkTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java index 167130d5d56..37434dde214 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSinkTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.messages; +package org.eclipse.jetty.websocket.javax.common.messages; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/sockets/TrackingSocket.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/sockets/TrackingSocket.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java index 72cce36b462..f5adff9c46e 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/sockets/TrackingSocket.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.sockets; +package org.eclipse.jetty.websocket.javax.common.sockets; import javax.websocket.CloseReason; import java.util.concurrent.BlockingQueue; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtilsTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java similarity index 99% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtilsTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java index fbaffa377cf..efc00073b9e 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtilsTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; import org.eclipse.jetty.util.annotation.Name; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils_StaticParamsTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils_StaticParamsTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java index 090b9944aeb..276bb7b3c94 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils_StaticParamsTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils_StaticParamsTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils.Arg; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils.Arg; import org.junit.jupiter.api.Test; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/NameParamIdentifier.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java similarity index 96% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/NameParamIdentifier.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java index a8a987dd1c7..7f410608826 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/NameParamIdentifier.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; import org.eclipse.jetty.util.annotation.Name; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtilsTest.java b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java similarity index 98% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtilsTest.java rename to jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java index 852b56e683f..e56ec9f5073 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtilsTest.java +++ b/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.util; +package org.eclipse.jetty.websocket.javax.common.util; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java b/jetty-websocket/javax-websocket-server/src/main/java/module-info.java index 7a0804d5274..a98bb36014e 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/module-info.java @@ -20,13 +20,13 @@ import javax.servlet.ServletContainerInitializer; import javax.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.websocket.jsr356.server.ContainerDefaultConfigurator; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.ContainerDefaultConfigurator; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; module org.eclipse.jetty.websocket.javax.server { - exports org.eclipse.jetty.websocket.jsr356.server; + exports org.eclipse.jetty.websocket.javax.server; requires javax.servlet.api; requires javax.websocket.api; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/ContainerDefaultConfigurator.java similarity index 98% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/ContainerDefaultConfigurator.java index 00c47035448..7ff62eb0b0a 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ContainerDefaultConfigurator.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/ContainerDefaultConfigurator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketConfiguration.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketConfiguration.java similarity index 97% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketConfiguration.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketConfiguration.java index ee215194dfe..9ab28ab8a9e 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketConfiguration.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketConfiguration.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.FragmentConfiguration; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainer.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainer.java similarity index 95% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainer.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainer.java index b8323e43ca4..f4048aec5ae 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainer.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import java.time.Duration; import java.util.ArrayList; @@ -40,11 +40,11 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.jsr356.server.internal.AnnotatedServerEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.server.internal.JavaxWebSocketCreator; -import org.eclipse.jetty.websocket.jsr356.server.internal.UndefinedServerEndpointConfig; +import org.eclipse.jetty.websocket.javax.server.internal.AnnotatedServerEndpointConfig; +import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketCreator; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; +import org.eclipse.jetty.websocket.javax.server.internal.UndefinedServerEndpointConfig; import org.eclipse.jetty.websocket.servlet.WebSocketCreatorMapping; @ManagedObject("JSR356 Server Container") diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainerInitializer.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java similarity index 99% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainerInitializer.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java index 522ca8e007e..f2472b5b8af 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerContainerInitializer.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import java.util.HashSet; import java.util.Set; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerFrameHandlerFactory.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerFrameHandlerFactory.java similarity index 84% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerFrameHandlerFactory.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerFrameHandlerFactory.java index 09645d96789..620856de5ab 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/JavaxWebSocketServerFrameHandlerFactory.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerFrameHandlerFactory.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata; -import org.eclipse.jetty.websocket.jsr356.server.internal.PathParamIdentifier; -import org.eclipse.jetty.websocket.jsr356.server.internal.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.jsr356.server.internal.UpgradeResponseAdapter; +import org.eclipse.jetty.websocket.javax.server.internal.PathParamIdentifier; +import org.eclipse.jetty.websocket.javax.server.internal.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.javax.server.internal.UpgradeResponseAdapter; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.WebSocketServletFrameHandlerFactory; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/AnnotatedServerEndpointConfig.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java similarity index 97% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/AnnotatedServerEndpointConfig.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java index 4dc2da8e344..7c851349b49 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/AnnotatedServerEndpointConfig.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.server.ContainerDefaultConfigurator; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.server.ContainerDefaultConfigurator; import javax.websocket.Decoder; import javax.websocket.DeploymentException; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JavaxWebSocketCreator.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java similarity index 96% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JavaxWebSocketCreator.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java index 1a678ffe165..1b70c5c5e9f 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JavaxWebSocketCreator.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; @@ -25,9 +25,9 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.jsr356.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtension; +import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtension; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeRequest.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java similarity index 97% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeRequest.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java index 7f58276f0fd..0c0c2950f19 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeRequest.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeResponse.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java similarity index 96% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeResponse.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java index c9007eb1ce9..69f7bed3b3c 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/JsrHandshakeResponse.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamIdentifier.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java similarity index 93% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamIdentifier.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java index b4c51379a5e..cf037d54931 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamIdentifier.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; import javax.websocket.server.PathParam; import java.lang.annotation.Annotation; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamServerEndpointConfig.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java similarity index 93% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamServerEndpointConfig.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java index 6f2e8185614..350bd32525b 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/PathParamServerEndpointConfig.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.websocket.jsr356.PathParamProvider; +import org.eclipse.jetty.websocket.javax.common.PathParamProvider; import javax.websocket.server.ServerEndpointConfig; import java.util.HashMap; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/ServerEndpointConfigWrapper.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/ServerEndpointConfigWrapper.java similarity index 97% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/ServerEndpointConfigWrapper.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/ServerEndpointConfigWrapper.java index da81023987f..b2fb9bffb68 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/ServerEndpointConfigWrapper.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/ServerEndpointConfigWrapper.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import javax.websocket.Decoder; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UndefinedServerEndpointConfig.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UndefinedServerEndpointConfig.java similarity index 95% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UndefinedServerEndpointConfig.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UndefinedServerEndpointConfig.java index f0a5eb7ba31..3985947a5ba 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UndefinedServerEndpointConfig.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UndefinedServerEndpointConfig.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; -import org.eclipse.jetty.websocket.jsr356.server.ContainerDefaultConfigurator; +import org.eclipse.jetty.websocket.javax.server.ContainerDefaultConfigurator; import javax.websocket.Decoder; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeRequestAdapter.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeRequestAdapter.java similarity index 91% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeRequestAdapter.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeRequestAdapter.java index 4c85b05a91f..eea504971c8 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeRequestAdapter.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeRequestAdapter.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import java.net.URI; diff --git a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeResponseAdapter.java b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java similarity index 92% rename from jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeResponseAdapter.java rename to jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java index 954cc15ec4a..bcaf319f802 100644 --- a/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/jsr356/server/internal/UpgradeResponseAdapter.java +++ b/jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/UpgradeResponseAdapter.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server.internal; +package org.eclipse.jetty.websocket.javax.server.internal; import org.eclipse.jetty.websocket.core.ExtensionConfig; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import java.util.List; diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer index 7a56eeebae9..e75020de778 100644 --- a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer +++ b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer @@ -1 +1 @@ -org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer \ No newline at end of file +org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator index 7f67aa0a84f..b925d25755c 100644 --- a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator +++ b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator @@ -1 +1 @@ -org.eclipse.jetty.websocket.jsr356.server.ContainerDefaultConfigurator \ No newline at end of file +org.eclipse.jetty.websocket.javax.server.ContainerDefaultConfigurator \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration index 6e574804810..280be7ed694 100644 --- a/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration +++ b/jetty-websocket/javax-websocket-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration @@ -1 +1 @@ -org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration \ No newline at end of file +org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java b/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java index 551eefaeecb..9f11a4c5cb0 100644 --- a/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java +++ b/jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java @@ -28,8 +28,8 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainer; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; import javax.servlet.ServletException; import javax.websocket.DeploymentException; diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyServerContainer.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/DummyServerContainer.java similarity index 96% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyServerContainer.java rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/DummyServerContainer.java index 8812308206a..69d1464b91c 100644 --- a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DummyServerContainer.java +++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/DummyServerContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.util.thread.QueuedThreadPool; diff --git a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PathParamTest.java b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/PathParamTest.java similarity index 97% rename from jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PathParamTest.java rename to jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/PathParamTest.java index 84bf43b6e1c..ef5f78e1d8e 100644 --- a/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/jsr356/server/PathParamTest.java +++ b/jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/PathParamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.server; +package org.eclipse.jetty.websocket.javax.server; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BadFrame.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BadFrame.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java index 19931a4fe94..472d8ff5af4 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BadFrame.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BiConsumerServiceServlet.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BiConsumerServiceServlet.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java index 4b0881150c7..4d71ca22efc 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/BiConsumerServiceServlet.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CompletableFutureMethodHandle.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java similarity index 87% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CompletableFutureMethodHandle.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java index 19d6b29469e..866ac2fd794 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CompletableFutureMethodHandle.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; -import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CoreServer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CoreServer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java index f27d7f36a0e..16ca9d6e963 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/CoreServer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; @@ -32,8 +32,8 @@ import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.core.server.Negotiation; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameEcho; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.WholeMessageEcho; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameEcho; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.WholeMessageEcho; import java.io.IOException; import java.net.URI; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DataUtils.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DataUtils.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java index 1c81c53fc16..f82bb2e4960 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DataUtils.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DummyEndpoint.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DummyEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java index 56369e381a8..63788acf65a 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/DummyEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/FunctionMethod.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/FunctionMethod.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java index 2b5cae6859c..ca94c5984bd 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/FunctionMethod.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Fuzzer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Fuzzer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java index d921e7aca9e..83db9ef1fea 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Fuzzer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.toolchain.test.ByteBufferAssert; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalFuzzer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalFuzzer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java index dc6c90f5e41..3854d10bfc2 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalFuzzer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalServer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalServer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java index 1ad1bf9c609..04e56277bd2 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/LocalServer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.pathmap.PathSpec; @@ -39,7 +39,7 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.internal.Parser; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/MessageType.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/MessageType.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java index e306531e202..59a871b4306 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/MessageType.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; public enum MessageType { diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/NetworkFuzzer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/NetworkFuzzer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java index 006229547e1..13776a15e89 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/NetworkFuzzer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.io.IOException; import java.net.URI; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/ParserCapture.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/ParserCapture.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java index 64ccbc4fa9e..25b2f7bcba6 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/ParserCapture.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/RawFrameBuilder.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/RawFrameBuilder.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java index 30b74f11320..a80ed4db1d5 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/RawFrameBuilder.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/SessionMatchers.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java similarity index 82% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/SessionMatchers.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java index 58e693809ac..dff10303193 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/SessionMatchers.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.tests.matchers.IsMessageHandlerType; -import org.eclipse.jetty.websocket.jsr356.tests.matchers.IsMessageHandlerTypeRegistered; +import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerType; +import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerTypeRegistered; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import org.hamcrest.Matcher; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Sha1Sum.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Sha1Sum.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java index d9b2e59220c..8340647439a 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Sha1Sum.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.toolchain.test.Hex; import org.eclipse.jetty.toolchain.test.IO; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Timeouts.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Timeouts.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java index 38748a2cc36..90f43f40ed3 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/Timeouts.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.util.concurrent.TimeUnit; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UnitGenerator.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UnitGenerator.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java index 093557d8c1a..70a419daa37 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UnitGenerator.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UpgradeUtils.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UpgradeUtils.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java index 2fdabee51dd..292211683e7 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/UpgradeUtils.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.http.HttpHeader; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEndpointTracker.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEndpointTracker.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java index 11399c05f99..4fa44766a1c 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEndpointTracker.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEventTracker.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java similarity index 99% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEventTracker.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java index 599e38363c2..391a02cd51d 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSEventTracker.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSServer.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSServer.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java index 258c487df26..1303584b663 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSServer.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.plus.webapp.PlusConfiguration; @@ -32,7 +32,7 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration; import java.io.File; import java.io.IOException; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSURI.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSURI.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java index 23a34268738..472fecc69ee 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/WSURI.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests; +package org.eclipse.jetty.websocket.javax.tests; import java.net.URI; import java.net.URISyntaxException; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameEcho.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameEcho.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java index 25de37e4953..609001c7010 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameEcho.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.framehandlers; +package org.eclipse.jetty.websocket.javax.tests.framehandlers; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameHandlerTracker.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameHandlerTracker.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java index 1e7b79e3dcb..bf60f46fb7a 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/FrameHandlerTracker.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.framehandlers; +package org.eclipse.jetty.websocket.javax.tests.framehandlers; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/StaticText.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/StaticText.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java index f0caeae62c5..83134310874 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/StaticText.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.framehandlers; +package org.eclipse.jetty.websocket.javax.tests.framehandlers; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/WholeMessageEcho.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/WholeMessageEcho.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java index af4c4a9cfc2..47ba1e6e997 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/framehandlers/WholeMessageEcho.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.framehandlers; +package org.eclipse.jetty.websocket.javax.tests.framehandlers; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerType.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerType.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java index 89387eea5aa..decff03a7ad 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerType.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.matchers; +package org.eclipse.jetty.websocket.javax.tests.matchers; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.tests.MessageType; -import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.tests.MessageType; +import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils; import org.hamcrest.Description; import org.hamcrest.Factory; import org.hamcrest.TypeSafeMatcher; diff --git a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerTypeRegistered.java b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerTypeRegistered.java rename to jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java index 44cc336fb54..8a26a94ce43 100644 --- a/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/jsr356/tests/matchers/IsMessageHandlerTypeRegistered.java +++ b/jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.matchers; +package org.eclipse.jetty.websocket.javax.tests.matchers; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.RegisteredMessageHandler; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.tests.MessageType; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.RegisteredMessageHandler; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.tests.MessageType; import org.hamcrest.Description; import org.hamcrest.Factory; import org.hamcrest.TypeSafeMatcher; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AbstractClientSessionTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java similarity index 75% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AbstractClientSessionTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java index a042fdbf3b1..fcbf52a6c48 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AbstractClientSessionTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import javax.websocket.EndpointConfig; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponseAdapter; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.jsr356.tests.DummyEndpoint; +import org.eclipse.jetty.websocket.javax.tests.DummyEndpoint; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponseAdapter; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoClient.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoClient.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java index e3259fcff6f..f0430436c8d 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoClient.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java index 86de9a192ac..732460f5a4c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import org.eclipse.jetty.io.RuntimeIOException; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEndpointConfigTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEndpointConfigTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEndpointConfigTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEndpointConfigTest.java index f47aa59022c..646dd729d09 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/AnnotatedEndpointConfigTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEndpointConfigTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; -import org.eclipse.jetty.websocket.jsr356.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.jsr356.tests.coders.TimeEncoder; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/ConfiguratorTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/ConfiguratorTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java index 138f9c059d5..f282d1b7235 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/ConfiguratorTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEndpointTracker; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/CookiesTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/CookiesTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java index c3fb65b112e..0658e36883b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/CookiesTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import java.net.HttpCookie; import java.util.Collections; @@ -36,10 +36,10 @@ import javax.websocket.WebSocketContainer; import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.server.Negotiation; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; -import org.eclipse.jetty.websocket.jsr356.tests.DummyEndpoint; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.StaticText; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.WholeMessageEcho; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.DummyEndpoint; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.StaticText; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.WholeMessageEcho; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DecoderReaderManySmallTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DecoderReaderManySmallTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java index 57e0c5d648f..61a6ba11d88 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DecoderReaderManySmallTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.MessageHandler; import org.eclipse.jetty.websocket.core.server.Negotiation; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DelayedStartClientTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DelayedStartClientTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java index 0dea79b4fad..ce1970beba0 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/DelayedStartClientTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.LifeCycle; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/EndpointEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/EndpointEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java index 924359e5ee4..e5c65b01296 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/EndpointEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEndpointTracker; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientEchoTrackingSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientEchoTrackingSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java index bd2f9d9c9da..dec3471d235 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientEchoTrackingSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; -import org.eclipse.jetty.websocket.jsr356.tests.DataUtils; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientTrackingSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientTrackingSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java index 842619c5a63..325c036ef9a 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/JsrClientTrackingSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; -import org.eclipse.jetty.websocket.jsr356.tests.DataUtils; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/MessageReceivingTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/MessageReceivingTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java index a57435a0a06..88689761eef 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/MessageReceivingTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -28,9 +28,9 @@ import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.MessageHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.server.Negotiation; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; -import org.eclipse.jetty.websocket.jsr356.tests.DataUtils; -import org.eclipse.jetty.websocket.jsr356.util.TextUtil; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.javax.common.util.TextUtil; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/OnCloseTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java similarity index 80% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/OnCloseTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java index 116c9e8ba6a..74bfa1c32b8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/OnCloseTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -30,19 +30,19 @@ import javax.websocket.Session; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponseAdapter; -import org.eclipse.jetty.websocket.jsr356.client.EmptyClientEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; -import org.eclipse.jetty.websocket.jsr356.tests.client.samples.CloseReasonSessionSocket; -import org.eclipse.jetty.websocket.jsr356.tests.client.samples.CloseReasonSocket; -import org.eclipse.jetty.websocket.jsr356.tests.client.samples.CloseSessionReasonSocket; -import org.eclipse.jetty.websocket.jsr356.tests.client.samples.CloseSessionSocket; -import org.eclipse.jetty.websocket.jsr356.tests.client.samples.CloseSocket; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseReasonSocket; +import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSocket; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponseAdapter; +import org.eclipse.jetty.websocket.javax.client.EmptyClientEndpointConfig; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; +import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseReasonSessionSocket; +import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSessionReasonSocket; +import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSessionSocket; import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/SessionAddMessageHandlerTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java similarity index 62% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/SessionAddMessageHandlerTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java index c5608eb45ea..e949693610f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/SessionAddMessageHandlerTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client; +package org.eclipse.jetty.websocket.javax.tests.client; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -33,28 +33,28 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponseAdapter; -import org.eclipse.jetty.websocket.jsr356.client.EmptyClientEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientFrameHandlerFactory; -import org.eclipse.jetty.websocket.jsr356.tests.MessageType; -import org.eclipse.jetty.websocket.jsr356.tests.handlers.ByteArrayWholeHandler; -import org.eclipse.jetty.websocket.jsr356.tests.handlers.ByteBufferPartialHandler; -import org.eclipse.jetty.websocket.jsr356.tests.handlers.LongMessageHandler; -import org.eclipse.jetty.websocket.jsr356.tests.handlers.StringWholeHandler; +import org.eclipse.jetty.websocket.javax.tests.MessageType; +import org.eclipse.jetty.websocket.javax.tests.SessionMatchers; +import org.eclipse.jetty.websocket.javax.tests.handlers.ByteArrayWholeHandler; +import org.eclipse.jetty.websocket.javax.tests.handlers.ByteBufferPartialHandler; +import org.eclipse.jetty.websocket.javax.tests.handlers.LongMessageHandler; +import org.eclipse.jetty.websocket.javax.tests.handlers.StringWholeHandler; +import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponseAdapter; +import org.eclipse.jetty.websocket.javax.client.EmptyClientEndpointConfig; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientFrameHandlerFactory; +import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.eclipse.jetty.websocket.jsr356.tests.SessionMatchers.isMessageHandlerType; -import static org.eclipse.jetty.websocket.jsr356.tests.SessionMatchers.isMessageHandlerTypeRegistered; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; @@ -106,14 +106,14 @@ public class SessionAddMessageHandlerTest public void testMessageHandlerBinary() { session.addMessageHandler(new ByteBufferPartialHandler()); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.BINARY)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.TEXT))); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT))); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.BINARY), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.BINARY), instanceOf(ByteBufferPartialHandler.class) ) ) @@ -125,23 +125,23 @@ public class SessionAddMessageHandlerTest { session.addMessageHandler(new StringWholeHandler()); session.addMessageHandler(new ByteArrayWholeHandler()); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.BINARY)); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.TEXT)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY)); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.BINARY), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.BINARY), instanceOf(ByteArrayWholeHandler.class) ) ) ); assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.TEXT), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.TEXT), instanceOf(StringWholeHandler.class) ) ) @@ -157,15 +157,15 @@ public class SessionAddMessageHandlerTest session.removeMessageHandler(strHandler); // remove original TEXT handler session.addMessageHandler(new LongMessageHandler()); // add new TEXT handler - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.BINARY)); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.TEXT)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY)); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); // Final expected BINARY implementation assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.BINARY), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.BINARY), instanceOf(ByteArrayWholeHandler.class) ) ) @@ -173,9 +173,9 @@ public class SessionAddMessageHandlerTest // Final expected TEXT implementation assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.TEXT), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.TEXT), instanceOf(LongMessageHandler.class) ) ) @@ -192,15 +192,15 @@ public class SessionAddMessageHandlerTest session.addMessageHandler(new ByteArrayWholeHandler()); // add BINARY handler session.removeMessageHandler(lamdaHandler); // remove original TEXT handler - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.BINARY)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.TEXT))); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT))); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); // Final expected BINARY implementation assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.BINARY), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.BINARY), instanceOf(ByteArrayWholeHandler.class) ) ) @@ -212,15 +212,15 @@ public class SessionAddMessageHandlerTest { session.addMessageHandler(new StringWholeHandler()); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.BINARY))); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.TEXT)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); // Final expected TEXT implementation assertThat("session.messageHandlers", session.getMessageHandlers(), - hasItem( - allOf( - isMessageHandlerType(session, MessageType.TEXT), + Matchers.hasItem( + Matchers.allOf( + SessionMatchers.isMessageHandlerType(session, MessageType.TEXT), instanceOf(StringWholeHandler.class) ) ) @@ -238,9 +238,9 @@ public class SessionAddMessageHandlerTest // Whole Message session.addMessageHandler(String.class, (msg) -> received.add(msg)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.BINARY))); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.TEXT)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); frameHandler.onFrame(new Frame(OpCode.TEXT).setPayload("G'day").setFin(true), Callback.NOOP); frameHandler.onFrame(new Frame(OpCode.TEXT).setPayload("Hello World").setFin(true), Callback.NOOP); @@ -269,9 +269,9 @@ public class SessionAddMessageHandlerTest received.add(new Object[] { copy, isLast }); }); - assertThat("session", session, isMessageHandlerTypeRegistered(MessageType.BINARY)); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.TEXT))); - assertThat("session", session, not(isMessageHandlerTypeRegistered(MessageType.PONG))); + assertThat("session", session, SessionMatchers.isMessageHandlerTypeRegistered(MessageType.BINARY)); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.TEXT))); + assertThat("session", session, Matchers.not(SessionMatchers.isMessageHandlerTypeRegistered(MessageType.PONG))); frameHandler.onFrame(new Frame(OpCode.BINARY).setPayload("G'day").setFin(false), Callback.NOOP); frameHandler.onFrame(new Frame(OpCode.CONTINUATION).setPayload(" World").setFin(true), Callback.NOOP); diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java index 7b4d536c600..f7f84a933de 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.misbehaving; +package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/EndpointRuntimeOnOpen.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/EndpointRuntimeOnOpen.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java index fa8347cf801..c6b1b414db4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/EndpointRuntimeOnOpen.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.misbehaving; +package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; import javax.websocket.CloseReason; import javax.websocket.Endpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/MisbehavingClassTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/MisbehavingClassTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java index 93a73f35043..31dade99e9c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/misbehaving/MisbehavingClassTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.misbehaving; +package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.websocket.core.internal.WebSocketChannel; -import org.eclipse.jetty.websocket.jsr356.tests.CoreServer; +import org.eclipse.jetty.websocket.javax.tests.CoreServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseEndpointConfigSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java similarity index 92% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseEndpointConfigSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java index ca63ee3e55e..d3516a74d10 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseEndpointConfigSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java index 83cd2832996..05267522728 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java index fc4a0440cd4..3295e564ed0 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseReasonSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionReasonSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionReasonSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java index 2a1a75950e6..2f7c77fbdd4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionReasonSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java index d1cefcfa3a0..1e53fc7ea73 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java index 234d9567b6b..89b649f6e5b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/CloseSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/IntSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java similarity index 90% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/IntSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java index 25a102e7a77..e62919950e3 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/client/samples/IntSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.client.samples; +package org.eclipse.jetty.websocket.javax.tests.client.samples; -import org.eclipse.jetty.websocket.jsr356.tests.coders.BadDualDecoder; +import org.eclipse.jetty.websocket.javax.tests.coders.BadDualDecoder; import javax.websocket.ClientEndpoint; import javax.websocket.EncodeException; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableDecodersTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableDecodersTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java index 3b458c2c568..bfdd67b8636 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableDecodersTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.toolchain.test.Hex; -import org.eclipse.jetty.websocket.jsr356.BasicEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.decoders.IntegerDecoder; +import org.eclipse.jetty.websocket.javax.common.BasicEndpointConfig; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableEncodersTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableEncodersTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java index d417f1bd9bf..af92d5ba6cf 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/AvailableEncodersTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.toolchain.test.Hex; -import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; -import org.eclipse.jetty.websocket.jsr356.client.EmptyClientEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; -import org.eclipse.jetty.websocket.jsr356.encoders.IntegerEncoder; +import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException; +import org.eclipse.jetty.websocket.javax.client.EmptyClientEndpointConfig; +import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.javax.common.encoders.IntegerEncoder; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java index 509d21568a6..c3d68d7eff8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java index 6de82d29e86..44281cf9386 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/BadDualEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/CoderEventTracking.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/CoderEventTracking.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java index e82321f7d91..4c2707ba3e0 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/CoderEventTracking.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.Decoder; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java index 92162b32af2..e281c0ef7cf 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java index 4d73905a440..67e415fb379 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java index 8a248e30622..318c5998f3b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java index f5efedf1e40..12d544ebae4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DateTimeEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextStreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextStreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java index ca8709cc331..c12b59983ba 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextStreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.jsr356.CompletableFutureCallback; -import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; -import org.eclipse.jetty.websocket.jsr356.tests.FunctionMethod; -import org.eclipse.jetty.websocket.jsr356.tests.client.AbstractClientSessionTest; +import org.eclipse.jetty.websocket.javax.tests.FunctionMethod; +import org.eclipse.jetty.websocket.javax.common.CompletableFutureCallback; +import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.javax.tests.client.AbstractClientSessionTest; import org.junit.jupiter.api.Test; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java index 2ea2cc17723..1f53c68dbcc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/DecoderTextTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/EncoderTextTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/EncoderTextTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java index 3ad71deecf6..4cc4644f565 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/EncoderTextTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ExtDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ExtDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java index b8c02b6228e..73f1d010f5e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ExtDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Fruit.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Fruit.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java index 0708fd67c07..5e5b37f3438 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Fruit.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; public class Fruit { diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitBinaryEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitBinaryEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java index 11ecc71e085..60fdbedf111 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitBinaryEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java index 96e4903ce71..ed1c0494f1e 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/coders/tests/FruitDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.coders.tests; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.DecodeException; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitTextEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitTextEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java index c0cab3cf6db..6788342c519 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/FruitTextEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/IntegerDecoderTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java similarity index 90% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/IntegerDecoderTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java index b5e4ae47259..6da7d1cf571 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/IntegerDecoderTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; -import org.eclipse.jetty.websocket.jsr356.decoders.IntegerDecoder; +import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder; import org.junit.jupiter.api.Test; import javax.websocket.DecodeException; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Quotes.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Quotes.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java index b8e05128ca0..50dfd4840e5 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/Quotes.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import java.util.ArrayList; import java.util.List; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java index 0819707d946..1c3bb1525b5 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java index 41ecaa629fc..111af32bc3d 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesUtil.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesUtil.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java index bda477deb1e..adba61eab7c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/QuotesUtil.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java index 3a096a44b92..881a809ee28 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java index 77ceafb8c23..40cffac6639 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/TimeEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java index 2a2bce0a00f..342c0086d4f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.DecodeException; import javax.websocket.Decoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java index 6939ab0e15f..9471861a9ef 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/coders/ValidDualEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.coders; +package org.eclipse.jetty.websocket.javax.tests.coders; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/BaseMessageHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/BaseMessageHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java index 76298ba2933..487098c1769 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/BaseMessageHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayPartialHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java index 674c599bd90..3e9153f3279 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayPartialHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayWholeHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java index 7968fa3eb9f..159693600ce 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteArrayWholeHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferPartialHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java index d1b43e99b95..7cc96517fc8 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferPartialHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferWholeHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java index 718c56c245f..5eef2d28bd8 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ByteBufferWholeHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ComboMessageHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ComboMessageHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java index 9f30c375c46..0d4ac94a44c 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ComboMessageHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ExtendedMessageHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java similarity index 95% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ExtendedMessageHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java index 8f9c4722710..aa3140026e8 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ExtendedMessageHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.nio.ByteBuffer; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/InputStreamWholeHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/InputStreamWholeHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java index 91e7511e2f2..4c8b3cae6ce 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/InputStreamWholeHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.io.InputStream; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/LongMessageHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/LongMessageHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java index e8fae99726d..b405d00e7d5 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/LongMessageHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ReaderWholeHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ReaderWholeHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java index ce1187f514f..aaaafa46243 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/ReaderWholeHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; import java.io.Reader; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringPartialHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringPartialHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java index 8c4bac039b8..1ff5f149658 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringPartialHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringWholeHandler.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java similarity index 94% rename from jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringWholeHandler.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java index ed03ba26cbd..8983086151c 100644 --- a/jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/handlers/StringWholeHandler.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.handlers; +package org.eclipse.jetty.websocket.javax.tests.handlers; import javax.websocket.MessageHandler; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/Quotes.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/Quotes.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java index 5962774b67d..aed5e53abea 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/Quotes.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import java.util.ArrayList; import java.util.List; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java index 0a9b3af5f9b..8831e881638 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java index 874e9980810..aba5bed32b1 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import java.net.URI; import java.util.List; @@ -33,8 +33,8 @@ import javax.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTextStreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTextStreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java index 9fa1bb50265..2fd52791bd7 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesDecoderTextStreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoder.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoder.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java index 5e4125ed7a0..e011cc0bf2e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoder.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import javax.websocket.EncodeException; import javax.websocket.Encoder; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoderTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoderTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java index 16e3083ceca..d75816f3d75 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesEncoderTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java index 05ef38e1897..fab3800d285 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesUtil.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesUtil.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java index d526e5f3466..4d7fa557fff 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/quotes/QuotesUtil.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.quotes; +package org.eclipse.jetty.websocket.javax.tests.quotes; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java similarity index 87% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java index 58adc215096..4e6db4ad4dc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import java.util.HashMap; import java.util.Map; @@ -26,10 +26,10 @@ import javax.websocket.EndpointConfig; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.jsr356.client.EmptyClientEndpointConfig; -import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.javax.client.EmptyClientEndpointConfig; +import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainer; import org.eclipse.jetty.websocket.servlet.WebSocketCreatorMapping; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AltFilterTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java similarity index 92% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AltFilterTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java index f0155f91fea..69c4a20ebcf 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AltFilterTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; @@ -25,9 +25,9 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo.BasicEchoSocket; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AnnotatedServerEndpointTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java similarity index 87% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AnnotatedServerEndpointTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java index 3dd134a53de..65af363da6d 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/AnnotatedServerEndpointTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; @@ -24,13 +24,13 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.UpgradeUtils; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.jsr356.tests.coders.TimeEncoder; -import org.eclipse.jetty.websocket.jsr356.tests.server.configs.EchoSocketConfigurator; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.ConfiguredEchoSocket; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.UpgradeUtils; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.ConfiguredEchoSocket; +import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointConfigContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java index 1d1825d0e33..6e0bddcccc8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointConfigContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo.BasicEchoEndpoint; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoEndpoint; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java index a54121030a1..bf09f3d5585 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoEndpointContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.pong.PongMessageEndpoint; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketConfigContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketConfigContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java index d6cd36ac1e5..df0e3ef1658 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketConfigContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo.BasicEchoSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java similarity index 92% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java index 76992199068..3cdda653c36 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BasicEchoSocketContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo.BasicEchoSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BinaryStreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BinaryStreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java index 55d3438130e..fd7ad49dce8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/BinaryStreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.DataUtils; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ConfiguratorTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ConfiguratorTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java index 1eff480a798..646c4c7ffab 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ConfiguratorTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; @@ -27,10 +27,10 @@ import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.UpgradeRequest; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.server.internal.JavaxWebSocketCreator; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.Timeouts; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketCreator; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Timeouts; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/DeploymentExceptionTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java similarity index 83% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/DeploymentExceptionTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java index c5e1fec210c..83e86b02261 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/DeploymentExceptionTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import java.util.ArrayList; import java.util.List; @@ -30,14 +30,14 @@ import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainer; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidCloseIntSocket; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidErrorErrorSocket; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidErrorIntSocket; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidOpenCloseReasonSocket; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidOpenIntSocket; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.InvalidOpenSessionIntSocket; -import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidCloseIntSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorErrorSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorIntSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenCloseReasonSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenIntSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenSessionIntSocket; +import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException; import org.eclipse.jetty.websocket.servlet.WebSocketCreatorMapping; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/EndpointViaConfigTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/EndpointViaConfigTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java index 1f0f48a6660..02163338808 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/EndpointViaConfigTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; @@ -28,9 +28,9 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java similarity index 92% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java index 4cc6d1dd8b7..760cdc90360 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java similarity index 90% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java index 94ba9217435..1cd07add6b9 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/IdleTimeoutTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.IdleTimeoutOnOpenEndpoint; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.IdleTimeoutOnOpenSocket; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.IdleTimeoutOnOpenEndpoint; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.IdleTimeoutOnOpenSocket; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/InputStreamEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/InputStreamEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java index c51f3712f1e..c90e6b4a50a 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/InputStreamEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.Log; @@ -24,8 +24,8 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java similarity index 90% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java index d7d8d1bf219..2e5c34a466b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandler_OnMessage_TextStreamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import java.io.IOException; import java.io.Reader; @@ -35,12 +35,12 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; -import org.eclipse.jetty.websocket.jsr356.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; -import org.eclipse.jetty.websocket.jsr356.UpgradeResponseAdapter; -import org.eclipse.jetty.websocket.jsr356.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponse; +import org.eclipse.jetty.websocket.javax.common.UpgradeResponseAdapter; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JettyServerEndpointConfiguratorTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JettyServerEndpointConfiguratorTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java index 58e5ba669f5..7159133ba02 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JettyServerEndpointConfiguratorTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.server.ContainerDefaultConfigurator; +import org.eclipse.jetty.websocket.javax.server.ContainerDefaultConfigurator; import org.junit.jupiter.api.Test; import javax.websocket.server.ServerEndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrBatchModeTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrBatchModeTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java index 9443e2d3179..8bce312f8ef 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrBatchModeTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java index 64b0af6e138..f434c48e3dc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/JsrEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeAnnotatedTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeAnnotatedTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java index fe6f34f567d..2f74e36d9a5 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeAnnotatedTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; @@ -26,8 +26,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeContainerTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeContainerTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java index bc647cf85a4..75e3349163f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeContainerTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; @@ -26,8 +26,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeEchoContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeEchoContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java index d80e59469e5..a7ea716cccd 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/LargeEchoContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/MemoryUsageTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/MemoryUsageTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java index 6a3e7b6b34f..d11aa98195e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/MemoryUsageTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/OnMessageReturnTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/OnMessageReturnTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java index 57b4bf0456e..5d68bfaa4cc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/OnMessageReturnTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; @@ -26,8 +26,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PartialEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PartialEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java index f5fda913bd7..6a4b306482c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PartialEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.log.Log; @@ -24,9 +24,9 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PingPongTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PingPongTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java index 5acad367d64..53ebb42dd45 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PingPongTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.BufferUtil; @@ -28,9 +28,9 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.jsr356.tests.Timeouts; -import org.eclipse.jetty.websocket.jsr356.tests.WSServer; -import org.eclipse.jetty.websocket.jsr356.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.javax.tests.Timeouts; +import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongContextListener.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongContextListener.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java index a0da6a8a48f..172dc3c67b3 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongContextListener.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.pong.PongMessageEndpoint; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java index 8c5142e5600..d21c1722825 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PongSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesBinaryEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesBinaryEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java index 28a0d260858..f94f8329666 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesBinaryEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.Hex; import org.eclipse.jetty.util.log.Log; @@ -24,8 +24,8 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesTextEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesTextEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java index 6755babf396..1f334f8d8c6 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/PrimitivesTextEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ReaderEchoTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ReaderEchoTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java index 36081043bb4..b9653ba629f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/ReaderEchoTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.Log; @@ -24,8 +24,8 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java similarity index 98% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java index 64f63c12b33..d73c76b03bc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTrackingTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTrackingTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java index 03d5c96d0b6..248bb6ac5dd 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/SessionTrackingTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/StreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java similarity index 97% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/StreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java index e8001ca3a22..36e17122d76 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/StreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; -import org.eclipse.jetty.websocket.jsr356.tests.Sha1Sum; +import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Sha1Sum; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/TextStreamTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/TextStreamTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java index ef66d6b67d5..af6815deda7 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/TextStreamTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.DataUtils; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/UriTemplateParameterTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/UriTemplateParameterTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java index 9f676c907ca..c96b4aa4e75 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/UriTemplateParameterTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.jsr356.tests.Fuzzer; -import org.eclipse.jetty.websocket.jsr356.tests.LocalServer; +import org.eclipse.jetty.websocket.javax.tests.Fuzzer; +import org.eclipse.jetty.websocket.javax.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/WebSocketServerContainerExecutorTest.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/WebSocketServerContainerExecutorTest.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java index 29bd83cd471..cf1dcbcc9db 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/WebSocketServerContainerExecutorTest.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server; +package org.eclipse.jetty.websocket.javax.tests.server; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainer; -import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; -import org.eclipse.jetty.websocket.jsr356.tests.WSURI; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.tests.WSURI; import org.junit.jupiter.api.Test; import javax.servlet.ServletException; @@ -49,7 +49,7 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.concurrent.Executor; -import static org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer.HTTPCLIENT_ATTRIBUTE; +import static org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer.HTTPCLIENT_ATTRIBUTE; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/configs/EchoSocketConfigurator.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/configs/EchoSocketConfigurator.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java index b93ac930b8d..559cb7b52da 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/configs/EchoSocketConfigurator.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.configs; +package org.eclipse.jetty.websocket.javax.tests.server.configs; import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java index b20a0bd6a79..28bc598726b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java index c8c327a619a..1e26ea9dec2 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java index 6a696ac02a2..c81dfc74bae 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseReasonSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSessionReasonSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSessionReasonSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java index 2a0fa5cf73a..1e5fc256ee4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSessionReasonSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java index c1d5858fc0e..e1c0b9774d4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicCloseSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnClose; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicEchoSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicEchoSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java index 3171bbfafec..2161ecf92e4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicEchoSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java index 7050a83d45c..bb8d5435aaa 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionThrowableSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionThrowableSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java index 342f2def803..9348c769d57 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSessionThrowableSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java index 476b94fbc53..ff66d07319f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java index d0237c7f820..08cbd51c3e5 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java index a8542baf6a5..c3fa077a7fa 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicErrorThrowableSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java index 09994b48777..112959b60fd 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java index 40edc341d46..b594ff2b515 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenCloseSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnClose; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java index 7e82e24ca51..c7bbc9ef580 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnOpen; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java index 0693fbfe78c..67c79f7a9da 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicOpenSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnOpen; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicPongMessageSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicPongMessageSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java index 8abb9f91606..f814f84a4f1 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicPongMessageSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.PongMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicTextMessageStringSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicTextMessageStringSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java index 81de42a47b6..3f822009fa9 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/BasicTextMessageStringSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ByteBufferSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ByteBufferSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java index eaa724ccb90..b128c22be85 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ByteBufferSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ConfiguredEchoSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java similarity index 92% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ConfiguredEchoSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java index 382b471dd4f..989183cbba6 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/ConfiguredEchoSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; -import org.eclipse.jetty.websocket.jsr356.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.jsr356.tests.coders.TimeEncoder; -import org.eclipse.jetty.websocket.jsr356.tests.server.configs.EchoSocketConfigurator; +import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; +import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator; import javax.websocket.EndpointConfig; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/DateTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java similarity index 91% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/DateTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java index 0146b38ad61..ed26c1128f0 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/DateTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.jsr356.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.jsr356.tests.coders.DateEncoder; +import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.javax.tests.coders.DateEncoder; import javax.websocket.OnError; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java index 8f7791d349c..9c451cb90a6 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java index d8279318a8f..b3565c8e1bf 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/IdleTimeoutOnOpenSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.OnOpen; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidCloseIntSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidCloseIntSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java index 39613e3d3bf..550cc5db231 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidCloseIntSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnClose; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorErrorSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorErrorSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java index 841c6e04f12..6d86833d8e8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorErrorSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorIntSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorIntSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java index 5825ca7aac7..7783d0fc956 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidErrorIntSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnError; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenCloseReasonSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenCloseReasonSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java index 4e017f5e713..856fb51ce04 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenCloseReasonSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import javax.websocket.OnOpen; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenIntSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenIntSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java index 43f8198ab7d..f3b59d82a3a 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenIntSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnOpen; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenSessionIntSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenSessionIntSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java index 60f9b9eadeb..9d8c31cf080 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/InvalidOpenSessionIntSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnOpen; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/StatelessTextMessageStringSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/StatelessTextMessageStringSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java index 8865ce9428e..747bf019714 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/StatelessTextMessageStringSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/TrackingSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/TrackingSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java index 2bc16a19c82..e7b9117528c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/TrackingSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets; +package org.eclipse.jetty.websocket.javax.tests.server.sockets; import javax.websocket.CloseReason; import java.util.concurrent.BlockingQueue; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/binary/ByteBufferSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/binary/ByteBufferSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java index 041455270a3..46520e5ee80 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/binary/ByteBufferSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.binary; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.binary; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoEndpoint.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java index 2a51ffee33c..f8ebccd2bc7 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java index 11d960b3e76..5c2d4073129 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/BasicEchoSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoAsyncTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoAsyncTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java index bc11ed80a1a..45d36ba2e27 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoAsyncTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.OnOpen; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoBasicTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoBasicTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java index 85e8793cfd7..dc40dcc6c74 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoBasicTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.CloseReason; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnEndpoint.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java index 1420ee5ae88..812ccd4759e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.CloseReason; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java similarity index 93% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java index 8119393e90d..25efaf7357e 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoReturnTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java index 2836098f761..959f2116853 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java index be14278a3e3..e393c9c05f4 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.CloseReason; import javax.websocket.OnMessage; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoConfiguredSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoConfiguredSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java index 0dd0ebaacf9..c15d383f4fc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoConfiguredSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.OnOpen; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoDefaultSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoDefaultSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java index c1f7b3edd94..2bde16ae4fb 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/echo/LargeEchoDefaultSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java index 33855212d67..3e25d6be2a7 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.idletimeout; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout; import javax.websocket.Endpoint; import javax.websocket.EndpointConfig; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java similarity index 94% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java index 09e58499047..c8ab03c426c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.idletimeout; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout; import javax.websocket.OnMessage; import javax.websocket.OnOpen; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSessionSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSessionSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java index 75d7af06a4a..c0042225eff 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSessionSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java index d282075fc75..256c51f0281 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTrackingSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java similarity index 88% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTrackingSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java index 4526cd326a6..256e26771da 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/partial/PartialTrackingSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; -import org.eclipse.jetty.websocket.jsr356.tests.server.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.javax.tests.server.sockets.TrackingSocket; import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/pong/PongMessageEndpoint.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/pong/PongMessageEndpoint.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java index 1053de16a47..c8a1cde506b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/pong/PongMessageEndpoint.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.pong; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.pong; import org.eclipse.jetty.util.BufferUtil; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java index 0f12bbfa0cc..ae8440d96e6 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java index d27b5656788..0c7fb988bd1 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextParamSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextParamSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java index d7b5e4c44ab..402597fa32f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextParamSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java index 9fabea0c648..8b55d4f72d3 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/BooleanTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java index 102ad11cece..9a2cc711989 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java index 022e6a89f50..594ad578d17 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ByteTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java index 7c703cb8045..02cd1a2bbcc 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharacterObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharacterObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java index 3f1aa4f0204..363ae4f6ad9 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/CharacterObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java index c33bb10d5dc..6656fb79e9b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java index a457936b562..6db0f9abdec 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/DoubleTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java index e58a2b2a6dd..afb0a2fddc1 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java index b02cc9a33ed..4de5ec7ef0b 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/FloatTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntParamTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntParamTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java index 0c58d9d11da..0dbcf8de1bb 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntParamTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java index cd8ec3b030d..ff02537f4ce 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java index 93b0c07bb40..e3cd14f9a36 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java index 5ce0cfbc592..a5087fd1a2f 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/IntegerObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java index f3b635be2d2..71b6093e2b9 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java index a3b74467246..866783b5429 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/LongTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortObjectTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortObjectTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java index f5f3cdd24a2..e8f23d4c399 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortObjectTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortTextSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortTextSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java index 6485bb7482b..1ce333360c0 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/primitives/ShortTextSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.log.Log; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/InputStreamSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/InputStreamSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java index d88fa68e26e..758490eaac8 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/InputStreamSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderParamSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderParamSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java index 67bbd44b093..7e808655ea2 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderParamSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java similarity index 95% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java index 5379cf49205..59da07e135a 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/ReaderSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/StringReturnReaderParamSocket.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java similarity index 96% rename from jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/StringReturnReaderParamSocket.java rename to jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java index 7a438fc94cf..be66ea31c08 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/jsr356/tests/server/sockets/streaming/StringReturnReaderParamSocket.java +++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.jsr356.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml b/jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml index fc55a585a25..2daa96edb6c 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml +++ b/jetty-websocket/javax-websocket-tests/src/test/resources/basic-echo-endpoint-config-web.xml @@ -7,6 +7,6 @@ version="3.0"> - org.eclipse.jetty.websocket.jsr356.tests.server.EndpointViaConfigTest$BasicEchoEndpointConfigContextListener + org.eclipse.jetty.websocket.javax.tests.server.EndpointViaConfigTest$BasicEchoEndpointConfigContextListener \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml b/jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml index bb72f178c20..ecb89d2acd2 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml +++ b/jetty-websocket/javax-websocket-tests/src/test/resources/idle-timeout-config-web.xml @@ -7,6 +7,6 @@ version="3.0"> - org.eclipse.jetty.websocket.jsr356.tests.server.IdleTimeoutContextListener + org.eclipse.jetty.websocket.javax.tests.server.IdleTimeoutContextListener \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml b/jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml index 66ac49090d5..c4dfacddef3 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml +++ b/jetty-websocket/javax-websocket-tests/src/test/resources/large-echo-config-web.xml @@ -7,6 +7,6 @@ version="3.0"> - org.eclipse.jetty.websocket.jsr356.tests.server.LargeContainerTest$LargeEchoContextListener + org.eclipse.jetty.websocket.javax.tests.server.LargeContainerTest$LargeEchoContextListener \ No newline at end of file diff --git a/jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml b/jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml index 87e6fb61bb2..aa16c7af156 100644 --- a/jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml +++ b/jetty-websocket/javax-websocket-tests/src/test/resources/pong-config-web.xml @@ -7,6 +7,6 @@ version="3.0"> - org.eclipse.jetty.websocket.jsr356.tests.server.PingPongTest$PongContextListener + org.eclipse.jetty.websocket.javax.tests.server.PingPongTest$PongContextListener \ No newline at end of file