From 1eea4807646f0afe0ec986a60f12e1d506d134b7 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 11 Aug 2022 12:07:17 +0200 Subject: [PATCH] Jetty 12 module renaming - jetty-websocket. Signed-off-by: Simone Bordet --- jetty-bom/pom.xml | 6 ++--- jetty-core/jetty-bom/pom.xml | 6 ++--- .../pom.xml | 6 ++--- .../src/main/java/module-info.java | 0 .../core/client/CoreClientUpgradeRequest.java | 0 .../core/client/UpgradeListener.java | 0 .../core/client/WebSocketCoreClient.java | 0 .../client/internal/HttpClientProvider.java | 0 .../client/internal/HttpUpgraderOverHTTP.java | 0 .../internal/HttpUpgraderOverHTTP2.java | 0 .../internal/XmlHttpClientProvider.java | 1 - .../pom.xml | 4 ++-- .../src/main/java/module-info.java | 0 .../websocket/core/AbstractExtension.java | 0 .../jetty/websocket/core/Behavior.java | 0 .../jetty/websocket/core/CloseStatus.java | 0 .../jetty/websocket/core/Configuration.java | 0 .../jetty/websocket/core/CoreSession.java | 0 .../jetty/websocket/core/Extension.java | 0 .../jetty/websocket/core/ExtensionConfig.java | 0 .../eclipse/jetty/websocket/core/Frame.java | 0 .../jetty/websocket/core/FrameHandler.java | 0 .../jetty/websocket/core/IncomingFrames.java | 0 .../eclipse/jetty/websocket/core/OpCode.java | 0 .../jetty/websocket/core/OutgoingFrames.java | 0 .../websocket/core/WebSocketComponents.java | 0 .../websocket/core/WebSocketConstants.java | 0 .../core/WebSocketExtensionRegistry.java | 0 .../core/exception/BadPayloadException.java | 0 .../core/exception/CloseException.java | 0 .../DuplicateAnnotationException.java | 0 .../exception/InvalidSignatureException.java | 0 .../exception/InvalidWebSocketException.java | 0 .../exception/MessageTooLargeException.java | 0 .../core/exception/ProtocolException.java | 0 .../core/exception/UpgradeException.java | 0 .../core/exception/WebSocketException.java | 0 .../exception/WebSocketTimeoutException.java | 0 .../WebSocketWriteTimeoutException.java | 0 .../websocket/core/internal/DemandChain.java | 0 .../core/internal/DemandingFlusher.java | 0 .../core/internal/ExtensionStack.java | 0 .../core/internal/FragmentExtension.java | 0 .../core/internal/FragmentingFlusher.java | 0 .../core/internal/FrameCaptureExtension.java | 0 .../websocket/core/internal/FrameEntry.java | 0 .../websocket/core/internal/FrameFlusher.java | 0 .../core/internal/FrameSequence.java | 0 .../websocket/core/internal/Generator.java | 0 .../core/internal/IdentityExtension.java | 0 .../core/internal/MessageHandler.java | 0 .../websocket/core/internal/Negotiated.java | 0 .../core/internal/NullAppendable.java | 0 .../jetty/websocket/core/internal/Parser.java | 0 .../internal/PerMessageDeflateExtension.java | 0 .../core/internal/TransformingFlusher.java | 0 .../core/internal/ValidationExtension.java | 0 .../core/internal/WebSocketConnection.java | 0 .../core/internal/WebSocketCore.java | 0 .../core/internal/WebSocketCoreSession.java | 0 .../core/internal/WebSocketSessionState.java | 0 .../messages/AbstractMessageSink.java | 0 .../messages/ByteArrayMessageSink.java | 0 .../messages/ByteBufferMessageSink.java | 0 .../messages/DispatchedMessageSink.java | 0 .../messages/InputStreamMessageSink.java | 0 .../internal/messages/MessageInputStream.java | 0 .../messages/MessageOutputStream.java | 0 .../core/internal/messages/MessageReader.java | 0 .../core/internal/messages/MessageSink.java | 0 .../core/internal/messages/MessageWriter.java | 0 .../messages/PartialByteArrayMessageSink.java | 0 .../PartialByteBufferMessageSink.java | 0 .../messages/PartialStringMessageSink.java | 0 .../internal/messages/ReaderMessageSink.java | 0 .../internal/messages/StringMessageSink.java | 0 .../core/internal/util/FrameValidation.java | 0 .../core/internal/util/InvokerUtils.java | 0 .../core/internal/util/ReflectUtils.java | 0 .../core/internal/util/TextUtils.java | 0 ...org.eclipse.jetty.websocket.core.Extension | 0 .../pom.xml | 6 ++--- .../src/main/config/modules/websocket.mod | 0 .../src/main/java/module-info.java | 0 .../core/server/FrameHandlerFactory.java | 0 .../websocket/core/server/Handshaker.java | 0 .../core/server/ServerUpgradeRequest.java | 0 .../core/server/ServerUpgradeResponse.java | 0 .../core/server/WebSocketCreator.java | 0 .../core/server/WebSocketMappings.java | 0 .../core/server/WebSocketNegotiation.java | 0 .../core/server/WebSocketNegotiator.java | 0 .../server/WebSocketServerComponents.java | 0 .../core/server/WebSocketUpgradeHandler.java | 0 .../server/internal/AbstractHandshaker.java | 0 .../server/internal/CreatorNegotiator.java | 0 .../server/internal/HandshakerSelector.java | 0 .../server/internal/HttpFieldsWrapper.java | 0 .../server/internal/RFC6455Handshaker.java | 0 .../server/internal/RFC6455Negotiation.java | 0 .../server/internal/RFC8441Handshaker.java | 0 .../server/internal/RFC8441Negotiation.java | 0 .../internal/WebSocketHttpFieldsWrapper.java | 0 .../fuzzingclient.json | 0 .../fuzzingserver.json | 0 .../pom.xml | 10 ++++---- .../jetty/websocket/core/AcceptHashTest.java | 0 .../websocket/core/AutoFragmentTest.java | 0 .../websocket/core/CapturedHexPayloads.java | 0 .../jetty/websocket/core/CloseStatusTest.java | 0 .../jetty/websocket/core/DemandTest.java | 0 .../core/DemandingIncomingFramesCapture.java | 0 .../websocket/core/EchoFrameHandler.java | 0 .../jetty/websocket/core/FlushTest.java | 0 .../jetty/websocket/core/FrameBufferTest.java | 0 .../core/GeneratorFrameFlagsTest.java | 0 .../core/GeneratorParserRoundTripTest.java | 0 .../jetty/websocket/core/GeneratorTest.java | 0 .../websocket/core/IncomingFramesCapture.java | 0 .../websocket/core/MessageHandlerTest.java | 0 .../jetty/websocket/core/OpCodeTest.java | 0 .../websocket/core/OutgoingFramesCapture.java | 0 .../core/OutgoingNetworkBytesCapture.java | 0 .../core/ParsePayloadLengthTest.java | 0 .../core/ParserBadCloseStatusCodesTest.java | 0 .../websocket/core/ParserBadOpCodesTest.java | 0 .../jetty/websocket/core/ParserCapture.java | 0 .../core/ParserGoodCloseStatusCodesTest.java | 0 .../websocket/core/ParserReservedBitTest.java | 0 .../jetty/websocket/core/ParserTest.java | 0 .../jetty/websocket/core/RawFrameBuilder.java | 0 .../core/SynchronousFrameHandler.java | 0 .../websocket/core/TestAsyncFrameHandler.java | 0 .../websocket/core/TestFrameHandler.java | 0 .../websocket/core/TestMessageHandler.java | 0 .../core/TestWebSocketNegotiator.java | 0 .../jetty/websocket/core/Timeouts.java | 0 .../UpgradeWithLeftOverHttpBytesTest.java | 0 .../websocket/core/WebSocketCloseTest.java | 0 .../websocket/core/WebSocketEchoTest.java | 0 .../websocket/core/WebSocketFrameTest.java | 0 .../core/WebSocketNegotiationTest.java | 0 .../websocket/core/WebSocketOpenTest.java | 0 .../jetty/websocket/core/WebSocketServer.java | 0 .../core/WebSocketServerComponentsTest.java | 0 .../jetty/websocket/core/WebSocketTester.java | 0 .../core/WebSocketUpgradeHandlerTest.java | 0 .../core/autobahn/AutobahnFrameHandler.java | 0 .../core/autobahn/AutobahnTests.java | 0 .../core/autobahn/CoreAutobahnClient.java | 0 .../core/autobahn/CoreAutobahnServer.java | 0 .../core/chat/ChatWebSocketClient.java | 0 .../core/chat/ChatWebSocketServer.java | 0 .../client/WebSocketClientServerTest.java | 0 .../extensions/AbstractExtensionTest.java | 0 .../core/extensions/ExtensionConfigTest.java | 0 .../core/extensions/ExtensionStackTest.java | 0 .../core/extensions/ExtensionTool.java | 0 .../extensions/FragmentExtensionTest.java | 0 .../extensions/IdentityExtensionTest.java | 0 .../PerMessageDeflateExtensionTest.java | 0 .../PerMessageDeflaterBufferSizeTest.java | 0 .../PermessageDeflateDemandTest.java | 0 .../extensions/ValidationExtensionTest.java | 0 .../core/internal/FrameFlusherTest.java | 0 .../websocket/core/internal/MockEndpoint.java | 0 .../websocket/core/proxy/WebSocketProxy.java | 0 .../core/proxy/WebSocketProxyTest.java | 0 .../core/server/WebSocketServerTest.java | 0 .../core/util/MessageReaderTest.java | 0 .../core/util/MessageWriterTest.java | 0 .../util/PartialStringMessageSinkTest.java | 0 .../core/util/StringMessageSinkTest.java | 0 .../test/resources/jetty-logging.properties | 0 .../src/test/resources/keystore.p12 | Bin jetty-core/jetty-websocket/pom.xml | 10 ++++---- jetty-ee10/jetty-ee10-home/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../config/modules/ee10-websocket-jakarta.mod | 6 ++--- .../tests/JakartaClientClassLoaderTest.java | 8 +++---- ...rtaClientShutdownWithServerWebAppTest.java | 8 +++---- .../jetty-ee10-websocket-jetty-client/pom.xml | 2 +- .../jetty-ee10-websocket-jetty-common/pom.xml | 2 +- .../tests/JettyClientClassLoaderTest.java | 10 ++++---- .../jetty-ee10-websocket-servlet/pom.xml | 2 +- jetty-ee8/jetty-ee8-home/pom.xml | 2 +- .../jetty-ee8-websocket-javax-client/pom.xml | 2 +- .../jetty-ee8-websocket-javax-common/pom.xml | 2 +- .../main/config/modules/websocket-jakarta.mod | 6 ++--- .../jetty-ee8-websocket-jetty-client/pom.xml | 2 +- .../config/modules/websocket-jetty-client.mod | 4 ++-- .../jetty-ee8-websocket-jetty-common/pom.xml | 2 +- .../main/config/modules/websocket-jetty.mod | 4 ++-- .../jetty-ee8-websocket-servlet/pom.xml | 2 +- jetty-ee9/jetty-ee9-home/pom.xml | 2 +- .../jetty/ee9/osgi/test/TestOSGiUtil.java | 22 +++++++++--------- .../pom.xml | 2 +- .../pom.xml | 2 +- .../config/modules/ee9-websocket-jakarta.mod | 6 ++--- .../tests/JakartaClientClassLoaderTest.java | 8 +++---- ...rtaClientShutdownWithServerWebAppTest.java | 8 +++---- .../jetty-ee9-websocket-jetty-client/pom.xml | 2 +- .../modules/ee9-websocket-jetty-client.mod | 4 ++-- .../jetty-ee9-websocket-jetty-common/pom.xml | 2 +- .../config/modules/ee9-websocket-jetty.mod | 4 ++-- .../tests/JettyClientClassLoaderTest.java | 10 ++++---- .../jetty-ee9-websocket-servlet/pom.xml | 2 +- pom.xml | 6 ++--- .../test-jpms-websocket-core/pom.xml | 4 ++-- 210 files changed, 101 insertions(+), 102 deletions(-) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/pom.xml (89%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/module-info.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java (100%) rename jetty-core/jetty-websocket/{websocket-core-client => jetty-websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java (97%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/pom.xml (94%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/module-info.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Extension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Frame.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java (100%) rename jetty-core/jetty-websocket/{websocket-core-common => jetty-websocket-core-common}/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/pom.xml (83%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/config/modules/websocket.mod (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/module-info.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java (100%) rename jetty-core/jetty-websocket/{websocket-core-server => jetty-websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/fuzzingclient.json (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/fuzzingserver.json (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/pom.xml (93%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/resources/jetty-logging.properties (100%) rename jetty-core/jetty-websocket/{websocket-core-tests => jetty-websocket-core-tests}/src/test/resources/keystore.p12 (100%) diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 3fa054856d4..36736735df0 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -449,17 +449,17 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server 12.0.0-SNAPSHOT diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index 7b3c1fd22e2..9db0553e0d5 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -315,17 +315,17 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client 12.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server 12.0.0-SNAPSHOT diff --git a/jetty-core/jetty-websocket/websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml similarity index 89% rename from jetty-core/jetty-websocket/websocket-core-client/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index e3700778439..74b454fee95 100644 --- a/jetty-core/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-client + jetty-websocket-core-client Jetty Core :: Websocket :: Core :: Client @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java diff --git a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java similarity index 97% rename from jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java rename to jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java index 04b5169d5af..1a03bd91e46 100644 --- a/jetty-core/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java @@ -16,7 +16,6 @@ package org.eclipse.jetty.websocket.core.client.internal; import java.net.URL; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.xml.XmlConfiguration; import org.slf4j.Logger; diff --git a/jetty-core/jetty-websocket/websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml similarity index 94% rename from jetty-core/jetty-websocket/websocket-core-common/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index f6ae7b2817f..13678f42736 100644 --- a/jetty-core/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-common + jetty-websocket-core-common Jetty Core :: Websocket :: Core :: Common diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandChain.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/DemandingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/FrameValidation.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java diff --git a/jetty-core/jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension rename to jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension diff --git a/jetty-core/jetty-websocket/websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml similarity index 83% rename from jetty-core/jetty-websocket/websocket-core-server/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index 8785e5711d6..d362a92c5e2 100644 --- a/jetty-core/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-server + jetty-websocket-core-server Jetty Core :: Websocket :: Core :: Server @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/module-info.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/module-info.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/module-info.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HttpFieldsWrapper.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java diff --git a/jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java rename to jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/WebSocketHttpFieldsWrapper.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/fuzzingclient.json b/jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingclient.json similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/fuzzingclient.json rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingclient.json diff --git a/jetty-core/jetty-websocket/websocket-core-tests/fuzzingserver.json b/jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingserver.json similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/fuzzingserver.json rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/fuzzingserver.json diff --git a/jetty-core/jetty-websocket/websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml similarity index 93% rename from jetty-core/jetty-websocket/websocket-core-tests/pom.xml rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index 4b182fc3a9d..ebd4d420d74 100644 --- a/jetty-core/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -2,12 +2,12 @@ org.eclipse.jetty.websocket - websocket + jetty-websocket 12.0.0-SNAPSHOT 4.0.0 - websocket-core-tests + jetty-websocket-core-tests Jetty Core :: Websocket :: Core :: Tests @@ -17,15 +17,15 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/DemandingIncomingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/UpgradeWithLeftOverHttpBytesTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketEchoTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServerComponentsTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PermessageDeflateDemandTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12 b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/keystore.p12 similarity index 100% rename from jetty-core/jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12 rename to jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/resources/keystore.p12 diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index c02c2385abd..74bc5c3c6c0 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -8,15 +8,15 @@ 4.0.0 org.eclipse.jetty.websocket - websocket + jetty-websocket pom Jetty Core :: WebSocket - websocket-core-client - websocket-core-common - websocket-core-server - websocket-core-tests + jetty-websocket-core-client + jetty-websocket-core-common + jetty-websocket-core-server + jetty-websocket-core-tests diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 69fe6ac7793..230eab74f01 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -281,7 +281,7 @@ org.eclipse.jetty.ee10 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket jar ${assembly-directory}/lib diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index 6a144429414..69feeef2113 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -29,7 +29,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index e8af39f1370..9ddc3c0aad5 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod index c259347aecf..714514cc639 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod @@ -12,9 +12,9 @@ client ee10-annotations [lib] -lib/ee10-websocket/websocket-core-common-${jetty.version}.jar -lib/ee10-websocket/websocket-core-client-${jetty.version}.jar -lib/ee10-websocket/websocket-core-server-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/ee10-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar lib/ee10-websocket/jakarta.websocket-client-api-2.1.0.jar lib/ee10-websocket/jakarta.websocket-api-2.1.0.jar diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index 49926a76eb4..2751cd53ed9 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -144,11 +144,11 @@ public class JakartaClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-javax-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-javax-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java index dfc862bc71b..0c94fd44a1b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java @@ -93,11 +93,11 @@ public class JakartaClientShutdownWithServerWebAppTest // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-jakarta-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-jakarta-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml index 0d873564051..21893f7b70b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml @@ -45,7 +45,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml index 53bf3c3c14e..ceb57724bd2 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-common/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java index 7bae3318af6..885a429676b 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java @@ -162,12 +162,12 @@ public class JettyClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(WebSocketPolicy.class, "websocket-jetty-api.jar"); - app.copyLib(WebSocketClient.class, "websocket-jetty-client.jar"); - app.copyLib(WebSocketSession.class, "websocket-jetty-common.jar"); + app.copyLib(WebSocketPolicy.class, "jetty-ee10-websocket-jetty-api.jar"); + app.copyLib(WebSocketClient.class, "jetty-ee10-websocket-jetty-client.jar"); + app.copyLib(WebSocketSession.class, "jetty-ee10-websocket-jetty-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index 1f7454673f6..3d2272d8a7f 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee10 diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index 37f74bd49da..0d2535f8fa1 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -280,7 +280,7 @@ org.eclipse.jetty.ee8 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket jar ${assembly-directory}/lib diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index 4e72632bdcf..6614968e8df 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -27,7 +27,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index c3684b58fd0..467ba96fb42 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -40,7 +40,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/websocket-jakarta.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/websocket-jakarta.mod index 1939cb8afee..322d35417c6 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/websocket-jakarta.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/websocket-jakarta.mod @@ -13,9 +13,9 @@ client annotations [lib] -lib/websocket/websocket-core-common-${jetty.version}.jar -lib/websocket/websocket-core-client-${jetty.version}.jar -lib/websocket/websocket-core-server-${jetty.version}.jar +lib/websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/websocket/jetty-websocket-core-server-${jetty.version}.jar lib/websocket/websocket-servlet-${jetty.version}.jar lib/websocket/jetty-jakarta-websocket-api-2.0.0.jar lib/websocket/websocket-jakarta-client-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index d40dfd4320a..d73f29e8021 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod index 78420f79fb4..8c1fcf635e4 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod @@ -11,8 +11,8 @@ client annotations [lib] -lib/websocket/websocket-core-common-${jetty.version}.jar -lib/websocket/websocket-core-client-${jetty.version}.jar +lib/websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/websocket/jetty-websocket-core-client-${jetty.version}.jar lib/websocket/websocket-jetty-api-${jetty.version}.jar lib/websocket/websocket-jetty-common-${jetty.version}.jar lib/websocket/websocket-jetty-client-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index dca01aaf591..9c8c6329d43 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod index 3e917534979..84ac0354df9 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/websocket-jetty.mod @@ -8,8 +8,8 @@ websocket annotations [lib] -lib/websocket/websocket-core-common-${jetty.version}.jar -lib/websocket/websocket-core-server-${jetty.version}.jar +lib/websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/websocket/jetty-websocket-core-server-${jetty.version}.jar lib/websocket/websocket-servlet-${jetty.version}.jar lib/websocket/websocket-jetty-api-${jetty.version}.jar lib/websocket/websocket-jetty-common-${jetty.version}.jar diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index 4e8c38b05a5..5301c8ffe06 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee8 diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 1a65dc80e29..db24d4a1fe7 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -291,7 +291,7 @@ org.eclipse.jetty.ee9 - websocket-core-client,websocket-core-common,websocket-core-server + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket jar ${assembly-directory}/lib diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java index 94fb8d1b562..b88c4e87a61 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java @@ -197,18 +197,18 @@ public class TestOSGiUtil res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-jndi").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-plus").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-annotations").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-servlet").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-api").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-server").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-client").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jetty-common").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-jakarta-websocket-api").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-server").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-client").versionAsInProject().noStart()); - res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jakarta-common").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-server").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-client").versionAsInProject().noStart()); + res.add(mavenBundle().groupId("org.eclipse.jetty.ee9.websocket").artifactId("jetty-ee9-websocket-jakarta-common").versionAsInProject().noStart()); res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-ee9-osgi-boot").versionAsInProject().start()); } diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 7b44601c9e3..ae92d9a235d 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index 2cda6dd54b8..23b1c884adb 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -39,7 +39,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.slf4j diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod index 2536caeb889..d09efb7647f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod @@ -12,9 +12,9 @@ client ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-client-${jetty.version}.jar -lib/ee9-websocket/websocket-core-server-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar lib/ee9-websocket/jetty-jakarta-websocket-api-2.0.0.jar lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index 73dbb21f4ed..d480cd6ef95 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -144,11 +144,11 @@ public class JakartaClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-javax-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-javax-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java index a95dd6dff87..b374cf1c007 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientShutdownWithServerWebAppTest.java @@ -93,11 +93,11 @@ public class JakartaClientShutdownWithServerWebAppTest // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); - app.copyLib(JakartaWebSocketClientContainerProvider.class, "websocket-jakarta-client.jar"); - app.copyLib(JakartaWebSocketContainer.class, "websocket-jakarta-common.jar"); + app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); + app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 2ff742d97c9..c0db684db5b 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -45,7 +45,7 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod index 4fa27a578cc..4ac6825a91a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod @@ -14,8 +14,8 @@ client ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-client-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-client-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index 300107e4e65..d68bfcb351e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common org.eclipse.jetty diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod index 9c62fd26247..c0dbdf7e31f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod @@ -11,8 +11,8 @@ ee9 ee9-annotations [lib] -lib/ee9-websocket/websocket-core-common-${jetty.version}.jar -lib/ee9-websocket/websocket-core-server-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar +lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java index 04674463a64..60a18a5945e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java @@ -162,12 +162,12 @@ public class JettyClientClassLoaderTest // Copy over the individual jars required for Javax WebSocket. app.createWebInf(); - app.copyLib(WebSocketPolicy.class, "websocket-jetty-api.jar"); - app.copyLib(WebSocketClient.class, "websocket-jetty-client.jar"); - app.copyLib(WebSocketSession.class, "websocket-jetty-common.jar"); + app.copyLib(WebSocketPolicy.class, "jetty-ee9-websocket-jetty-api.jar"); + app.copyLib(WebSocketClient.class, "jetty-ee9-websocket-jetty-client.jar"); + app.copyLib(WebSocketSession.class, "jetty-ee9-websocket-jetty-common.jar"); app.copyLib(ContainerLifeCycle.class, "jetty-util.jar"); - app.copyLib(CoreClientUpgradeRequest.class, "websocket-core-client.jar"); - app.copyLib(WebSocketComponents.class, "websocket-core-common.jar"); + app.copyLib(CoreClientUpgradeRequest.class, "jetty-websocket-core-client.jar"); + app.copyLib(WebSocketComponents.class, "jetty-websocket-core-common.jar"); app.copyLib(Response.class, "jetty-client.jar"); app.copyLib(ByteBufferPool.class, "jetty-io.jar"); app.copyLib(BadMessageException.class, "jetty-http.jar"); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index 6ccff4c1309..e2aec7f8e1f 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.ee9 diff --git a/pom.xml b/pom.xml index 7df5891ff56..b1eecff6426 100644 --- a/pom.xml +++ b/pom.xml @@ -1502,17 +1502,17 @@ org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client ${project.version} org.eclipse.jetty.websocket - websocket-core-common + jetty-websocket-core-common ${project.version} org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server ${project.version} diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 73c8eda32ba..dc2128b2d1e 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -13,11 +13,11 @@ org.eclipse.jetty.websocket - websocket-core-server + jetty-websocket-core-server org.eclipse.jetty.websocket - websocket-core-client + jetty-websocket-core-client