From b10a10797d88728a3ef5206c77dbe7821dae2bb5 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 18 Sep 2012 10:01:01 -0700 Subject: [PATCH] Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements --- .../websocket/client/WebSocketClient.java | 10 ++--- .../client/WebSocketClientFactory.java | 16 +++---- .../client/internal/ClientUpgradeRequest.java | 4 +- .../internal/ClientUpgradeResponse.java | 6 +-- .../client/internal/ConnectionManager.java | 4 +- .../client/internal/IWebSocketClient.java | 10 ++--- .../internal/io/HttpResponseHeaderParser.java | 2 +- .../client/internal/io/UpgradeConnection.java | 20 ++++----- .../io/WebSocketClientConnection.java | 4 +- .../io/WebSocketClientSelectorManager.java | 2 +- .../websocket/client/masks/FixedMasker.java | 2 +- .../jetty/websocket/client/masks/Masker.java | 2 +- .../websocket/client/masks/RandomMasker.java | 2 +- .../websocket/client/masks/ZeroMasker.java | 2 +- .../websocket/client/BadNetworkTest.java | 8 ++-- .../websocket/client/ClientConnectTest.java | 4 +- .../websocket/client/ClientWriteThread.java | 2 +- .../websocket/client/ServerReadThread.java | 6 +-- .../websocket/client/ServerWriteThread.java | 2 +- .../websocket/client/SlowClientTest.java | 4 +- .../websocket/client/SlowServerTest.java | 4 +- .../jetty/websocket/client/TimeoutTest.java | 4 +- .../websocket/client/TrackingSocket.java | 4 +- .../websocket/client/WebSocketClientTest.java | 6 +-- .../client/blockhead/BlockheadServer.java | 26 +++++------ .../blockhead/IncomingFramesCapture.java | 8 ++-- .../websocket/client/examples/TestClient.java | 6 +-- .../io/HttpResponseHeaderParserTest.java | 2 +- .../AllTests (websocket-core).launch | 4 +- .../annotations/OnWebSocketClose.java | 4 +- .../annotations/OnWebSocketConnect.java | 4 +- .../annotations/OnWebSocketFrame.java | 6 +-- .../annotations/OnWebSocketMessage.java | 4 +- .../{ => core}/annotations/WebSocket.java | 2 +- .../{ => core}/api/BadPayloadException.java | 4 +- .../{ => core}/api/BaseConnection.java | 2 +- .../{ => core}/api/CloseException.java | 2 +- .../websocket/{ => core}/api/Extension.java | 10 ++--- .../{ => core}/api/ExtensionRegistry.java | 2 +- .../api/InvalidWebSocketException.java | 4 +- .../api/MessageTooLargeException.java | 2 +- .../api/PolicyViolationException.java | 2 +- .../{ => core}/api/ProtocolException.java | 2 +- .../websocket/{ => core}/api/StatusCode.java | 2 +- .../{ => core}/api/UpgradeException.java | 2 +- .../{ => core}/api/UpgradeRequest.java | 4 +- .../{ => core}/api/UpgradeResponse.java | 4 +- .../{ => core}/api/WebSocketAdapter.java | 4 +- .../{ => core}/api/WebSocketBehavior.java | 2 +- .../{ => core}/api/WebSocketConnection.java | 2 +- .../{ => core}/api/WebSocketException.java | 2 +- .../{ => core}/api/WebSocketListener.java | 2 +- .../{ => core}/api/WebSocketPolicy.java | 2 +- .../api/io/WebSocketBlockingConnection.java | 6 +-- .../api/io/WebSocketOutputStream.java | 6 +-- .../{ => core}/api/io/WebSocketWriter.java | 6 +-- .../{ => core}/driver/EventMethod.java | 6 +-- .../{ => core}/driver/EventMethods.java | 2 +- .../{ => core}/driver/EventMethodsCache.java | 22 +++++----- .../driver/WebSocketEventDriver.java | 38 ++++++++-------- .../WebSocketExtensionRegistry.java | 18 ++++---- .../fragment/FragmentExtension.java | 10 ++--- .../identity/IdentityExtension.java | 6 +-- .../permessage/CompressExtension.java | 12 +++--- .../io/AbstractWebSocketConnection.java | 24 +++++------ .../{ => core}/io/ControlFrameBytes.java | 8 ++-- .../{ => core}/io/DataFrameBytes.java | 4 +- .../websocket/{ => core}/io/FrameBytes.java | 4 +- .../websocket/{ => core}/io/FrameQueue.java | 2 +- .../{ => core}/io/IncomingFrames.java | 6 +-- .../{ => core}/io/OutgoingFrames.java | 4 +- .../{ => core}/io/WebSocketSession.java | 16 +++---- .../io/message/MessageAppender.java | 2 +- .../io/message/MessageInputStream.java | 8 ++-- .../{ => core}/io/message/MessageReader.java | 8 ++-- .../io/message/SimpleBinaryMessage.java | 8 ++-- .../io/message/SimpleTextMessage.java | 8 ++-- .../io/payload/BinaryValidator.java | 4 +- .../io/payload/CloseReasonValidator.java | 4 +- .../io/payload/DeMaskProcessor.java | 4 +- .../io/payload/PayloadProcessor.java | 6 +-- .../{ => core}/io/payload/UTF8Validator.java | 6 +-- .../{ => core}/protocol/AcceptHash.java | 2 +- .../{ => core}/protocol/CloseInfo.java | 8 ++-- .../{ => core}/protocol/ExtensionConfig.java | 2 +- .../websocket/{ => core}/protocol/Frame.java | 2 +- .../{ => core}/protocol/Generator.java | 8 ++-- .../websocket/{ => core}/protocol/OpCode.java | 2 +- .../websocket/{ => core}/protocol/Parser.java | 22 +++++----- .../{ => core}/protocol/WebSocketFrame.java | 4 +- .../jetty/websocket/{ => core}/AllTests.java | 10 ++--- .../{ => core}/ByteBufferAssert.java | 2 +- .../GeneratorParserRoundtripTest.java | 14 +++--- .../websocket/{ => core}/ab/AllTests.java | 2 +- .../{ => core}/ab/TestABCase1_1.java | 20 ++++----- .../{ => core}/ab/TestABCase1_2.java | 20 ++++----- .../websocket/{ => core}/ab/TestABCase2.java | 24 +++++------ .../websocket/{ => core}/ab/TestABCase3.java | 12 +++--- .../websocket/{ => core}/ab/TestABCase4.java | 12 +++--- .../{ => core}/ab/TestABCase7_3.java | 24 +++++------ .../annotations/BadBinarySignatureSocket.java | 6 ++- .../annotations/BadDuplicateBinarySocket.java | 5 ++- .../annotations/BadDuplicateFrameSocket.java | 6 ++- .../annotations/BadTextSignatureSocket.java | 6 ++- .../{ => core}/annotations/FrameSocket.java | 6 ++- .../annotations/MyEchoBinarySocket.java | 5 ++- .../{ => core}/annotations/MyEchoSocket.java | 10 +++-- .../annotations/MyStatelessEchoSocket.java | 6 ++- .../{ => core}/annotations/NoopSocket.java | 4 +- .../{ => core}/annotations/NotASocket.java | 5 ++- .../{ => core}/driver/EventCapture.java | 2 +- .../driver/EventMethodsCacheTest.java | 43 ++++++++++--------- .../driver/WebSocketEventDriverTest.java | 26 +++++------ .../examples/AdapterConnectCloseSocket.java | 8 ++-- .../examples/AnnotatedBinaryArraySocket.java | 14 +++--- .../examples/AnnotatedBinaryStreamSocket.java | 14 +++--- .../examples/AnnotatedFramesSocket.java | 16 +++---- .../examples/AnnotatedStreamingSocket.java | 18 ++++---- .../examples/AnnotatedTextSocket.java | 14 +++--- .../examples/AnnotatedTextStreamSocket.java | 14 +++--- .../examples/ListenerBasicSocket.java | 10 ++--- .../{ => core}/extensions/AllTests.java | 2 +- .../extensions/DeflateFrameExtensionTest.java | 20 ++++----- .../extensions/FragmentExtensionTest.java | 20 ++++----- .../extensions/IdentityExtensionTest.java | 18 ++++---- .../io/LocalWebSocketConnection.java | 6 +-- .../{ => core}/io/LocalWebSocketSession.java | 9 ++-- .../io/payload/DeMaskProcessorTest.java | 9 ++-- .../io/payload/UTF8ValidatorTest.java | 5 ++- .../{ => core}/protocol/AcceptHashTest.java | 3 +- .../{ => core}/protocol/AllTests.java | 2 +- .../protocol/ClosePayloadParserTest.java | 11 +++-- .../{ => core}/protocol/GeneratorTest.java | 13 ++++-- .../protocol/IncomingFramesCapture.java | 8 ++-- .../{ => core}/protocol/MaskedByteBuffer.java | 2 +- .../protocol/OutgoingFramesCapture.java | 6 ++- .../{ => core}/protocol/ParserTest.java | 14 +++--- .../protocol/PingPayloadParserTest.java | 9 ++-- .../RFC6455ExamplesGeneratorTest.java | 7 ++- .../protocol/RFC6455ExamplesParserTest.java | 9 ++-- .../protocol/TextPayloadParserTest.java | 13 +++--- .../{ => core}/protocol/UnitGenerator.java | 6 ++- .../{ => core}/protocol/UnitParser.java | 5 ++- .../protocol/WebSocketFrameTest.java | 12 ++++-- .../server/ServletWebSocketRequest.java | 6 +-- .../server/ServletWebSocketResponse.java | 6 +-- .../websocket/server/WebSocketCreator.java | 6 +-- .../websocket/server/WebSocketHandler.java | 4 +- .../server/WebSocketServerConnection.java | 4 +- .../server/WebSocketServerFactory.java | 28 ++++++------ .../websocket/server/WebSocketServlet.java | 6 +-- .../server/handshake/HandshakeRFC6455.java | 4 +- .../server/DeflateExtensionTest.java | 2 +- .../server/FragmentExtensionTest.java | 2 +- .../server/IdentityExtensionTest.java | 2 +- .../jetty/websocket/server/LoadTest.java | 12 +++--- .../jetty/websocket/server/UnitGenerator.java | 4 +- .../server/WebSocketLoadRFC6455Test.java | 14 +++--- .../server/WebSocketOverSSLTest.java | 4 +- .../server/WebSocketServletRFCTest.java | 10 ++--- .../jetty/websocket/server/ab/ABSocket.java | 8 ++-- .../websocket/server/ab/AbstractABCase.java | 4 +- .../jetty/websocket/server/ab/Fuzzer.java | 10 ++--- .../websocket/server/ab/TestABCase1.java | 6 +-- .../websocket/server/ab/TestABCase2.java | 8 ++-- .../websocket/server/ab/TestABCase3.java | 6 +-- .../websocket/server/ab/TestABCase4.java | 6 +-- .../websocket/server/ab/TestABCase5.java | 8 ++-- .../websocket/server/ab/TestABCase6.java | 8 ++-- .../server/ab/TestABCase6_BadUTF.java | 8 ++-- .../server/ab/TestABCase6_GoodUTF.java | 8 ++-- .../websocket/server/ab/TestABCase7.java | 8 ++-- .../server/ab/TestABCase7_BadStatusCodes.java | 8 ++-- .../ab/TestABCase7_GoodStatusCodes.java | 4 +- .../websocket/server/ab/TestABCase9.java | 8 ++-- .../server/blockhead/BlockheadClient.java | 24 +++++------ .../server/examples/BasicEchoSocket.java | 2 +- .../server/examples/MyEchoSocket.java | 2 +- .../server/examples/echo/BigEchoSocket.java | 6 +-- .../echo/EchoBroadcastPingSocket.java | 4 +- .../examples/echo/EchoBroadcastSocket.java | 10 ++--- .../server/examples/echo/EchoCreator.java | 4 +- .../examples/echo/EchoFragmentSocket.java | 10 ++--- .../server/examples/echo/LogSocket.java | 6 +-- .../server/helper/CaptureSocket.java | 2 +- .../websocket/server/helper/EchoSocket.java | 8 ++-- .../server/helper/IncomingFramesCapture.java | 8 ++-- .../server/helper/OutgoingFramesCapture.java | 6 +-- .../websocket/server/helper/RFCSocket.java | 8 ++-- 189 files changed, 768 insertions(+), 701 deletions(-) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/annotations/OnWebSocketClose.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/annotations/OnWebSocketConnect.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/annotations/OnWebSocketFrame.java (89%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/annotations/OnWebSocketMessage.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/annotations/WebSocket.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/BadPayloadException.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/BaseConnection.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/CloseException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/Extension.java (94%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/ExtensionRegistry.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/InvalidWebSocketException.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/MessageTooLargeException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/PolicyViolationException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/ProtocolException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/StatusCode.java (99%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/UpgradeException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/UpgradeRequest.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/UpgradeResponse.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketAdapter.java (94%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketBehavior.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketConnection.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketException.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketListener.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/WebSocketPolicy.java (99%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/io/WebSocketBlockingConnection.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/io/WebSocketOutputStream.java (89%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/api/io/WebSocketWriter.java (91%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/driver/EventMethod.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/driver/EventMethods.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/driver/EventMethodsCache.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/driver/WebSocketEventDriver.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/extensions/WebSocketExtensionRegistry.java (84%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/extensions/fragment/FragmentExtension.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/extensions/identity/IdentityExtension.java (88%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/extensions/permessage/CompressExtension.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/AbstractWebSocketConnection.java (94%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/ControlFrameBytes.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/DataFrameBytes.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/FrameBytes.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/FrameQueue.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/IncomingFrames.java (84%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/OutgoingFrames.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/WebSocketSession.java (93%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/message/MessageAppender.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/message/MessageInputStream.java (94%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/message/MessageReader.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/message/SimpleBinaryMessage.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/message/SimpleTextMessage.java (90%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/payload/BinaryValidator.java (91%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/payload/CloseReasonValidator.java (92%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/payload/DeMaskProcessor.java (93%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/payload/PayloadProcessor.java (87%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/io/payload/UTF8Validator.java (93%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/AcceptHash.java (97%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/CloseInfo.java (95%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/ExtensionConfig.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/Frame.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/Generator.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/OpCode.java (98%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/Parser.java (96%) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{ => core}/protocol/WebSocketFrame.java (99%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/AllTests.java (66%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ByteBufferAssert.java (98%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/GeneratorParserRoundtripTest.java (89%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/AllTests.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase1_1.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase1_2.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase2.java (92%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase3.java (88%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase4.java (91%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/ab/TestABCase7_3.java (93%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/BadBinarySignatureSocket.java (81%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/BadDuplicateBinarySocket.java (86%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/BadDuplicateFrameSocket.java (82%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/BadTextSignatureSocket.java (81%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/FrameSocket.java (79%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/MyEchoBinarySocket.java (86%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/MyEchoSocket.java (79%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/MyStatelessEchoSocket.java (85%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/NoopSocket.java (88%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/annotations/NotASocket.java (84%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/driver/EventCapture.java (97%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/driver/EventMethodsCacheTest.java (90%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/driver/WebSocketEventDriverTest.java (85%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AdapterConnectCloseSocket.java (83%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedBinaryArraySocket.java (75%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedBinaryStreamSocket.java (74%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedFramesSocket.java (72%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedStreamingSocket.java (74%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedTextSocket.java (74%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/AnnotatedTextStreamSocket.java (74%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/examples/ListenerBasicSocket.java (85%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/extensions/AllTests.java (95%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/extensions/DeflateFrameExtensionTest.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/extensions/FragmentExtensionTest.java (95%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/extensions/IdentityExtensionTest.java (86%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/io/LocalWebSocketConnection.java (94%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/io/LocalWebSocketSession.java (84%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/io/payload/DeMaskProcessorTest.java (86%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/io/payload/UTF8ValidatorTest.java (90%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/AcceptHashTest.java (94%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/AllTests.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/ClosePayloadParserTest.java (84%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/GeneratorTest.java (92%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/IncomingFramesCapture.java (92%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/MaskedByteBuffer.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/OutgoingFramesCapture.java (92%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/ParserTest.java (94%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/PingPayloadParserTest.java (83%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/RFC6455ExamplesGeneratorTest.java (95%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/RFC6455ExamplesParserTest.java (96%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/TextPayloadParserTest.java (94%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/UnitGenerator.java (89%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/UnitParser.java (88%) rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/{ => core}/protocol/WebSocketFrameTest.java (87%) diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index b4e1ebd9697..ac3709e0188 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -22,12 +22,12 @@ import java.io.IOException; import java.net.URI; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.masks.Masker; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; public interface WebSocketClient { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClientFactory.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClientFactory.java index b6982a9ed43..81b65ed353d 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClientFactory.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClientFactory.java @@ -34,16 +34,16 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.TimerScheduler; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.ExtensionRegistry; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.internal.ConnectionManager; import org.eclipse.jetty.websocket.client.internal.IWebSocketClient; -import org.eclipse.jetty.websocket.driver.EventMethodsCache; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; -import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.io.WebSocketSession; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.ExtensionRegistry; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethodsCache; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; public class WebSocketClientFactory extends AggregateLifeCycle { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeRequest.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeRequest.java index 6d72a873bad..2989f70ea70 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeRequest.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeRequest.java @@ -26,8 +26,8 @@ import java.util.Random; import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; /** * Allowing a generate from a UpgradeRequest diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeResponse.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeResponse.java index ba02e2dc046..181d5cb30a1 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeResponse.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeResponse.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.Set; import org.eclipse.jetty.util.MultiMap; -import org.eclipse.jetty.websocket.api.UpgradeException; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.UpgradeException; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; public class ClientUpgradeResponse implements UpgradeResponse { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ConnectionManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ConnectionManager.java index f30138f3490..d4708e4fbb8 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ConnectionManager.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ConnectionManager.java @@ -36,10 +36,10 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.Scheduler; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.internal.io.WebSocketClientSelectorManager; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; /** * Internal Connection/Client Manager used to track active clients, their physical vs virtual connection information, and provide some means to create new diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/IWebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/IWebSocketClient.java index a6dac1d4ae6..400559f17b2 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/IWebSocketClient.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/IWebSocketClient.java @@ -25,15 +25,15 @@ import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; import org.eclipse.jetty.websocket.client.masks.Masker; import org.eclipse.jetty.websocket.client.masks.RandomMasker; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; /** * WebSocketClient for working with Upgrade (request and response), and establishing connections to the websocket URI of your choice. diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParser.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParser.java index 4e064bebac8..e4e8df7fea0 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParser.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParser.java @@ -24,8 +24,8 @@ import java.util.regex.Pattern; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Utf8LineParser; -import org.eclipse.jetty.websocket.api.UpgradeException; import org.eclipse.jetty.websocket.client.internal.ClientUpgradeResponse; +import org.eclipse.jetty.websocket.core.api.UpgradeException; /** * Responsible for reading UTF8 Response Header lines and parsing them into a provided UpgradeResponse object. diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java index ce73c1acb76..31be38b2e78 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java @@ -36,19 +36,19 @@ import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.UpgradeException; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.internal.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.internal.ClientUpgradeResponse; import org.eclipse.jetty.websocket.client.internal.IWebSocketClient; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.io.WebSocketSession; -import org.eclipse.jetty.websocket.protocol.AcceptHash; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.UpgradeException; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.protocol.AcceptHash; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; /** * This is the initial connection handling that exists immediately after physical connection is established to destination server. diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientConnection.java index 02259fa73bc..5eb378d1192 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientConnection.java @@ -25,8 +25,8 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; import org.eclipse.jetty.websocket.client.internal.IWebSocketClient; import org.eclipse.jetty.websocket.client.masks.Masker; -import org.eclipse.jetty.websocket.io.AbstractWebSocketConnection; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.io.AbstractWebSocketConnection; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Client side WebSocket physical connection. diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientSelectorManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientSelectorManager.java index 4a6a61ec8a2..d6f69b8e5f8 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientSelectorManager.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientSelectorManager.java @@ -34,9 +34,9 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.Scheduler; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; import org.eclipse.jetty.websocket.client.internal.IWebSocketClient; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; public class WebSocketClientSelectorManager extends SelectorManager { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/FixedMasker.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/FixedMasker.java index 6b59c34b5f1..f50dab678a2 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/FixedMasker.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/FixedMasker.java @@ -18,7 +18,7 @@ package org.eclipse.jetty.websocket.client.masks; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class FixedMasker implements Masker { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/Masker.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/Masker.java index 6fd83d0ae7f..e839502d713 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/Masker.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/Masker.java @@ -18,7 +18,7 @@ package org.eclipse.jetty.websocket.client.masks; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public interface Masker { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/RandomMasker.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/RandomMasker.java index ededf436908..983ba0ebbe7 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/RandomMasker.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/RandomMasker.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.client.masks; import java.util.Random; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class RandomMasker implements Masker { diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/ZeroMasker.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/ZeroMasker.java index e01c77c52a9..e01c8a8f8f4 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/ZeroMasker.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/masks/ZeroMasker.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.client.masks; import java.util.Arrays; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class ZeroMasker implements Masker { diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java index e80874dda58..175a8464df0 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java @@ -22,12 +22,12 @@ import java.net.URI; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketConnection; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; -import org.eclipse.jetty.websocket.io.AbstractWebSocketConnection; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.io.AbstractWebSocketConnection; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java index f6d8ae9896e..cc86da0f8be 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java @@ -26,10 +26,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.api.UpgradeException; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; +import org.eclipse.jetty.websocket.core.api.UpgradeException; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientWriteThread.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientWriteThread.java index 2e8b46d14a5..4c6286cb7a2 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientWriteThread.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientWriteThread.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; public class ClientWriteThread extends Thread { diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerReadThread.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerReadThread.java index cbd140a360b..6c0f9be3446 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerReadThread.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerReadThread.java @@ -32,9 +32,9 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; public class ServerReadThread extends Thread diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerWriteThread.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerWriteThread.java index cbbd71f43f4..7a495224d87 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerWriteThread.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerWriteThread.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class ServerWriteThread extends Thread { diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowClientTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowClientTest.java index 341e456c0df..02ca70668e7 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowClientTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowClientTest.java @@ -23,10 +23,10 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.annotation.Slow; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java index 65be180524b..f334eb88784 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java @@ -23,10 +23,10 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.annotation.Slow; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TimeoutTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TimeoutTest.java index 8eb81d32523..aa0b07ec079 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TimeoutTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TimeoutTest.java @@ -22,10 +22,10 @@ import java.net.URI; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TrackingSocket.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TrackingSocket.java index 24798a8ec99..f78e82d12b4 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TrackingSocket.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TrackingSocket.java @@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java index fb7b21badeb..20a69c0f6f1 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer; import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/BlockheadServer.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/BlockheadServer.java index 257b74f0dca..60d33268964 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/BlockheadServer.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/BlockheadServer.java @@ -49,19 +49,19 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.protocol.AcceptHash; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.protocol.AcceptHash; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; /** diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/IncomingFramesCapture.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/IncomingFramesCapture.java index 364c006a095..4394ed1fea2 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/IncomingFramesCapture.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/IncomingFramesCapture.java @@ -23,10 +23,10 @@ import java.util.LinkedList; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java index 3e6837218e6..1d6e56455e8 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java @@ -30,11 +30,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; -import org.eclipse.jetty.websocket.api.WebSocketConnection; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; -import org.eclipse.jetty.websocket.protocol.OpCode; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.protocol.OpCode; /** * This is not a general purpose websocket client. It's only for testing the websocket server and is hardwired to a specific draft version of the protocol. diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParserTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParserTest.java index 9354c58032d..b71ef25eaf3 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParserTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParserTest.java @@ -24,7 +24,7 @@ import java.util.List; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/AllTests (websocket-core).launch b/jetty-websocket/websocket-core/AllTests (websocket-core).launch index e8c853d79ab..029d8b8001f 100644 --- a/jetty-websocket/websocket-core/AllTests (websocket-core).launch +++ b/jetty-websocket/websocket-core/AllTests (websocket-core).launch @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketClose.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketClose.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketClose.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketClose.java index df855dd10af..0edc6571cfa 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketClose.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketClose.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Annotation for tagging methods to receive connection close events. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketConnect.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketConnect.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketConnect.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketConnect.java index 520d061a645..220bae70968 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketConnect.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketConnect.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Annotation for tagging methods to receive connection open events. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketFrame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketFrame.java similarity index 89% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketFrame.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketFrame.java index eabe3b132bf..713949002d0 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketFrame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketFrame.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,8 +24,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * (ADVANCED) Annotation for tagging methods to receive frame events. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketMessage.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketMessage.java similarity index 95% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketMessage.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketMessage.java index eca021b5531..adad17f1b0d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketMessage.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketMessage.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.io.Reader; import java.lang.annotation.Documented; @@ -25,7 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Annotation for tagging methods to receive Binary or Text Message events. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/WebSocket.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/WebSocket.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/WebSocket.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/WebSocket.java index 2b35db7bcdf..6968720c0a3 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/WebSocket.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/WebSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BadPayloadException.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BadPayloadException.java index a57d72a84f0..6cc0d696ed6 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BadPayloadException.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; -import org.eclipse.jetty.websocket.extensions.permessage.CompressExtension; +import org.eclipse.jetty.websocket.core.extensions.permessage.CompressExtension; /** * Exception to terminate the connection because it has received data within a frame payload that was not consistent with the requirements of that frame diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BaseConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BaseConnection.java similarity index 98% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BaseConnection.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BaseConnection.java index cb694169bd0..859a14c8441 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BaseConnection.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BaseConnection.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; import java.net.InetSocketAddress; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/CloseException.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/CloseException.java index 67fd046800c..d635612ed71 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/CloseException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; @SuppressWarnings("serial") public class CloseException extends WebSocketException diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/Extension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/Extension.java similarity index 94% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/Extension.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/Extension.java index 265cbb01816..007de27ecb2 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/Extension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/Extension.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; import java.io.IOException; @@ -25,10 +25,10 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public abstract class Extension implements OutgoingFrames, IncomingFrames { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionRegistry.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ExtensionRegistry.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionRegistry.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ExtensionRegistry.java index 70d170eb5b8..c9d70449b1e 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionRegistry.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ExtensionRegistry.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; import java.util.Iterator; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/InvalidWebSocketException.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/InvalidWebSocketException.java index 1b2249948e9..51475e056f4 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/InvalidWebSocketException.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; -import org.eclipse.jetty.websocket.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; /** * Indicating that the provided Class is not a valid WebSocket as defined by the API. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/MessageTooLargeException.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/MessageTooLargeException.java index 9d1ecc98b71..bae0b86b0de 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/MessageTooLargeException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; /** * Exception when a message is too large for the internal buffers occurs and should trigger a connection close. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/PolicyViolationException.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/PolicyViolationException.java index f50e9fc74b4..f7d1e25eb48 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/PolicyViolationException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; /** * Exception when a violation of policy occurs and should trigger a connection close. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ProtocolException.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ProtocolException.java index 721f3af4fd5..640f0c40a0f 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ProtocolException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; /** * Per spec, a protocol error should result in a Close frame of status code 1002 (PROTOCOL_ERROR) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/StatusCode.java similarity index 99% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/StatusCode.java index 3114c085222..98349daf6a0 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/StatusCode.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.core.api; /** * The RFC 6455 specified status codes and extends FrameBytes { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/DataFrameBytes.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/DataFrameBytes.java similarity index 95% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/DataFrameBytes.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/DataFrameBytes.java index ede509e4db5..2dfb2674f1c 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/DataFrameBytes.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/DataFrameBytes.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.nio.ByteBuffer; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class DataFrameBytes extends FrameBytes { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameBytes.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameBytes.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameBytes.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameBytes.java index 226f78a24d0..c3938a99f13 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameBytes.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameBytes.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.nio.ByteBuffer; import java.nio.channels.InterruptedByTimeoutException; @@ -26,7 +26,7 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public abstract class FrameBytes implements Callback, Runnable { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameQueue.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameQueue.java similarity index 95% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameQueue.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameQueue.java index a8425fc9d7c..22331e3b695 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameQueue.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameQueue.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.util.LinkedList; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/IncomingFrames.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/IncomingFrames.java similarity index 84% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/IncomingFrames.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/IncomingFrames.java index 7a602de90e2..776d67cfa36 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/IncomingFrames.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/IncomingFrames.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Interface for dealing with Incoming Frames. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/OutgoingFrames.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/OutgoingFrames.java similarity index 90% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/OutgoingFrames.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/OutgoingFrames.java index 1cf93505ed0..96610b0e659 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/OutgoingFrames.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/OutgoingFrames.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.io.IOException; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Interface for dealing with outgoing frames. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/WebSocketSession.java similarity index 93% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/WebSocketSession.java index c705cfa60c4..3e214270ed7 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/WebSocketSession.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.io.IOException; import java.net.InetSocketAddress; @@ -26,13 +26,13 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.BaseConnection; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.BaseConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class WebSocketSession implements WebSocketConnection, IncomingFrames, OutgoingFrames { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageAppender.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageAppender.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageAppender.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageAppender.java index 44671188ede..2df38db86d7 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageAppender.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageAppender.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.message; +package org.eclipse.jetty.websocket.core.io.message; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageInputStream.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageInputStream.java similarity index 94% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageInputStream.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageInputStream.java index 8382a497538..1d1a4ea0ca6 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageInputStream.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageInputStream.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.message; +package org.eclipse.jetty.websocket.core.io.message; import java.io.IOException; import java.io.InputStream; @@ -24,9 +24,9 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.EventMethod; -import org.eclipse.jetty.websocket.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethod; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; /** * Support class for reading binary message data as an InputStream. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageReader.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageReader.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageReader.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageReader.java index 46e4d191ab9..8cd23490ee1 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageReader.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageReader.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.message; +package org.eclipse.jetty.websocket.core.io.message; import java.io.IOException; import java.io.Reader; import java.nio.ByteBuffer; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.EventMethod; -import org.eclipse.jetty.websocket.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethod; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; /** * Support class for reading text message data as an Reader. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleBinaryMessage.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleBinaryMessage.java similarity index 90% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleBinaryMessage.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleBinaryMessage.java index d380a0be492..7d998de052d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleBinaryMessage.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleBinaryMessage.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.message; +package org.eclipse.jetty.websocket.core.io.message; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.EventMethod; -import org.eclipse.jetty.websocket.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethod; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; public class SimpleBinaryMessage implements MessageAppender { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleTextMessage.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleTextMessage.java similarity index 90% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleTextMessage.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleTextMessage.java index 4c3d33bafca..2113095d0d4 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleTextMessage.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleTextMessage.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.message; +package org.eclipse.jetty.websocket.core.io.message; import java.io.IOException; import java.nio.ByteBuffer; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.EventMethod; -import org.eclipse.jetty.websocket.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethod; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; public class SimpleTextMessage implements MessageAppender { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/BinaryValidator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/BinaryValidator.java similarity index 91% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/BinaryValidator.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/BinaryValidator.java index c12cff53ce1..db73271fa61 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/BinaryValidator.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/BinaryValidator.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Binary payload validator does nothing, essentially. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/CloseReasonValidator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/CloseReasonValidator.java similarity index 92% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/CloseReasonValidator.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/CloseReasonValidator.java index d6b7ef085c4..b6f5c29f34a 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/CloseReasonValidator.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/CloseReasonValidator.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.OpCode; /** * Validate UTF8 correctness for {@link OpCode#CLOSE} Reason message. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessor.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessor.java similarity index 93% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessor.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessor.java index c35424fd2eb..d202cb90c77 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessor.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessor.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; public class DeMaskProcessor implements PayloadProcessor { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/PayloadProcessor.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/PayloadProcessor.java similarity index 87% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/PayloadProcessor.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/PayloadProcessor.java index f6e17a856f9..6b47d9eaa05 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/PayloadProcessor.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/PayloadProcessor.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.api.BadPayloadException; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Process the payload (for demasking, validating, etc..) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/UTF8Validator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/UTF8Validator.java similarity index 93% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/UTF8Validator.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/UTF8Validator.java index 2a1fbdca147..429e5b5196d 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/UTF8Validator.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/UTF8Validator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.io.IOException; import java.nio.ByteBuffer; @@ -25,8 +25,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Utf8Appendable; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.BadPayloadException; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Used to perform validation of UTF8 payload contents (for fast-fail reasons) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/AcceptHash.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/AcceptHash.java similarity index 97% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/AcceptHash.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/AcceptHash.java index 7773e604a8e..3ed9ac07a1b 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/AcceptHash.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/AcceptHash.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/CloseInfo.java similarity index 95% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/CloseInfo.java index d74be02ac5d..3d4cf7a6b9b 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/CloseInfo.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; @@ -26,9 +26,9 @@ import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.BadPayloadException; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.StatusCode; public class CloseInfo { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/ExtensionConfig.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/ExtensionConfig.java similarity index 98% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/ExtensionConfig.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/ExtensionConfig.java index 326e64dd3da..080204bc986 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/ExtensionConfig.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/ExtensionConfig.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.util.HashMap; import java.util.Map; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Frame.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Frame.java index db48c8bb0b4..9904b1f0633 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Frame.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Generator.java similarity index 98% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Generator.java index 13edf80e117..167ea2516f9 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Generator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; @@ -24,9 +24,9 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; /** * Generating a frame in WebSocket land. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/OpCode.java similarity index 98% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/OpCode.java index 0b93213d92a..0383ab9ddc1 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/OpCode.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; public final class OpCode { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Parser.java similarity index 96% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Parser.java index 1914166f4ce..0c7fe1d8b98 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Parser.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.MessageTooLargeException; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.payload.BinaryValidator; -import org.eclipse.jetty.websocket.io.payload.CloseReasonValidator; -import org.eclipse.jetty.websocket.io.payload.DeMaskProcessor; -import org.eclipse.jetty.websocket.io.payload.PayloadProcessor; -import org.eclipse.jetty.websocket.io.payload.UTF8Validator; +import org.eclipse.jetty.websocket.core.api.MessageTooLargeException; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.payload.BinaryValidator; +import org.eclipse.jetty.websocket.core.io.payload.CloseReasonValidator; +import org.eclipse.jetty.websocket.core.io.payload.DeMaskProcessor; +import org.eclipse.jetty.websocket.core.io.payload.PayloadProcessor; +import org.eclipse.jetty.websocket.core.io.payload.UTF8Validator; /** * Parsing of a frames in WebSocket land. diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrame.java similarity index 99% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrame.java index 722b56e8110..20d13556a14 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrame.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.ProtocolException; /** * A Base Frame as seen in RFC 6455. Sec 5.2 diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/AllTests.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AllTests.java similarity index 66% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/AllTests.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AllTests.java index 543f4d9dc3a..dd2b47a7eb0 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/AllTests.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AllTests.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket; +package org.eclipse.jetty.websocket.core; -import org.eclipse.jetty.websocket.driver.EventMethodsCacheTest; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriverTest; +import org.eclipse.jetty.websocket.core.driver.EventMethodsCacheTest; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriverTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( - { org.eclipse.jetty.websocket.ab.AllTests.class, EventMethodsCacheTest.class, WebSocketEventDriverTest.class, - org.eclipse.jetty.websocket.extensions.AllTests.class, org.eclipse.jetty.websocket.protocol.AllTests.class, GeneratorParserRoundtripTest.class }) + { org.eclipse.jetty.websocket.core.ab.AllTests.class, EventMethodsCacheTest.class, WebSocketEventDriverTest.class, + org.eclipse.jetty.websocket.core.extensions.AllTests.class, org.eclipse.jetty.websocket.core.protocol.AllTests.class, GeneratorParserRoundtripTest.class }) public class AllTests { /* nothing to do here */ diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ByteBufferAssert.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ByteBufferAssert.java similarity index 98% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ByteBufferAssert.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ByteBufferAssert.java index 591d980960b..8e67e38831a 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ByteBufferAssert.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ByteBufferAssert.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket; +package org.eclipse.jetty.websocket.core; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/GeneratorParserRoundtripTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundtripTest.java similarity index 89% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/GeneratorParserRoundtripTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundtripTest.java index c8024683824..0fd776a693f 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/GeneratorParserRoundtripTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundtripTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket; +package org.eclipse.jetty.websocket.core; import static org.hamcrest.Matchers.*; @@ -26,12 +26,12 @@ import java.util.Arrays; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/AllTests.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/AllTests.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/AllTests.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/AllTests.java index 445af8eaf43..4d49a507d40 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/AllTests.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/AllTests.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_1.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_1.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_1.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_1.java index 46040d61475..d5f22c0443e 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_1.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_1.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_2.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_2.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_2.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_2.java index f1e2f0f7fec..a2665f2ef17 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_2.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_2.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase2.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase2.java similarity index 92% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase2.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase2.java index 60701324aad..408296704ac 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase2.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase2.java @@ -16,22 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.nio.ByteBuffer; import java.util.Arrays; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase3.java similarity index 88% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase3.java index 4dc99207aea..8e8a0ce4645 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase3.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase4.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase4.java similarity index 91% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase4.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase4.java index f205501416f..5c101026298 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase4.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase4.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.Parser; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.Parser; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase7_3.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase7_3.java similarity index 93% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase7_3.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase7_3.java index 207b093a000..6ae4e908de1 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase7_3.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase7_3.java @@ -16,24 +16,24 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.ab; +package org.eclipse.jetty.websocket.core.ab; import java.nio.ByteBuffer; import java.util.Arrays; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.ProtocolException; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.ProtocolException; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadBinarySignatureSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadBinarySignatureSocket.java similarity index 81% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadBinarySignatureSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadBinarySignatureSocket.java index d8111368901..fc9c43cbe4e 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadBinarySignatureSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadBinarySignatureSocket.java @@ -16,9 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Invalid Socket: Annotate a message interest on a method with a return type. diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateBinarySocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateBinarySocket.java similarity index 86% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateBinarySocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateBinarySocket.java index f2ad04ed2b4..b8d45886584 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateBinarySocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateBinarySocket.java @@ -16,10 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.io.InputStream; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; + /** * Invalid Socket: Annotate 2 methods with interest in Binary Messages. */ diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateFrameSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateFrameSocket.java similarity index 82% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateFrameSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateFrameSocket.java index a8a224ceb0b..f7cf6accd85 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadDuplicateFrameSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadDuplicateFrameSocket.java @@ -16,9 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; -import org.eclipse.jetty.websocket.protocol.Frame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.protocol.Frame; @WebSocket public class BadDuplicateFrameSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadTextSignatureSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadTextSignatureSocket.java similarity index 81% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadTextSignatureSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadTextSignatureSocket.java index 7b291b2584c..2b91d98e59c 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/BadTextSignatureSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/BadTextSignatureSocket.java @@ -16,9 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Invalid Socket: Annotate a message interest on a static method diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/FrameSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/FrameSocket.java similarity index 79% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/FrameSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/FrameSocket.java index bba42ae78bb..45795e62e68 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/FrameSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/FrameSocket.java @@ -16,9 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; -import org.eclipse.jetty.websocket.protocol.Frame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.protocol.Frame; @WebSocket public class FrameSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoBinarySocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoBinarySocket.java similarity index 86% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoBinarySocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoBinarySocket.java index 3839cfd786b..0f6bbf6abf4 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoBinarySocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoBinarySocket.java @@ -16,10 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.io.IOException; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; + /** * Test of constructing a new WebSocket based on a base class */ diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoSocket.java similarity index 79% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoSocket.java index 215e6a750a8..e51247a3683 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyEchoSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyEchoSocket.java @@ -16,12 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.io.IOException; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.io.WebSocketBlockingConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.io.WebSocketBlockingConnection; /** * The most common websocket implementation. diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyStatelessEchoSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyStatelessEchoSocket.java similarity index 85% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyStatelessEchoSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyStatelessEchoSocket.java index c265366641a..336ae5a6d2b 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/MyStatelessEchoSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/MyStatelessEchoSocket.java @@ -16,12 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; import java.io.IOException; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Example of a stateless websocket implementation. diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NoopSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NoopSocket.java similarity index 88% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NoopSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NoopSocket.java index 53405de5629..719fcadb507 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NoopSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NoopSocket.java @@ -16,7 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; + +import org.eclipse.jetty.websocket.core.annotations.WebSocket; /** * The most basic websocket declaration. diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NotASocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NotASocket.java similarity index 84% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NotASocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NotASocket.java index e169753311c..203196eae57 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/annotations/NotASocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/annotations/NotASocket.java @@ -16,9 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.annotations; +package org.eclipse.jetty.websocket.core.annotations; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * (Test Case) diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventCapture.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventCapture.java similarity index 97% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventCapture.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventCapture.java index 16cdb07b6f0..8544783e8d0 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventCapture.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventCapture.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.driver; +package org.eclipse.jetty.websocket.core.driver; import java.util.ArrayList; import java.util.regex.Pattern; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventMethodsCacheTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventMethodsCacheTest.java similarity index 90% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventMethodsCacheTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventMethodsCacheTest.java index 9c58269401f..e0bd63caf26 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/EventMethodsCacheTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/EventMethodsCacheTest.java @@ -16,27 +16,30 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.driver; +package org.eclipse.jetty.websocket.core.driver; -import org.eclipse.jetty.websocket.annotations.BadBinarySignatureSocket; -import org.eclipse.jetty.websocket.annotations.BadDuplicateBinarySocket; -import org.eclipse.jetty.websocket.annotations.BadDuplicateFrameSocket; -import org.eclipse.jetty.websocket.annotations.BadTextSignatureSocket; -import org.eclipse.jetty.websocket.annotations.FrameSocket; -import org.eclipse.jetty.websocket.annotations.MyEchoBinarySocket; -import org.eclipse.jetty.websocket.annotations.MyEchoSocket; -import org.eclipse.jetty.websocket.annotations.MyStatelessEchoSocket; -import org.eclipse.jetty.websocket.annotations.NoopSocket; -import org.eclipse.jetty.websocket.annotations.NotASocket; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.InvalidWebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketListener; -import org.eclipse.jetty.websocket.examples.AdapterConnectCloseSocket; -import org.eclipse.jetty.websocket.examples.AnnotatedBinaryArraySocket; -import org.eclipse.jetty.websocket.examples.AnnotatedBinaryStreamSocket; -import org.eclipse.jetty.websocket.examples.AnnotatedTextSocket; -import org.eclipse.jetty.websocket.examples.AnnotatedTextStreamSocket; -import org.eclipse.jetty.websocket.examples.ListenerBasicSocket; +import org.eclipse.jetty.websocket.core.annotations.BadBinarySignatureSocket; +import org.eclipse.jetty.websocket.core.annotations.BadDuplicateBinarySocket; +import org.eclipse.jetty.websocket.core.annotations.BadDuplicateFrameSocket; +import org.eclipse.jetty.websocket.core.annotations.BadTextSignatureSocket; +import org.eclipse.jetty.websocket.core.annotations.FrameSocket; +import org.eclipse.jetty.websocket.core.annotations.MyEchoBinarySocket; +import org.eclipse.jetty.websocket.core.annotations.MyEchoSocket; +import org.eclipse.jetty.websocket.core.annotations.MyStatelessEchoSocket; +import org.eclipse.jetty.websocket.core.annotations.NoopSocket; +import org.eclipse.jetty.websocket.core.annotations.NotASocket; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.InvalidWebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketListener; +import org.eclipse.jetty.websocket.core.driver.EventMethod; +import org.eclipse.jetty.websocket.core.driver.EventMethods; +import org.eclipse.jetty.websocket.core.driver.EventMethodsCache; +import org.eclipse.jetty.websocket.core.examples.AdapterConnectCloseSocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedBinaryArraySocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedBinaryStreamSocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedTextSocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedTextStreamSocket; +import org.eclipse.jetty.websocket.core.examples.ListenerBasicSocket; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/WebSocketEventDriverTest.java similarity index 85% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/WebSocketEventDriverTest.java index b938732b369..8cca981e6fe 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/driver/WebSocketEventDriverTest.java @@ -16,21 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.driver; +package org.eclipse.jetty.websocket.core.driver; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.examples.AdapterConnectCloseSocket; -import org.eclipse.jetty.websocket.examples.AnnotatedBinaryArraySocket; -import org.eclipse.jetty.websocket.examples.AnnotatedBinaryStreamSocket; -import org.eclipse.jetty.websocket.examples.AnnotatedFramesSocket; -import org.eclipse.jetty.websocket.examples.ListenerBasicSocket; -import org.eclipse.jetty.websocket.io.LocalWebSocketSession; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethodsCache; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.examples.AdapterConnectCloseSocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedBinaryArraySocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedBinaryStreamSocket; +import org.eclipse.jetty.websocket.core.examples.AnnotatedFramesSocket; +import org.eclipse.jetty.websocket.core.examples.ListenerBasicSocket; +import org.eclipse.jetty.websocket.core.io.LocalWebSocketSession; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AdapterConnectCloseSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AdapterConnectCloseSocket.java similarity index 83% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AdapterConnectCloseSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AdapterConnectCloseSocket.java index 7e037d3886a..d4581908a63 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AdapterConnectCloseSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AdapterConnectCloseSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; public class AdapterConnectCloseSocket extends WebSocketAdapter { diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryArraySocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryArraySocket.java similarity index 75% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryArraySocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryArraySocket.java index 99a42199684..0ffa4fc6da0 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryArraySocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryArraySocket.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; @WebSocket public class AnnotatedBinaryArraySocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryStreamSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryStreamSocket.java similarity index 74% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryStreamSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryStreamSocket.java index 80d048fe278..4c44b7c8387 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedBinaryStreamSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedBinaryStreamSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; import java.io.InputStream; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; @WebSocket public class AnnotatedBinaryStreamSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedFramesSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedFramesSocket.java similarity index 72% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedFramesSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedFramesSocket.java index 42a4c15b222..ee466714dd8 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedFramesSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedFramesSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketFrame; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; -import org.eclipse.jetty.websocket.protocol.Frame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; +import org.eclipse.jetty.websocket.core.protocol.Frame; @WebSocket public class AnnotatedFramesSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedStreamingSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedStreamingSocket.java similarity index 74% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedStreamingSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedStreamingSocket.java index 694d949ba6a..b505ed07b71 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedStreamingSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedStreamingSocket.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; import java.io.InputStream; import java.io.Reader; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketFrame; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; -import org.eclipse.jetty.websocket.protocol.Frame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; +import org.eclipse.jetty.websocket.core.protocol.Frame; @WebSocket public class AnnotatedStreamingSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextSocket.java similarity index 74% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextSocket.java index 379a35dd314..2c9918071ab 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextSocket.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; @WebSocket public class AnnotatedTextSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextStreamSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextStreamSocket.java similarity index 74% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextStreamSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextStreamSocket.java index f9b8297db60..6d4b2033136 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/AnnotatedTextStreamSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/AnnotatedTextStreamSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; import java.io.Reader; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.driver.EventCapture; @WebSocket public class AnnotatedTextStreamSocket diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/ListenerBasicSocket.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/ListenerBasicSocket.java similarity index 85% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/ListenerBasicSocket.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/ListenerBasicSocket.java index f1760c7ef08..e1f1abc734f 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/examples/ListenerBasicSocket.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/examples/ListenerBasicSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.examples; +package org.eclipse.jetty.websocket.core.examples; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketListener; -import org.eclipse.jetty.websocket.driver.EventCapture; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketListener; +import org.eclipse.jetty.websocket.core.driver.EventCapture; public class ListenerBasicSocket implements WebSocketListener { diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/AllTests.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/AllTests.java similarity index 95% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/AllTests.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/AllTests.java index f7b3d09f269..8f51066477b 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/AllTests.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/AllTests.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.extensions; +package org.eclipse.jetty.websocket.core.extensions; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/DeflateFrameExtensionTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/DeflateFrameExtensionTest.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/DeflateFrameExtensionTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/DeflateFrameExtensionTest.java index 6c158536e1d..90344dec737 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/DeflateFrameExtensionTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/DeflateFrameExtensionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.extensions; +package org.eclipse.jetty.websocket.core.extensions; import java.io.IOException; import java.nio.ByteBuffer; @@ -29,15 +29,15 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.extensions.permessage.CompressExtension; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture.Write; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.extensions.permessage.CompressExtension; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture.Write; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/FragmentExtensionTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java similarity index 95% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/FragmentExtensionTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java index 72e16022c9a..5346b47a938 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/FragmentExtensionTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.extensions; +package org.eclipse.jetty.websocket.core.extensions; import java.io.IOException; import java.nio.ByteBuffer; @@ -29,15 +29,15 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture.Write; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.extensions.fragment.FragmentExtension; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture.Write; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/IdentityExtensionTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java similarity index 86% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/IdentityExtensionTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java index 9e761ecd191..02983b17d77 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/extensions/IdentityExtensionTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.extensions; +package org.eclipse.jetty.websocket.core.extensions; import java.io.IOException; import java.nio.ByteBuffer; @@ -24,14 +24,14 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension; -import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture.Write; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.extensions.identity.IdentityExtension; +import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture.Write; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketConnection.java similarity index 94% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketConnection.java index 0f6bf9e9d6f..87adf888083 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketConnection.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketConnection.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; import org.junit.rules.TestName; public class LocalWebSocketConnection implements WebSocketConnection diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketSession.java similarity index 84% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketSession.java index 552cfa0372c..22f8ebda9ea 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/LocalWebSocketSession.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/LocalWebSocketSession.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io; +package org.eclipse.jetty.websocket.core.io; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; -import org.eclipse.jetty.websocket.protocol.OutgoingFramesCapture; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.protocol.OutgoingFramesCapture; import org.junit.rules.TestName; public class LocalWebSocketSession extends WebSocketSession diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessorTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessorTest.java similarity index 86% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessorTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessorTest.java index 17dce959000..33715514583 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessorTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; @@ -24,9 +24,10 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.protocol.UnitGenerator; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.io.payload.DeMaskProcessor; +import org.eclipse.jetty.websocket.core.protocol.UnitGenerator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; public class DeMaskProcessorTest diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/UTF8ValidatorTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/UTF8ValidatorTest.java similarity index 90% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/UTF8ValidatorTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/UTF8ValidatorTest.java index f96f3bc065f..2a4f9aeaf20 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/io/payload/UTF8ValidatorTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/io/payload/UTF8ValidatorTest.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.io.payload; +package org.eclipse.jetty.websocket.core.io.payload; import java.nio.ByteBuffer; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.websocket.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.io.payload.UTF8Validator; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AcceptHashTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AcceptHashTest.java similarity index 94% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AcceptHashTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AcceptHashTest.java index eb9b64ea843..06b2a0003d5 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AcceptHashTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AcceptHashTest.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.TypeUtil; +import org.eclipse.jetty.websocket.core.protocol.AcceptHash; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AllTests.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AllTests.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AllTests.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AllTests.java index d8b9994130e..26e905c1aec 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/AllTests.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/AllTests.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ClosePayloadParserTest.java similarity index 84% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ClosePayloadParserTest.java index 49695c4836a..1032a4a127f 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ClosePayloadParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ClosePayloadParserTest.java @@ -16,14 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/GeneratorTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/GeneratorTest.java similarity index 92% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/GeneratorTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/GeneratorTest.java index 2f144dc6b9a..491a92e4be9 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/GeneratorTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/GeneratorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -24,9 +24,14 @@ import java.util.Arrays; import java.util.List; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/IncomingFramesCapture.java similarity index 92% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/IncomingFramesCapture.java index c0782a99a25..982016013ea 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/IncomingFramesCapture.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/IncomingFramesCapture.java @@ -16,15 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.util.LinkedList; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/MaskedByteBuffer.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/MaskedByteBuffer.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/MaskedByteBuffer.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/MaskedByteBuffer.java index 8a62dd7ad79..a1c7ecb368a 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/MaskedByteBuffer.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/MaskedByteBuffer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/OutgoingFramesCapture.java similarity index 92% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/OutgoingFramesCapture.java index 25071cf9fc2..44385cd1bff 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/OutgoingFramesCapture.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/OutgoingFramesCapture.java @@ -16,13 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.util.LinkedList; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ParserTest.java similarity index 94% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ParserTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ParserTest.java index 3616153a82c..db3b187d979 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/ParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/ParserTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -27,10 +27,14 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.BadPayloadException; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.BadPayloadException; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/PingPayloadParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/PingPayloadParserTest.java similarity index 83% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/PingPayloadParserTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/PingPayloadParserTest.java index 029464bbed3..29cd8999f76 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/PingPayloadParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/PingPayloadParserTest.java @@ -16,13 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesGeneratorTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesGeneratorTest.java similarity index 95% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesGeneratorTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesGeneratorTest.java index 975b3d5beca..3a56ca57939 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesGeneratorTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesGeneratorTest.java @@ -16,12 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import java.util.Arrays; -import org.eclipse.jetty.websocket.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; public class RFC6455ExamplesGeneratorTest diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesParserTest.java similarity index 96% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesParserTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesParserTest.java index de68d4199e7..80b3f84376e 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/RFC6455ExamplesParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/RFC6455ExamplesParserTest.java @@ -16,13 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/TextPayloadParserTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/TextPayloadParserTest.java similarity index 94% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/TextPayloadParserTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/TextPayloadParserTest.java index 1429d92bfed..fc3b64532a8 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/TextPayloadParserTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/TextPayloadParserTest.java @@ -16,16 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import java.util.Arrays; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.MessageTooLargeException; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.MessageTooLargeException; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitGenerator.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitGenerator.java similarity index 89% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitGenerator.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitGenerator.java index 2040ffff1c8..f6a48a0a69e 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitGenerator.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitGenerator.java @@ -16,14 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import java.util.List; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; /** * Convenience Generator. diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitParser.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitParser.java similarity index 88% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitParser.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitParser.java index dc8814deca4..67d28c08a24 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitParser.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/UnitParser.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Parser; public class UnitParser extends Parser { diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/WebSocketFrameTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrameTest.java similarity index 87% rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/WebSocketFrameTest.java rename to jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrameTest.java index f957fb071fd..3ad823c70e9 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/WebSocketFrameTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrameTest.java @@ -16,16 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.protocol; +package org.eclipse.jetty.websocket.core.protocol; import java.nio.ByteBuffer; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.ByteBufferAssert; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.ByteBufferAssert; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.BeforeClass; import org.junit.Test; diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java index f5018f50573..c87244f411f 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java @@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import org.eclipse.jetty.util.QuotedStringTokenizer; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; public class ServletWebSocketRequest extends HttpServletRequestWrapper implements UpgradeRequest { @@ -149,7 +149,7 @@ public class ServletWebSocketRequest extends HttpServletRequestWrapper implement /** * Not implemented (not relevant) on server side. * - * @see org.eclipse.jetty.websocket.api.UpgradeRequest#setSubProtocols(java.lang.String) + * @see org.eclipse.jetty.websocket.core.api.UpgradeRequest#setSubProtocols(java.lang.String) */ @Override public void setSubProtocols(String protocol) diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java index b4e5857ca72..cd4647d114f 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java @@ -28,9 +28,9 @@ import java.util.Set; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.eclipse.jetty.websocket.api.UpgradeException; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.api.UpgradeException; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; public class ServletWebSocketResponse extends HttpServletResponseWrapper implements UpgradeResponse { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketCreator.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketCreator.java index f18ca471d23..894487be19e 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketCreator.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketCreator.java @@ -18,9 +18,9 @@ package org.eclipse.jetty.websocket.server; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; /** * Abstract WebSocket creator interface. diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketHandler.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketHandler.java index d14f31d2310..1a30e747fb0 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketHandler.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketHandler.java @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; public abstract class WebSocketHandler extends HandlerWrapper { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java index 093d13e72c9..aed894e300b 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerConnection.java @@ -23,8 +23,8 @@ import java.util.concurrent.Executor; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.thread.Scheduler; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.io.AbstractWebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.io.AbstractWebSocketConnection; public class WebSocketServerConnection extends AbstractWebSocketConnection { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index 6b7e83e30c6..655bc30e7f9 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -41,20 +41,20 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.TimerScheduler; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.ExtensionRegistry; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.driver.EventMethodsCache; -import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; -import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.io.WebSocketSession; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.ExtensionRegistry; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.driver.EventMethodsCache; +import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver; +import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.io.WebSocketSession; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; import org.eclipse.jetty.websocket.server.handshake.HandshakeHixie76; import org.eclipse.jetty.websocket.server.handshake.HandshakeRFC6455; diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServlet.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServlet.java index ffa99436f10..33ace1421b8 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServlet.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServlet.java @@ -26,9 +26,9 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; /** * Abstract Servlet used to bridge the Servlet API to the WebSocket API. diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/handshake/HandshakeRFC6455.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/handshake/HandshakeRFC6455.java index e719df40ff3..79355bfd9fe 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/handshake/HandshakeRFC6455.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/handshake/HandshakeRFC6455.java @@ -21,8 +21,8 @@ package org.eclipse.jetty.websocket.server.handshake; import java.io.IOException; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.websocket.protocol.AcceptHash; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.AcceptHash; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; import org.eclipse.jetty.websocket.server.ServletWebSocketRequest; import org.eclipse.jetty.websocket.server.ServletWebSocketResponse; import org.eclipse.jetty.websocket.server.WebSocketHandshake; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java index 482c9fe07da..fee16b56172 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/DeflateExtensionTest.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.server; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.eclipse.jetty.websocket.server.helper.EchoServlet; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FragmentExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FragmentExtensionTest.java index 6ab685bad62..6c73ae9ab3c 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FragmentExtensionTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FragmentExtensionTest.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.server; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.eclipse.jetty.websocket.server.helper.EchoServlet; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdentityExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdentityExtensionTest.java index d21a21c1b8c..1203d5cb83f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdentityExtensionTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdentityExtensionTest.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.server; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.eclipse.jetty.websocket.server.helper.EchoServlet; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/LoadTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/LoadTest.java index 0556611233c..f39aea45cbf 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/LoadTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/LoadTest.java @@ -27,12 +27,12 @@ import java.util.concurrent.atomic.AtomicLong; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java index b41eb060576..b2781876824 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java @@ -19,8 +19,8 @@ package org.eclipse.jetty.websocket.server; import org.eclipse.jetty.io.MappedByteBufferPool; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; /** * Convenience Generator. diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java index c7223e02cc7..376ed2b5d29 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java @@ -37,13 +37,13 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketBehavior; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.examples.MyEchoSocket; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java index d4d6460edc2..1ca110a8d10 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java @@ -30,8 +30,8 @@ import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; import org.eclipse.jetty.websocket.server.examples.MyEchoSocket; import org.junit.After; import org.junit.Assert; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java index a00980f0803..3d9e5ea47de 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java @@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception; import org.eclipse.jetty.util.Utf8StringBuilder; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; import org.eclipse.jetty.websocket.server.helper.RFCServlet; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java index b281ed7e800..8df4df4a465 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java @@ -23,10 +23,10 @@ import java.io.IOException; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Simple Echo WebSocket, using async writes of echo diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java index 89f73adfd55..9641da8196a 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/AbstractABCase.java @@ -23,8 +23,8 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.Generator; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.Generator; import org.eclipse.jetty.websocket.server.SimpleServletServer; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java index 3ba0b3424cd..5d4f37cf63b 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java @@ -31,11 +31,11 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.ByteBufferAssert; import org.eclipse.jetty.websocket.server.blockhead.BlockheadClient; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java index 90f8fd2b1f8..9061ae3c7ec 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.ab.Fuzzer.SendMode; import org.junit.Test; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java index acc96bd406f..3a21acb5b87 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java @@ -23,10 +23,10 @@ import java.util.Arrays; import java.util.List; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; public class TestABCase2 extends AbstractABCase diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java index 1f6effcf1f0..2cd0e4b1ffd 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; public class TestABCase3 extends AbstractABCase diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java index 9bf471600d0..81e0ce6b36e 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; public class TestABCase4 extends AbstractABCase diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java index 90cd3292232..06f28a24c2f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.toolchain.test.annotation.Slow; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java index 101bfc132eb..cd0b972afba 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java @@ -28,10 +28,10 @@ import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.helper.Hex; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java index 1d25f754188..b5daba63abc 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_BadUTF.java @@ -24,10 +24,10 @@ import java.util.List; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.helper.Hex; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_GoodUTF.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_GoodUTF.java index 5faf154466a..d95457fabd4 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_GoodUTF.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6_GoodUTF.java @@ -24,10 +24,10 @@ import java.util.List; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.helper.Hex; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java index 47066e01e48..0dd996464a6 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java @@ -25,10 +25,10 @@ import java.util.List; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.helper.Hex; import org.junit.Ignore; import org.junit.Test; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_BadStatusCodes.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_BadStatusCodes.java index bd9708e0c54..382f04c0e2f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_BadStatusCodes.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_BadStatusCodes.java @@ -27,10 +27,10 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_GoodStatusCodes.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_GoodStatusCodes.java index 2a32ee02330..ca841d8ebfb 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_GoodStatusCodes.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7_GoodStatusCodes.java @@ -27,8 +27,8 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java index 134a995682d..baefdaa42c5 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java @@ -26,10 +26,10 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.toolchain.test.annotation.Stress; import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.websocket.api.StatusCode; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.StatusCode; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java index 498ca52c36d..7be88f3ad46 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/blockhead/BlockheadClient.java @@ -50,18 +50,18 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.Extension; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.protocol.CloseInfo; -import org.eclipse.jetty.websocket.protocol.ExtensionConfig; -import org.eclipse.jetty.websocket.protocol.Generator; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.Parser; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.Extension; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketPolicy; +import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.protocol.CloseInfo; +import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig; +import org.eclipse.jetty.websocket.core.protocol.Generator; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.Parser; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.eclipse.jetty.websocket.server.helper.IncomingFramesCapture; import org.junit.Assert; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/BasicEchoSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/BasicEchoSocket.java index 9090c6a9cd9..a3dfd740091 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/BasicEchoSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/BasicEchoSocket.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.server.examples; import java.io.IOException; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; /** * Example of a blocking echo websocket. diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/MyEchoSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/MyEchoSocket.java index 593538bd829..8d6cf04e3ba 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/MyEchoSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/MyEchoSocket.java @@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.server.examples; import java.io.IOException; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; /** * Example of a basic blocking echo socket. diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java index c7fb43eb6d8..0492a51bc95 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java @@ -21,9 +21,9 @@ package org.eclipse.jetty.websocket.server.examples.echo; import java.io.IOException; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Example Socket for echoing back Big data using the Annotation techniques along with stateless techniques. diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastPingSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastPingSocket.java index bf511de07e7..73989e8eb7c 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastPingSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastPingSocket.java @@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; @WebSocket public class EchoBroadcastPingSocket extends EchoBroadcastSocket diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastSocket.java index 158f6f704bd..889f81fb748 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastSocket.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.concurrent.ConcurrentLinkedQueue; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.annotations.OnWebSocketClose; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; @WebSocket public class EchoBroadcastSocket diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoCreator.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoCreator.java index eba864e3c1b..07c75f9e91f 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoCreator.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoCreator.java @@ -18,8 +18,8 @@ package org.eclipse.jetty.websocket.server.examples.echo; -import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.eclipse.jetty.websocket.api.UpgradeResponse; +import org.eclipse.jetty.websocket.core.api.UpgradeRequest; +import org.eclipse.jetty.websocket.core.api.UpgradeResponse; import org.eclipse.jetty.websocket.server.WebSocketCreator; /** diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java index 6ed0429418a..d1adcce0a92 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java @@ -24,11 +24,11 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; -import org.eclipse.jetty.websocket.annotations.OnWebSocketFrame; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.protocol.Frame; -import org.eclipse.jetty.websocket.protocol.OpCode; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.protocol.Frame; +import org.eclipse.jetty.websocket.core.protocol.OpCode; /** * Echo back the incoming text or binary as 2 frames of (roughly) equal size. diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/LogSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/LogSocket.java index bc3599baad7..e77d3c693fe 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/LogSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/LogSocket.java @@ -18,9 +18,9 @@ package org.eclipse.jetty.websocket.server.examples.echo; -import org.eclipse.jetty.websocket.api.WebSocketConnection; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.api.WebSocketListener; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.api.WebSocketListener; public class LogSocket implements WebSocketListener { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java index f5f03026c30..ace56ef9d69 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/CaptureSocket.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.core.api.WebSocketAdapter; public class CaptureSocket extends WebSocketAdapter { diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoSocket.java index 9791818f313..9f8ba2d26a2 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoSocket.java @@ -23,10 +23,10 @@ import java.io.IOException; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; /** * Simple Echo WebSocket, using async writes of echo diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java index 7e5ba783186..85e104d0c53 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/IncomingFramesCapture.java @@ -23,10 +23,10 @@ import java.util.LinkedList; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.WebSocketException; -import org.eclipse.jetty.websocket.io.IncomingFrames; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.api.WebSocketException; +import org.eclipse.jetty.websocket.core.io.IncomingFrames; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java index c60d0711feb..627e82807fc 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/OutgoingFramesCapture.java @@ -22,9 +22,9 @@ import java.util.LinkedList; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.io.OutgoingFrames; -import org.eclipse.jetty.websocket.protocol.OpCode; -import org.eclipse.jetty.websocket.protocol.WebSocketFrame; +import org.eclipse.jetty.websocket.core.io.OutgoingFrames; +import org.eclipse.jetty.websocket.core.protocol.OpCode; +import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame; import org.junit.Assert; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java index 98a91e4dbf3..a356f0277b1 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java @@ -23,10 +23,10 @@ import java.io.IOException; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect; -import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage; -import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.WebSocketConnection; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.core.annotations.WebSocket; +import org.eclipse.jetty.websocket.core.api.WebSocketConnection; @WebSocket public class RFCSocket