You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/13 11:56:03 UTC
[tomcat] 11/18: Rename "javax.websocket.*" to "jakarta.websocket.*"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8f9e7bca3bb80785aef8c490a7d08ff83948b96b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 19:33:00 2019 +0000
Rename "javax.websocket.*" to "jakarta.websocket.*"
---
build.xml | 8 ++---
.../websocket/ClientEndpoint.java | 4 +--
.../websocket/ClientEndpointConfig.java | 2 +-
java/{javax => jakarta}/websocket/CloseReason.java | 2 +-
.../websocket/ContainerProvider.java | 2 +-
.../websocket/DecodeException.java | 2 +-
java/{javax => jakarta}/websocket/Decoder.java | 2 +-
.../websocket/DefaultClientEndpointConfig.java | 2 +-
.../websocket/DeploymentException.java | 2 +-
.../websocket/EncodeException.java | 2 +-
java/{javax => jakarta}/websocket/Encoder.java | 2 +-
java/{javax => jakarta}/websocket/Endpoint.java | 2 +-
.../websocket/EndpointConfig.java | 2 +-
java/{javax => jakarta}/websocket/Extension.java | 2 +-
.../websocket/HandshakeResponse.java | 2 +-
.../websocket/MessageHandler.java | 2 +-
java/{javax => jakarta}/websocket/OnClose.java | 2 +-
java/{javax => jakarta}/websocket/OnError.java | 2 +-
java/{javax => jakarta}/websocket/OnMessage.java | 2 +-
java/{javax => jakarta}/websocket/OnOpen.java | 2 +-
java/{javax => jakarta}/websocket/PongMessage.java | 2 +-
.../websocket/RemoteEndpoint.java | 2 +-
java/{javax => jakarta}/websocket/SendHandler.java | 2 +-
java/{javax => jakarta}/websocket/SendResult.java | 2 +-
java/{javax => jakarta}/websocket/Session.java | 8 ++---
.../websocket/SessionException.java | 2 +-
.../websocket/WebSocketContainer.java | 2 +-
.../server/DefaultServerEndpointConfig.java | 8 ++---
.../websocket/server/HandshakeRequest.java | 2 +-
.../websocket/server/PathParam.java | 2 +-
.../websocket/server/ServerApplicationConfig.java | 4 +--
.../websocket/server/ServerContainer.java | 6 ++--
.../websocket/server/ServerEndpoint.java | 6 ++--
.../websocket/server/ServerEndpointConfig.java | 12 +++----
java/org/apache/tomcat/websocket/Constants.java | 2 +-
java/org/apache/tomcat/websocket/DecoderEntry.java | 2 +-
.../tomcat/websocket/FutureToSendHandler.java | 4 +--
.../tomcat/websocket/MessageHandlerResult.java | 2 +-
java/org/apache/tomcat/websocket/MessagePart.java | 2 +-
.../apache/tomcat/websocket/PerMessageDeflate.java | 6 ++--
.../apache/tomcat/websocket/Transformation.java | 2 +-
.../tomcat/websocket/TransformationFactory.java | 2 +-
java/org/apache/tomcat/websocket/Util.java | 28 ++++++++--------
.../tomcat/websocket/WrappedMessageHandler.java | 2 +-
.../tomcat/websocket/WsContainerProvider.java | 4 +--
java/org/apache/tomcat/websocket/WsExtension.java | 2 +-
.../tomcat/websocket/WsExtensionParameter.java | 2 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 10 +++---
.../org/apache/tomcat/websocket/WsFrameClient.java | 4 +--
.../tomcat/websocket/WsHandshakeResponse.java | 2 +-
.../org/apache/tomcat/websocket/WsIOException.java | 2 +-
.../org/apache/tomcat/websocket/WsPongMessage.java | 2 +-
.../tomcat/websocket/WsRemoteEndpointAsync.java | 4 +--
.../tomcat/websocket/WsRemoteEndpointBase.java | 2 +-
.../tomcat/websocket/WsRemoteEndpointBasic.java | 4 +--
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 18 +++++------
.../websocket/WsRemoteEndpointImplClient.java | 4 +--
java/org/apache/tomcat/websocket/WsSession.java | 32 +++++++++----------
.../tomcat/websocket/WsWebSocketContainer.java | 21 ++++++------
.../tomcat/websocket/pojo/PojoEndpointBase.java | 10 +++---
.../tomcat/websocket/pojo/PojoEndpointClient.java | 12 +++----
.../tomcat/websocket/pojo/PojoEndpointServer.java | 10 +++---
.../websocket/pojo/PojoMessageHandlerBase.java | 8 ++---
.../pojo/PojoMessageHandlerPartialBase.java | 6 ++--
.../pojo/PojoMessageHandlerPartialBinary.java | 2 +-
.../pojo/PojoMessageHandlerPartialText.java | 2 +-
.../pojo/PojoMessageHandlerWholeBase.java | 6 ++--
.../pojo/PojoMessageHandlerWholeBinary.java | 12 +++----
.../pojo/PojoMessageHandlerWholePong.java | 4 +--
.../pojo/PojoMessageHandlerWholeText.java | 12 +++----
.../tomcat/websocket/pojo/PojoMethodMapping.java | 28 ++++++++--------
.../tomcat/websocket/pojo/PojoPathParam.java | 8 ++---
.../apache/tomcat/websocket/pojo/package-info.java | 2 +-
.../apache/tomcat/websocket/server/Constants.java | 2 +-
.../server/DefaultServerEndpointConfigurator.java | 8 ++---
.../tomcat/websocket/server/UpgradeUtil.java | 9 +++---
.../tomcat/websocket/server/UriTemplate.java | 2 +-
.../websocket/server/WsHandshakeRequest.java | 3 +-
.../websocket/server/WsHttpUpgradeHandler.java | 13 ++++----
.../tomcat/websocket/server/WsMappingResult.java | 2 +-
.../server/WsPerSessionServerEndpointConfig.java | 8 ++---
.../server/WsRemoteEndpointImplServer.java | 8 ++---
java/org/apache/tomcat/websocket/server/WsSci.java | 15 ++++-----
.../tomcat/websocket/server/WsServerContainer.java | 17 +++++-----
...rovider => jakarta.websocket.ContainerProvider} | 0
...ocket.server.ServerEndpointConfig$Configurator} | 0
res/META-INF/websocket-api.jar.manifest | 4 +--
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 4 +--
res/bnd/websocket-api.jar.tmp.bnd | 4 +--
res/checkstyle/jakarta-import-control.xml | 3 ++
res/checkstyle/javax-import-control.xml | 3 --
res/checkstyle/org-import-control.xml | 2 +-
.../TesterContainerProviderPerformance.java | 2 +-
.../catalina/loader/TestWebappClassLoader.java | 2 +-
.../tomcat/websocket/TestConnectionLimit.java | 8 ++---
.../tomcat/websocket/TestPerMessageDeflate.java | 4 +--
test/org/apache/tomcat/websocket/TestUtil.java | 12 +++----
.../tomcat/websocket/TestWebSocketFrameClient.java | 10 +++---
.../websocket/TestWebSocketFrameClientSSL.java | 10 +++---
.../tomcat/websocket/TestWsPingPongMessages.java | 10 +++---
.../tomcat/websocket/TestWsRemoteEndpoint.java | 10 +++---
.../websocket/TestWsSessionSuspendResume.java | 16 +++++-----
.../tomcat/websocket/TestWsSubprotocols.java | 16 +++++-----
.../tomcat/websocket/TestWsWebSocketContainer.java | 31 +++++++++---------
.../TestWsWebSocketContainerGetOpenSessions.java | 27 ++++++++--------
.../apache/tomcat/websocket/TesterAsyncTiming.java | 12 +++----
.../tomcat/websocket/TesterBlockWebSocketSCI.java | 6 ++--
.../apache/tomcat/websocket/TesterEchoServer.java | 11 +++----
.../tomcat/websocket/TesterFirehoseServer.java | 14 ++++----
.../tomcat/websocket/TesterMessageCountClient.java | 18 +++++------
.../tomcat/websocket/TesterWsClientAutobahn.java | 20 ++++++------
.../websocket/pojo/TestEncodingDecoding.java | 37 +++++++++++-----------
.../websocket/pojo/TestPojoEndpointBase.java | 18 +++++------
.../websocket/pojo/TestPojoMethodMapping.java | 16 +++++-----
.../apache/tomcat/websocket/pojo/TesterUtil.java | 4 +--
.../tomcat/websocket/server/TestAsyncMessages.java | 10 +++---
.../tomcat/websocket/server/TestClassLoader.java | 14 ++++----
.../apache/tomcat/websocket/server/TestClose.java | 18 +++++------
.../tomcat/websocket/server/TestCloseBug58624.java | 25 +++++++--------
.../tomcat/websocket/server/TestShutdown.java | 16 +++++-----
.../server/TestWsRemoteEndpointImplServer.java | 24 +++++++-------
.../websocket/server/TestWsServerContainer.java | 12 +++----
.../websocket/server/TesterEndpointConfig.java | 7 ++--
.../tomcat/websocket/server/TesterWsClient.java | 2 +-
webapps/docs/web-socket-howto.xml | 6 ++--
.../WEB-INF/classes/websocket/ExamplesConfig.java | 6 ++--
.../classes/websocket/chat/ChatAnnotation.java | 12 +++----
.../classes/websocket/drawboard/Client.java | 12 +++----
.../websocket/drawboard/DrawboardEndpoint.java | 10 +++---
.../classes/websocket/echo/EchoAnnotation.java | 8 ++---
.../websocket/echo/EchoAsyncAnnotation.java | 8 ++---
.../classes/websocket/echo/EchoEndpoint.java | 10 +++---
.../websocket/echo/EchoStreamAnnotation.java | 8 ++---
.../WEB-INF/classes/websocket/snake/Snake.java | 6 ++--
.../classes/websocket/snake/SnakeAnnotation.java | 12 +++----
135 files changed, 516 insertions(+), 526 deletions(-)
diff --git a/build.xml b/build.xml
index 1f30fc0..1e12c7c 100644
--- a/build.xml
+++ b/build.xml
@@ -271,8 +271,8 @@
<include name="**/NOTICE"/>
<include name="**/RELEASE-NOTES"/>
<include name="**/jakarta.servlet.ServletContainerInitializer"/>
- <include name="**/javax.websocket.ContainerProvider"/>
- <include name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
+ <include name="**/jakarta.websocket.ContainerProvider"/>
+ <include name="**/jakarta.websocket.server.ServerEndpointConfig$Configurator"/>
<include name="**/.gitignore"/>
<include name="**/*.bnd"/>
<include name="**/*.classpath"/>
@@ -348,7 +348,7 @@
</patternset>
<patternset id="files.websocket-api">
- <include name="javax/websocket/**" />
+ <include name="jakarta/websocket/**" />
</patternset>
<patternset id="files.jaspic-api">
@@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
- <javadoc packagenames="javax.websocket.*"
+ <javadoc packagenames="jakarta.websocket.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/websocketapi"
version="true"
diff --git a/java/javax/websocket/ClientEndpoint.java b/java/jakarta/websocket/ClientEndpoint.java
similarity index 93%
rename from java/javax/websocket/ClientEndpoint.java
rename to java/jakarta/websocket/ClientEndpoint.java
index ee98417..4c44b07 100644
--- a/java/javax/websocket/ClientEndpoint.java
+++ b/java/jakarta/websocket/ClientEndpoint.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
diff --git a/java/javax/websocket/ClientEndpointConfig.java b/java/jakarta/websocket/ClientEndpointConfig.java
similarity index 99%
rename from java/javax/websocket/ClientEndpointConfig.java
rename to java/jakarta/websocket/ClientEndpointConfig.java
index 13b6cba..a56af4b 100644
--- a/java/javax/websocket/ClientEndpointConfig.java
+++ b/java/jakarta/websocket/ClientEndpointConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.Collections;
import java.util.List;
diff --git a/java/javax/websocket/CloseReason.java b/java/jakarta/websocket/CloseReason.java
similarity index 99%
rename from java/javax/websocket/CloseReason.java
rename to java/jakarta/websocket/CloseReason.java
index ef88d13..dae0777 100644
--- a/java/javax/websocket/CloseReason.java
+++ b/java/jakarta/websocket/CloseReason.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public class CloseReason {
diff --git a/java/javax/websocket/ContainerProvider.java b/java/jakarta/websocket/ContainerProvider.java
similarity index 98%
rename from java/javax/websocket/ContainerProvider.java
rename to java/jakarta/websocket/ContainerProvider.java
index f95c9ad..33a8af2 100644
--- a/java/javax/websocket/ContainerProvider.java
+++ b/java/jakarta/websocket/ContainerProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.Iterator;
import java.util.ServiceLoader;
diff --git a/java/javax/websocket/DecodeException.java b/java/jakarta/websocket/DecodeException.java
similarity index 98%
rename from java/javax/websocket/DecodeException.java
rename to java/jakarta/websocket/DecodeException.java
index 771cfa5..6076e90 100644
--- a/java/javax/websocket/DecodeException.java
+++ b/java/jakarta/websocket/DecodeException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.nio.ByteBuffer;
diff --git a/java/javax/websocket/Decoder.java b/java/jakarta/websocket/Decoder.java
similarity index 98%
rename from java/javax/websocket/Decoder.java
rename to java/jakarta/websocket/Decoder.java
index fad262e..c8fa343 100644
--- a/java/javax/websocket/Decoder.java
+++ b/java/jakarta/websocket/Decoder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.InputStream;
diff --git a/java/javax/websocket/DefaultClientEndpointConfig.java b/java/jakarta/websocket/DefaultClientEndpointConfig.java
similarity index 98%
rename from java/javax/websocket/DefaultClientEndpointConfig.java
rename to java/jakarta/websocket/DefaultClientEndpointConfig.java
index ce28cb2..e166925 100644
--- a/java/javax/websocket/DefaultClientEndpointConfig.java
+++ b/java/jakarta/websocket/DefaultClientEndpointConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
import java.util.Map;
diff --git a/java/javax/websocket/DeploymentException.java b/java/jakarta/websocket/DeploymentException.java
similarity index 97%
rename from java/javax/websocket/DeploymentException.java
rename to java/jakarta/websocket/DeploymentException.java
index 1678fd0..75bb027 100644
--- a/java/javax/websocket/DeploymentException.java
+++ b/java/jakarta/websocket/DeploymentException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public class DeploymentException extends Exception {
diff --git a/java/javax/websocket/EncodeException.java b/java/jakarta/websocket/EncodeException.java
similarity index 97%
rename from java/javax/websocket/EncodeException.java
rename to java/jakarta/websocket/EncodeException.java
index fdb536a..21e8598 100644
--- a/java/javax/websocket/EncodeException.java
+++ b/java/jakarta/websocket/EncodeException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public class EncodeException extends Exception {
diff --git a/java/javax/websocket/Encoder.java b/java/jakarta/websocket/Encoder.java
similarity index 98%
rename from java/javax/websocket/Encoder.java
rename to java/jakarta/websocket/Encoder.java
index 42a107f..8b2c871 100644
--- a/java/javax/websocket/Encoder.java
+++ b/java/jakarta/websocket/Encoder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/java/javax/websocket/Endpoint.java b/java/jakarta/websocket/Endpoint.java
similarity index 98%
rename from java/javax/websocket/Endpoint.java
rename to java/jakarta/websocket/Endpoint.java
index 9dfdbcc..7a33a24 100644
--- a/java/javax/websocket/Endpoint.java
+++ b/java/jakarta/websocket/Endpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public abstract class Endpoint {
diff --git a/java/javax/websocket/EndpointConfig.java b/java/jakarta/websocket/EndpointConfig.java
similarity index 97%
rename from java/javax/websocket/EndpointConfig.java
rename to java/jakarta/websocket/EndpointConfig.java
index 0b6c968..ed2d423 100644
--- a/java/javax/websocket/EndpointConfig.java
+++ b/java/jakarta/websocket/EndpointConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
import java.util.Map;
diff --git a/java/javax/websocket/Extension.java b/java/jakarta/websocket/Extension.java
similarity index 97%
rename from java/javax/websocket/Extension.java
rename to java/jakarta/websocket/Extension.java
index b95b27b..98734b3 100644
--- a/java/javax/websocket/Extension.java
+++ b/java/jakarta/websocket/Extension.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
diff --git a/java/javax/websocket/HandshakeResponse.java b/java/jakarta/websocket/HandshakeResponse.java
similarity index 97%
rename from java/javax/websocket/HandshakeResponse.java
rename to java/jakarta/websocket/HandshakeResponse.java
index 807192e..6754020 100644
--- a/java/javax/websocket/HandshakeResponse.java
+++ b/java/jakarta/websocket/HandshakeResponse.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
import java.util.Map;
diff --git a/java/javax/websocket/MessageHandler.java b/java/jakarta/websocket/MessageHandler.java
similarity index 98%
rename from java/javax/websocket/MessageHandler.java
rename to java/jakarta/websocket/MessageHandler.java
index 2c30d99..212ec0e 100644
--- a/java/javax/websocket/MessageHandler.java
+++ b/java/jakarta/websocket/MessageHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public interface MessageHandler {
diff --git a/java/javax/websocket/OnClose.java b/java/jakarta/websocket/OnClose.java
similarity index 97%
rename from java/javax/websocket/OnClose.java
rename to java/jakarta/websocket/OnClose.java
index 6ee61d3..3129116 100644
--- a/java/javax/websocket/OnClose.java
+++ b/java/jakarta/websocket/OnClose.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/websocket/OnError.java b/java/jakarta/websocket/OnError.java
similarity index 97%
rename from java/javax/websocket/OnError.java
rename to java/jakarta/websocket/OnError.java
index ce43148..a09a5bd 100644
--- a/java/javax/websocket/OnError.java
+++ b/java/jakarta/websocket/OnError.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/websocket/OnMessage.java b/java/jakarta/websocket/OnMessage.java
similarity index 97%
rename from java/javax/websocket/OnMessage.java
rename to java/jakarta/websocket/OnMessage.java
index 564fa99..34cfcfa 100644
--- a/java/javax/websocket/OnMessage.java
+++ b/java/jakarta/websocket/OnMessage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/websocket/OnOpen.java b/java/jakarta/websocket/OnOpen.java
similarity index 97%
rename from java/javax/websocket/OnOpen.java
rename to java/jakarta/websocket/OnOpen.java
index 9f0ea6e..26b8e9d 100644
--- a/java/javax/websocket/OnOpen.java
+++ b/java/jakarta/websocket/OnOpen.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/websocket/PongMessage.java b/java/jakarta/websocket/PongMessage.java
similarity index 97%
rename from java/javax/websocket/PongMessage.java
rename to java/jakarta/websocket/PongMessage.java
index 7e9e3b6..8740eae 100644
--- a/java/javax/websocket/PongMessage.java
+++ b/java/jakarta/websocket/PongMessage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.nio.ByteBuffer;
diff --git a/java/javax/websocket/RemoteEndpoint.java b/java/jakarta/websocket/RemoteEndpoint.java
similarity index 99%
rename from java/javax/websocket/RemoteEndpoint.java
rename to java/jakarta/websocket/RemoteEndpoint.java
index 19c7a10..213b8a4 100644
--- a/java/javax/websocket/RemoteEndpoint.java
+++ b/java/jakarta/websocket/RemoteEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/java/javax/websocket/SendHandler.java b/java/jakarta/websocket/SendHandler.java
similarity index 97%
rename from java/javax/websocket/SendHandler.java
rename to java/jakarta/websocket/SendHandler.java
index 65b9a19..9e8317c 100644
--- a/java/javax/websocket/SendHandler.java
+++ b/java/jakarta/websocket/SendHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public interface SendHandler {
diff --git a/java/javax/websocket/SendResult.java b/java/jakarta/websocket/SendResult.java
similarity index 97%
rename from java/javax/websocket/SendResult.java
rename to java/jakarta/websocket/SendResult.java
index a3797d5..e3d47ec 100644
--- a/java/javax/websocket/SendResult.java
+++ b/java/jakarta/websocket/SendResult.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public final class SendResult {
private final Throwable exception;
diff --git a/java/javax/websocket/Session.java b/java/jakarta/websocket/Session.java
similarity index 95%
rename from java/javax/websocket/Session.java
rename to java/jakarta/websocket/Session.java
index eea15e5..2ff44d6 100644
--- a/java/javax/websocket/Session.java
+++ b/java/jakarta/websocket/Session.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.Closeable;
import java.io.IOException;
@@ -38,9 +38,9 @@ public interface Session extends Closeable {
* binary, pong). The message type will be derived at runtime from the
* provided {@link MessageHandler} instance. It is not always possible to do
* this so it is better to use
- * {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Partial)}
+ * {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Partial)}
* or
- * {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Whole)}.
+ * {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Whole)}.
*
* @param handler The message handler for a incoming message
*
@@ -114,7 +114,7 @@ public interface Session extends Closeable {
/**
* Close the connection to the remote end point using the code
- * {@link javax.websocket.CloseReason.CloseCodes#NORMAL_CLOSURE} and an
+ * {@link jakarta.websocket.CloseReason.CloseCodes#NORMAL_CLOSURE} and an
* empty reason phrase.
*
* @throws IOException if an I/O error occurs while the WebSocket session is
diff --git a/java/javax/websocket/SessionException.java b/java/jakarta/websocket/SessionException.java
similarity index 97%
rename from java/javax/websocket/SessionException.java
rename to java/jakarta/websocket/SessionException.java
index 428b82e..b3eafed 100644
--- a/java/javax/websocket/SessionException.java
+++ b/java/jakarta/websocket/SessionException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public class SessionException extends Exception {
diff --git a/java/javax/websocket/WebSocketContainer.java b/java/jakarta/websocket/WebSocketContainer.java
similarity index 99%
rename from java/javax/websocket/WebSocketContainer.java
rename to java/jakarta/websocket/WebSocketContainer.java
index f2da3e4..d7fd1aa 100644
--- a/java/javax/websocket/WebSocketContainer.java
+++ b/java/jakarta/websocket/WebSocketContainer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.net.URI;
diff --git a/java/javax/websocket/server/DefaultServerEndpointConfig.java b/java/jakarta/websocket/server/DefaultServerEndpointConfig.java
similarity index 95%
rename from java/javax/websocket/server/DefaultServerEndpointConfig.java
rename to java/jakarta/websocket/server/DefaultServerEndpointConfig.java
index 7c3b8d7..e0122f2 100644
--- a/java/javax/websocket/server/DefaultServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/DefaultServerEndpointConfig.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.Extension;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Extension;
/**
* Provides the default configuration for WebSocket server endpoints.
diff --git a/java/javax/websocket/server/HandshakeRequest.java b/java/jakarta/websocket/server/HandshakeRequest.java
similarity index 98%
rename from java/javax/websocket/server/HandshakeRequest.java
rename to java/jakarta/websocket/server/HandshakeRequest.java
index b42ca8d..2edb554 100644
--- a/java/javax/websocket/server/HandshakeRequest.java
+++ b/java/jakarta/websocket/server/HandshakeRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.net.URI;
import java.security.Principal;
diff --git a/java/javax/websocket/server/PathParam.java b/java/jakarta/websocket/server/PathParam.java
similarity index 97%
rename from java/javax/websocket/server/PathParam.java
rename to java/jakarta/websocket/server/PathParam.java
index ff1d085..bcf613f 100644
--- a/java/javax/websocket/server/PathParam.java
+++ b/java/jakarta/websocket/server/PathParam.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/websocket/server/ServerApplicationConfig.java b/java/jakarta/websocket/server/ServerApplicationConfig.java
similarity index 96%
rename from java/javax/websocket/server/ServerApplicationConfig.java
rename to java/jakarta/websocket/server/ServerApplicationConfig.java
index b91f1c4..8f59597 100644
--- a/java/javax/websocket/server/ServerApplicationConfig.java
+++ b/java/jakarta/websocket/server/ServerApplicationConfig.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.util.Set;
-import javax.websocket.Endpoint;
+import jakarta.websocket.Endpoint;
/**
* Applications may provide an implementation of this interface to filter the
diff --git a/java/javax/websocket/server/ServerContainer.java b/java/jakarta/websocket/server/ServerContainer.java
similarity index 89%
rename from java/javax/websocket/server/ServerContainer.java
rename to java/jakarta/websocket/server/ServerContainer.java
index 3243a07..a210311 100644
--- a/java/javax/websocket/server/ServerContainer.java
+++ b/java/jakarta/websocket/server/ServerContainer.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
-import javax.websocket.DeploymentException;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.WebSocketContainer;
/**
* Provides the ability to deploy endpoints programmatically.
diff --git a/java/javax/websocket/server/ServerEndpoint.java b/java/jakarta/websocket/server/ServerEndpoint.java
similarity index 93%
rename from java/javax/websocket/server/ServerEndpoint.java
rename to java/jakarta/websocket/server/ServerEndpoint.java
index 43b7dfa..9c7f013 100644
--- a/java/javax/websocket/server/ServerEndpoint.java
+++ b/java/jakarta/websocket/server/ServerEndpoint.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
diff --git a/java/javax/websocket/server/ServerEndpointConfig.java b/java/jakarta/websocket/server/ServerEndpointConfig.java
similarity index 97%
rename from java/javax/websocket/server/ServerEndpointConfig.java
rename to java/jakarta/websocket/server/ServerEndpointConfig.java
index fa56ce4..4fb16d3 100644
--- a/java/javax/websocket/server/ServerEndpointConfig.java
+++ b/java/jakarta/websocket/server/ServerEndpointConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -23,11 +23,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.ServiceLoader;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
/**
* Provides configuration information for WebSocket endpoints published to a
diff --git a/java/org/apache/tomcat/websocket/Constants.java b/java/org/apache/tomcat/websocket/Constants.java
index fa01921..1971653 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
/**
* Internal implementation constants.
diff --git a/java/org/apache/tomcat/websocket/DecoderEntry.java b/java/org/apache/tomcat/websocket/DecoderEntry.java
index 299e38e..3af5aa5 100644
--- a/java/org/apache/tomcat/websocket/DecoderEntry.java
+++ b/java/org/apache/tomcat/websocket/DecoderEntry.java
@@ -16,7 +16,7 @@
*/
package org.apache.tomcat.websocket;
-import javax.websocket.Decoder;
+import jakarta.websocket.Decoder;
public class DecoderEntry {
diff --git a/java/org/apache/tomcat/websocket/FutureToSendHandler.java b/java/org/apache/tomcat/websocket/FutureToSendHandler.java
index 692cb59..5882eef 100644
--- a/java/org/apache/tomcat/websocket/FutureToSendHandler.java
+++ b/java/org/apache/tomcat/websocket/FutureToSendHandler.java
@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/MessageHandlerResult.java b/java/org/apache/tomcat/websocket/MessageHandlerResult.java
index a55e8dd..2f6a938 100644
--- a/java/org/apache/tomcat/websocket/MessageHandlerResult.java
+++ b/java/org/apache/tomcat/websocket/MessageHandlerResult.java
@@ -16,7 +16,7 @@
*/
package org.apache.tomcat.websocket;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class MessageHandlerResult {
diff --git a/java/org/apache/tomcat/websocket/MessagePart.java b/java/org/apache/tomcat/websocket/MessagePart.java
index f51c007..506289b 100644
--- a/java/org/apache/tomcat/websocket/MessagePart.java
+++ b/java/org/apache/tomcat/websocket/MessagePart.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket;
import java.nio.ByteBuffer;
-import javax.websocket.SendHandler;
+import jakarta.websocket.SendHandler;
class MessagePart {
private final boolean fin;
diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index afcfcf0..c101916 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -24,9 +24,9 @@ import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import javax.websocket.Extension;
-import javax.websocket.Extension.Parameter;
-import javax.websocket.SendHandler;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Extension.Parameter;
+import jakarta.websocket.SendHandler;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/Transformation.java b/java/org/apache/tomcat/websocket/Transformation.java
index 14d8093..0a955f0 100644
--- a/java/org/apache/tomcat/websocket/Transformation.java
+++ b/java/org/apache/tomcat/websocket/Transformation.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
/**
* The internal representation of the transformation that a WebSocket extension
diff --git a/java/org/apache/tomcat/websocket/TransformationFactory.java b/java/org/apache/tomcat/websocket/TransformationFactory.java
index 643be94..9d2b37c 100644
--- a/java/org/apache/tomcat/websocket/TransformationFactory.java
+++ b/java/org/apache/tomcat/websocket/TransformationFactory.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket;
import java.util.List;
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/Util.java b/java/org/apache/tomcat/websocket/Util.java
index 63009a6..ac8ea2d 100644
--- a/java/org/apache/tomcat/websocket/Util.java
+++ b/java/org/apache/tomcat/websocket/Util.java
@@ -33,20 +33,20 @@ import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
-import javax.websocket.CloseReason.CloseCode;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.Decoder;
-import javax.websocket.Decoder.Binary;
-import javax.websocket.Decoder.BinaryStream;
-import javax.websocket.Decoder.Text;
-import javax.websocket.Decoder.TextStream;
-import javax.websocket.DeploymentException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason.CloseCode;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Decoder.Binary;
+import jakarta.websocket.Decoder.BinaryStream;
+import jakarta.websocket.Decoder.Text;
+import jakarta.websocket.Decoder.TextStream;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.pojo.PojoMessageHandlerPartialBinary;
diff --git a/java/org/apache/tomcat/websocket/WrappedMessageHandler.java b/java/org/apache/tomcat/websocket/WrappedMessageHandler.java
index c4004b3..fc5ee2e 100644
--- a/java/org/apache/tomcat/websocket/WrappedMessageHandler.java
+++ b/java/org/apache/tomcat/websocket/WrappedMessageHandler.java
@@ -16,7 +16,7 @@
*/
package org.apache.tomcat.websocket;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public interface WrappedMessageHandler {
long getMaxMessageSize();
diff --git a/java/org/apache/tomcat/websocket/WsContainerProvider.java b/java/org/apache/tomcat/websocket/WsContainerProvider.java
index 654ad79..ad990f1 100644
--- a/java/org/apache/tomcat/websocket/WsContainerProvider.java
+++ b/java/org/apache/tomcat/websocket/WsContainerProvider.java
@@ -16,8 +16,8 @@
*/
package org.apache.tomcat.websocket;
-import javax.websocket.ContainerProvider;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.WebSocketContainer;
public class WsContainerProvider extends ContainerProvider {
diff --git a/java/org/apache/tomcat/websocket/WsExtension.java b/java/org/apache/tomcat/websocket/WsExtension.java
index 766e0fb..6895619 100644
--- a/java/org/apache/tomcat/websocket/WsExtension.java
+++ b/java/org/apache/tomcat/websocket/WsExtension.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
public class WsExtension implements Extension {
diff --git a/java/org/apache/tomcat/websocket/WsExtensionParameter.java b/java/org/apache/tomcat/websocket/WsExtensionParameter.java
index 1b3f266..4bc464a 100644
--- a/java/org/apache/tomcat/websocket/WsExtensionParameter.java
+++ b/java/org/apache/tomcat/websocket/WsExtensionParameter.java
@@ -16,7 +16,7 @@
*/
package org.apache.tomcat.websocket;
-import javax.websocket.Extension.Parameter;
+import jakarta.websocket.Extension.Parameter;
public class WsExtensionParameter implements Parameter {
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 28cdc30..97c9c94 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -25,11 +25,11 @@ import java.nio.charset.CodingErrorAction;
import java.util.List;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.PongMessage;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.PongMessage;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
diff --git a/java/org/apache/tomcat/websocket/WsFrameClient.java b/java/org/apache/tomcat/websocket/WsFrameClient.java
index 260048e..7803491 100644
--- a/java/org/apache/tomcat/websocket/WsFrameClient.java
+++ b/java/org/apache/tomcat/websocket/WsFrameClient.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.CompletionHandler;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/java/org/apache/tomcat/websocket/WsHandshakeResponse.java b/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
index ecb39e4..e99c03f 100644
--- a/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
+++ b/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.websocket.HandshakeResponse;
+import jakarta.websocket.HandshakeResponse;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
diff --git a/java/org/apache/tomcat/websocket/WsIOException.java b/java/org/apache/tomcat/websocket/WsIOException.java
index 0b7b1d4..c09e0ad 100644
--- a/java/org/apache/tomcat/websocket/WsIOException.java
+++ b/java/org/apache/tomcat/websocket/WsIOException.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
-import javax.websocket.CloseReason;
+import jakarta.websocket.CloseReason;
/**
* Allows the WebSocket implementation to throw an {@link IOException} that
diff --git a/java/org/apache/tomcat/websocket/WsPongMessage.java b/java/org/apache/tomcat/websocket/WsPongMessage.java
index c3a6c33..6019fc5 100644
--- a/java/org/apache/tomcat/websocket/WsPongMessage.java
+++ b/java/org/apache/tomcat/websocket/WsPongMessage.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket;
import java.nio.ByteBuffer;
-import javax.websocket.PongMessage;
+import jakarta.websocket.PongMessage;
public class WsPongMessage implements PongMessage {
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
index 964223b..afb59e9 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
@@ -19,8 +19,8 @@ package org.apache.tomcat.websocket;
import java.nio.ByteBuffer;
import java.util.concurrent.Future;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendHandler;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.SendHandler;
public class WsRemoteEndpointAsync extends WsRemoteEndpointBase
implements RemoteEndpoint.Async {
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
index e883c2c..65a5f27 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.RemoteEndpoint;
+import jakarta.websocket.RemoteEndpoint;
public abstract class WsRemoteEndpointBase implements RemoteEndpoint {
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
index b0fc050..27859aa 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
@@ -21,8 +21,8 @@ import java.io.OutputStream;
import java.io.Writer;
import java.nio.ByteBuffer;
-import javax.websocket.EncodeException;
-import javax.websocket.RemoteEndpoint;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.RemoteEndpoint;
public class WsRemoteEndpointBasic extends WsRemoteEndpointBase
implements RemoteEndpoint.Basic {
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 548f5a9..08f3bf3 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -33,15 +33,15 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.DeploymentException;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
index 473fda2..789326b 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
public class WsRemoteEndpointImplClient extends WsRemoteEndpointImplBase {
diff --git a/java/org/apache/tomcat/websocket/WsSession.java b/java/org/apache/tomcat/websocket/WsSession.java
index 37bff32..b52d402 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -30,22 +30,22 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCode;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.MessageHandler.Partial;
-import javax.websocket.MessageHandler.Whole;
-import javax.websocket.PongMessage;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCode;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler.Partial;
+import jakarta.websocket.MessageHandler.Whole;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index 4ea31fc..e849648 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -54,16 +54,17 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.TrustManagerFactory;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
index 75615d4..41ddd0d 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
@@ -21,11 +21,11 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Map;
import java.util.Set;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
index f4d0567..2d9e224 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
@@ -19,16 +19,16 @@ package org.apache.tomcat.websocket.pojo;
import java.util.Collections;
import java.util.List;
-import javax.websocket.Decoder;
-import javax.websocket.DeploymentException;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
/**
* Wrapper class for instances of POJOs annotated with
- * {@link javax.websocket.ClientEndpoint} so they appear as standard
- * {@link javax.websocket.Endpoint} instances.
+ * {@link jakarta.websocket.ClientEndpoint} so they appear as standard
+ * {@link jakarta.websocket.Endpoint} instances.
*/
public class PojoEndpointClient extends PojoEndpointBase {
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
index 48af737..b41145c 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
@@ -18,16 +18,16 @@ package org.apache.tomcat.websocket.pojo;
import java.util.Map;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.util.res.StringManager;
/**
* Wrapper class for instances of POJOs annotated with
- * {@link javax.websocket.server.ServerEndpoint} so they appear as standard
- * {@link javax.websocket.Endpoint} instances.
+ * {@link jakarta.websocket.server.ServerEndpoint} so they appear as standard
+ * {@link jakarta.websocket.Endpoint} instances.
*/
public class PojoEndpointServer extends PojoEndpointBase {
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
index bc125c7..333e870 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import javax.websocket.EncodeException;
-import javax.websocket.MessageHandler;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.Session;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.Session;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.websocket.WrappedMessageHandler;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
index 4a0f525..2d7eddd 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
@@ -20,9 +20,9 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import javax.websocket.DecodeException;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
import org.apache.tomcat.websocket.WsSession;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
index 6446efb..0ca701a 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
/**
* ByteBuffer specific concrete implementation for handling partial messages.
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
index 683634b..a52757c 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
/**
* Text specific concrete implementation for handling partial messages.
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
index aa4abbe..e973552 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
@@ -19,9 +19,9 @@ package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.websocket.DecodeException;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
import org.apache.tomcat.websocket.WsSession;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
index e4756f6..07b49ce 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
@@ -23,12 +23,12 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.Decoder.Binary;
-import javax.websocket.Decoder.BinaryStream;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Decoder.Binary;
+import jakarta.websocket.Decoder.BinaryStream;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
index 762814d..64bd6ba 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholePong.java
@@ -18,8 +18,8 @@ package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
/**
* PongMessage specific concrete implementation for handling whole messages.
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
index 3ec4bd7..0cb5fec 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
@@ -22,12 +22,12 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.Decoder.Text;
-import javax.websocket.Decoder.TextStream;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Decoder.Text;
+import jakarta.websocket.Decoder.TextStream;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.Util;
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
index d640b53..4ace70f 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
@@ -30,19 +30,19 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.websocket.CloseReason;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.DeploymentException;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.DecoderEntry;
@@ -51,7 +51,7 @@ import org.apache.tomcat.websocket.Util.DecoderMatch;
/**
* For a POJO class annotated with
- * {@link javax.websocket.server.ServerEndpoint}, an instance of this class
+ * {@link jakarta.websocket.server.ServerEndpoint}, an instance of this class
* creates and caches the method handler, method information and parameter
* information for the onXXX calls.
*/
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java b/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java
index f35249e..442f4c3 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java
@@ -16,17 +16,17 @@
*/
package org.apache.tomcat.websocket.pojo;
-import javax.websocket.DeploymentException;
+import jakarta.websocket.DeploymentException;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.Util;
/**
* Stores the parameter type and name for a parameter that needs to be passed to
- * an onXxx method of {@link javax.websocket.Endpoint}. The name is only present
+ * an onXxx method of {@link jakarta.websocket.Endpoint}. The name is only present
* for parameters annotated with
- * {@link javax.websocket.server.PathParam}. For the
- * {@link javax.websocket.Session} and {@link java.lang.Throwable} parameters,
+ * {@link jakarta.websocket.server.PathParam}. For the
+ * {@link jakarta.websocket.Session} and {@link java.lang.Throwable} parameters,
* {@link #getName()} will always return <code>null</code>.
*/
public class PojoPathParam {
diff --git a/java/org/apache/tomcat/websocket/pojo/package-info.java b/java/org/apache/tomcat/websocket/pojo/package-info.java
index 28daf9d..31f4c6a 100644
--- a/java/org/apache/tomcat/websocket/pojo/package-info.java
+++ b/java/org/apache/tomcat/websocket/pojo/package-info.java
@@ -16,6 +16,6 @@
*/
/**
* This package provides the necessary plumbing to convert an annotated POJO
- * into a WebSocket {@link javax.websocket.Endpoint}.
+ * into a WebSocket {@link jakarta.websocket.Endpoint}.
*/
package org.apache.tomcat.websocket.pojo;
\ No newline at end of file
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java b/java/org/apache/tomcat/websocket/server/Constants.java
index 876f1b8..1676861 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -29,7 +29,7 @@ public class Constants {
"org.apache.tomcat.websocket.noAddAfterHandshake";
public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
- "javax.websocket.server.ServerContainer";
+ "jakarta.websocket.server.ServerContainer";
private Constants() {
diff --git a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
index 75b8d70..a64b830 100644
--- a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++ b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -21,10 +21,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
public class DefaultServerEndpointConfigurator
extends ServerEndpointConfig.Configurator {
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index 598dee0..8e647df 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -26,16 +26,15 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/server/UriTemplate.java b/java/org/apache/tomcat/websocket/server/UriTemplate.java
index a9b8eb9..6419ed0 100644
--- a/java/org/apache/tomcat/websocket/server/UriTemplate.java
+++ b/java/org/apache/tomcat/websocket/server/UriTemplate.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.websocket.DeploymentException;
+import jakarta.websocket.DeploymentException;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index c04cf05..a10cb8c 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -27,9 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.websocket.server.HandshakeRequest;
-
import jakarta.servlet.http.HttpServletRequest;
+import jakarta.websocket.server.HandshakeRequest;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index b882abb..c449108 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -20,15 +20,14 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.WebConnection;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.juli.logging.Log;
diff --git a/java/org/apache/tomcat/websocket/server/WsMappingResult.java b/java/org/apache/tomcat/websocket/server/WsMappingResult.java
index 097386b..5125231 100644
--- a/java/org/apache/tomcat/websocket/server/WsMappingResult.java
+++ b/java/org/apache/tomcat/websocket/server/WsMappingResult.java
@@ -18,7 +18,7 @@ package org.apache.tomcat.websocket.server;
import java.util.Map;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
class WsMappingResult {
diff --git a/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java b/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
index aab9e7f..07452e9 100644
--- a/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
+++ b/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
@@ -20,10 +20,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerEndpointConfig;
/**
* Wraps the provided {@link ServerEndpointConfig} and provides a per session
diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index 0fee189..d56ba3d 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -24,8 +24,8 @@ import java.nio.channels.CompletionHandler;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -36,7 +36,7 @@ import org.apache.tomcat.websocket.Transformation;
import org.apache.tomcat.websocket.WsRemoteEndpointImplBase;
/**
- * This is the server side {@link javax.websocket.RemoteEndpoint} implementation
+ * This is the server side {@link jakarta.websocket.RemoteEndpoint} implementation
* - i.e. what the server uses to send data to the client.
*/
public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
@@ -257,7 +257,7 @@ public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
* @param useDispatch Should {@link SendHandler#onResult(SendResult)} be
* called from a new thread, keeping in mind the
* requirements of
- * {@link javax.websocket.RemoteEndpoint.Async}
+ * {@link jakarta.websocket.RemoteEndpoint.Async}
*/
private void clearHandler(Throwable t, boolean useDispatch) {
// Setting the result marks this (partial) message as
diff --git a/java/org/apache/tomcat/websocket/server/WsSci.java b/java/org/apache/tomcat/websocket/server/WsSci.java
index 348c2a5..007cac6 100644
--- a/java/org/apache/tomcat/websocket/server/WsSci.java
+++ b/java/org/apache/tomcat/websocket/server/WsSci.java
@@ -20,17 +20,16 @@ import java.lang.reflect.Modifier;
import java.util.HashSet;
import java.util.Set;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.HandlesTypes;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.server.ServerApplicationConfig;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.util.compat.JreCompat;
@@ -59,7 +58,7 @@ public class WsSci implements ServletContainerInitializer {
Set<Class<?>> scannedPojoEndpoints = new HashSet<>();
try {
- // wsPackage is "javax.websocket."
+ // wsPackage is "jakarta.websocket."
String wsPackage = ContainerProvider.class.getName();
wsPackage = wsPackage.substring(0, wsPackage.lastIndexOf('.') + 1);
for (Class<?> clazz : clazzes) {
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index 75f4566..e0f7c4f 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -25,21 +25,20 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.DeploymentException;
-import javax.websocket.Encoder;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
-
import jakarta.servlet.DispatcherType;
import jakarta.servlet.FilterRegistration;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.res.StringManager;
diff --git a/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider b/res/META-INF/tomcat-websocket.jar/services/jakarta.websocket.ContainerProvider
similarity index 100%
rename from res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider
rename to res/META-INF/tomcat-websocket.jar/services/jakarta.websocket.ContainerProvider
diff --git a/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator b/res/META-INF/tomcat-websocket.jar/services/jakarta.websocket.server.ServerEndpointConfig$Configurator
similarity index 100%
rename from res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
rename to res/META-INF/tomcat-websocket.jar/services/jakarta.websocket.server.ServerEndpointConfig$Configurator
diff --git a/res/META-INF/websocket-api.jar.manifest b/res/META-INF/websocket-api.jar.manifest
index e675ab2..f0daa6b 100644
--- a/res/META-INF/websocket-api.jar.manifest
+++ b/res/META-INF/websocket-api.jar.manifest
@@ -2,10 +2,10 @@ Manifest-version: 1.0
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
-Name: javax/websocket/
+Name: jakarta/websocket/
Specification-Title: WebSocket
Specification-Version: 1.1
Specification-Vendor: Oracle, Inc.
-Implementation-Title: javax.websocket
+Implementation-Title: jakarta.websocket
Implementation-Version: 1.1.@websocket.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 3a45335..1979452 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -17,7 +17,7 @@ Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Bundle-Version: @VERSION@
Export-Package: \
- javax.websocket,\
- javax.websocket.server,\
+ jakarta.websocket,\
+ jakarta.websocket.server,\
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd
index c14ea03..c7d5f62 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -16,5 +16,5 @@ Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
Bundle-Version: @VERSION@
Export-Package: \
- javax.websocket,\
- javax.websocket.server
\ No newline at end of file
+ jakarta.websocket,\
+ jakarta.websocket.server
\ No newline at end of file
diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml
index 3a548f2..572c6a7 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -69,4 +69,7 @@
<allow pkg="jakarta.transaction"/>
<allow pkg="javax.transaction.xa"/>
</subpackage>
+ <subpackage name="websocket">
+ <allow pkg="jakarta.websocket"/>
+ </subpackage>
</import-control>
\ No newline at end of file
diff --git a/res/checkstyle/javax-import-control.xml b/res/checkstyle/javax-import-control.xml
index bc61d54..5f6e23f 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,9 +21,6 @@
<import-control pkg="javax">
<allow pkg="java"/>
- <subpackage name="websocket">
- <allow pkg="javax.websocket"/>
- </subpackage>
<subpackage name="xml.ws">
<allow pkg="javax.xwl.ws"/>
</subpackage>
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index d0ad044..e35985c 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -172,7 +172,7 @@
</subpackage>
</subpackage>
<subpackage name="websocket">
- <allow pkg="javax.websocket"/>
+ <allow pkg="jakarta.websocket"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat"/>
<allow pkg="org.apache.tomcat.util"/>
diff --git a/test/javax/websocket/TesterContainerProviderPerformance.java b/test/jakarta/websocket/TesterContainerProviderPerformance.java
similarity index 98%
rename from test/javax/websocket/TesterContainerProviderPerformance.java
rename to test/jakarta/websocket/TesterContainerProviderPerformance.java
index 92b617a..a3c8a87 100644
--- a/test/javax/websocket/TesterContainerProviderPerformance.java
+++ b/test/jakarta/websocket/TesterContainerProviderPerformance.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.function.IntConsumer;
import java.util.function.Supplier;
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoader.java b/test/org/apache/catalina/loader/TestWebappClassLoader.java
index df4fb87..426247d 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoader.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java
@@ -103,7 +103,7 @@ public class TestWebappClassLoader extends TomcatBaseTest {
"org.apache.tomcat",
"jakarta.el",
"jakarta.servlet",
- "javax.websocket",
+ "jakarta.websocket",
"jakarta.security.auth.message"
};
diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 85c2a0f..9335fdc 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.ClientEndpointConfig.Builder;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig.Builder;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 9139460..d2b74e9 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.websocket.Extension;
-import javax.websocket.Extension.Parameter;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Extension.Parameter;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestUtil.java b/test/org/apache/tomcat/websocket/TestUtil.java
index 9c64417..c76a6f0 100644
--- a/test/org/apache/tomcat/websocket/TestUtil.java
+++ b/test/org/apache/tomcat/websocket/TestUtil.java
@@ -19,12 +19,12 @@ package org.apache.tomcat.websocket;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.Extension.Parameter;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Extension.Parameter;
+import jakarta.websocket.MessageHandler;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index 016bd8d..4449ac1 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -24,11 +24,11 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ClientEndpointConfig.Configurator;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index ab12e0c..d27e4dd 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -21,11 +21,11 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
index 6ed5483..25951da 100644
--- a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
+++ b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
@@ -22,11 +22,11 @@ import java.nio.charset.StandardCharsets;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java b/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
index 8c01d1a..d2c9edd 100644
--- a/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
+++ b/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
@@ -26,11 +26,11 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig.Builder;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig.Builder;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 8af8679..cd2483e 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -23,14 +23,14 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
index d6b848e..8bc21fe 100644
--- a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
+++ b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
@@ -20,14 +20,14 @@ import java.net.URI;
import java.util.Arrays;
import java.util.List;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
index de98974..1554cf0 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
@@ -29,21 +29,20 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
@@ -120,7 +119,7 @@ public class TestWsWebSocketContainer extends WebSocketBaseTest {
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected=jakarta.websocket.DeploymentException.class)
public void testConnectToServerEndpointInvalidScheme() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -138,7 +137,7 @@ public class TestWsWebSocketContainer extends WebSocketBaseTest {
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected=jakarta.websocket.DeploymentException.class)
public void testConnectToServerEndpointNoHost() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index dcea80b..91d730a 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -23,21 +23,20 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/TesterAsyncTiming.java b/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
index e9b7a3a..61cfbff 100644
--- a/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
+++ b/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
@@ -19,12 +19,12 @@ package org.apache.tomcat.websocket;
import java.nio.ByteBuffer;
import java.util.concurrent.Semaphore;
-import javax.websocket.OnMessage;
-import javax.websocket.RemoteEndpoint.Async;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.RemoteEndpoint.Async;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.apache.tomcat.websocket.server.TesterEndpointConfig;
diff --git a/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java b/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
index 423e01e..3a691aa 100644
--- a/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
+++ b/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
@@ -19,9 +19,9 @@ package org.apache.tomcat.websocket;
import java.util.Collections;
import java.util.Set;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.server.ServerApplicationConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
/**
* This configuration blocks any endpoints discovered by the SCI from being
diff --git a/test/org/apache/tomcat/websocket/TesterEchoServer.java b/test/org/apache/tomcat/websocket/TesterEchoServer.java
index eb20213..cfc0855 100644
--- a/test/org/apache/tomcat/websocket/TesterEchoServer.java
+++ b/test/org/apache/tomcat/websocket/TesterEchoServer.java
@@ -19,13 +19,12 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.DeploymentException;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.apache.tomcat.websocket.server.Constants;
import org.apache.tomcat.websocket.server.WsContextListener;
diff --git a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
index 8b4b1ef..e16b11b 100644
--- a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
+++ b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
@@ -19,13 +19,13 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.RemoteEndpoint.Basic;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.RemoteEndpoint.Basic;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.apache.tomcat.websocket.server.TesterEndpointConfig;
diff --git a/test/org/apache/tomcat/websocket/TesterMessageCountClient.java b/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
index f340cbb..8faa193 100644
--- a/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
+++ b/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
@@ -23,15 +23,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
public class TesterMessageCountClient {
diff --git a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
index 1b5ee39..4917004 100644
--- a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
+++ b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
@@ -23,16 +23,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index a82a157..ed5e771 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -27,26 +27,25 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.DeploymentException;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java b/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
index b98cdcd..2177ac4 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
@@ -20,15 +20,15 @@ import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java b/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
index e4ebc18..14b916d 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
@@ -20,14 +20,14 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.ContainerProvider;
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/pojo/TesterUtil.java b/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
index d3611a0..4c5db6d 100644
--- a/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
+++ b/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
@@ -16,8 +16,8 @@
*/
package org.apache.tomcat.websocket.pojo;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
import org.apache.tomcat.websocket.server.TesterEndpointConfig;
diff --git a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
index 7937818..e9a5893 100644
--- a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
+++ b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
@@ -20,11 +20,11 @@ import java.net.URI;
import java.nio.ByteBuffer;
import java.util.concurrent.CountDownLatch;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
import org.junit.Ignore;
diff --git a/test/org/apache/tomcat/websocket/server/TestClassLoader.java b/test/org/apache/tomcat/websocket/server/TestClassLoader.java
index b182ef6..84afed1 100644
--- a/test/org/apache/tomcat/websocket/server/TestClassLoader.java
+++ b/test/org/apache/tomcat/websocket/server/TestClassLoader.java
@@ -20,13 +20,13 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ContainerProvider;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java b/test/org/apache/tomcat/websocket/server/TestClose.java
index 30c18bb..cc8dc57 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -22,15 +22,15 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCode;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCode;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Assume;
diff --git a/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java b/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
index b0785c6..7feb93b 100644
--- a/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
+++ b/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
@@ -19,20 +19,19 @@ package org.apache.tomcat.websocket.server;
import java.net.URI;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/server/TestShutdown.java b/test/org/apache/tomcat/websocket/server/TestShutdown.java
index 6cd7f18..6a4a881 100644
--- a/test/org/apache/tomcat/websocket/server/TestShutdown.java
+++ b/test/org/apache/tomcat/websocket/server/TestShutdown.java
@@ -22,14 +22,14 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
index 77987ac..cbc0bd3 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
@@ -23,18 +23,18 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
index 1eb69d5..28fc72b 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
@@ -21,12 +21,12 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ContainerProvider;
-import javax.websocket.DeploymentException;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
import org.junit.Test;
diff --git a/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java b/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
index 855c194..9346606 100644
--- a/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
+++ b/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
@@ -16,11 +16,10 @@
*/
package org.apache.tomcat.websocket.server;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-
import jakarta.servlet.ServletContextEvent;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
public abstract class TesterEndpointConfig extends WsContextListener {
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 01cdbc7..e1b7962 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -22,7 +22,7 @@ import java.io.InputStreamReader;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
-import javax.websocket.CloseReason.CloseCode;
+import jakarta.websocket.CloseReason.CloseCode;
/**
* A client for testing Websocket behavior that differs from standard client
diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml
index 69b8baf..6729d90 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -94,14 +94,14 @@
<p>When using the WebSocket client to connect to server endpoints, the timeout
for IO operations while establishing the connection is controlled by the
<code>userProperties</code> of the provided
- <code>javax.websocket.ClientEndpointConfig</code>. The property is
+ <code>jakarta.websocket.ClientEndpointConfig</code>. The property is
<code>org.apache.tomcat.websocket.IO_TIMEOUT_MS</code> and is the
timeout as a <code>String</code> in milliseconds. The default is 5000 (5
seconds).</p>
<p>When using the WebSocket client to connect to secure server endpoints, the
client SSL configuration is controlled by the <code>userProperties</code>
- of the provided <code>javax.websocket.ClientEndpointConfig</code>. The
+ of the provided <code>jakarta.websocket.ClientEndpointConfig</code>. The
following user properties are supported:</p>
<ul>
<li><code>org.apache.tomcat.websocket.SSL_CONTEXT</code></li>
@@ -129,7 +129,7 @@
<p>When using the WebSocket client to connect to server endpoints, the number of
HTTP redirects that the client will follow is controlled by the
<code>userProperties</code> of the provided
- <code>javax.websocket.ClientEndpointConfig</code>. The property is
+ <code>jakarta.websocket.ClientEndpointConfig</code>. The property is
<ocde>org.apache.tomcat.websocket.MAX_REDIRECTIONS</ocde>. The default value
is 20. Redirection support can be disabled by configuring a value of zero.</p>
diff --git a/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java b/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
index ba8c60b..5222a17 100644
--- a/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
+++ b/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
@@ -19,9 +19,9 @@ package websocket;
import java.util.HashSet;
import java.util.Set;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.server.ServerApplicationConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
import websocket.drawboard.DrawboardEndpoint;
import websocket.echo.EchoEndpoint;
diff --git a/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java b/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
index d1d5523..c0a2f2b 100644
--- a/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
@@ -21,12 +21,12 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java b/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
index 909950d..549fd74 100644
--- a/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
+++ b/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
@@ -19,12 +19,12 @@ package websocket.drawboard;
import java.io.IOException;
import java.util.LinkedList;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.RemoteEndpoint.Async;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.RemoteEndpoint.Async;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
import websocket.drawboard.wsmessages.AbstractWebsocketMessage;
import websocket.drawboard.wsmessages.BinaryWebsocketMessage;
diff --git a/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java b/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
index cd99f49..df98966 100644
--- a/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
+++ b/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
@@ -19,11 +19,11 @@ package websocket.drawboard;
import java.io.EOFException;
import java.io.IOException;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
diff --git a/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java b/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
index 34f0de2..7cb3aa6 100644
--- a/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
@@ -19,10 +19,10 @@ package websocket.echo;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.OnMessage;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
/**
* The three annotated echo endpoints can be used to test with Autobahn and
diff --git a/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java b/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
index 39df783..1d92fd4 100644
--- a/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
@@ -24,9 +24,9 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.websocket.OnMessage;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
/**
* The three annotated echo endpoints can be used to test with Autobahn and
@@ -36,7 +36,7 @@ import javax.websocket.Session;
* Note: This one is disabled by default since it allocates memory, and needs
* to be enabled back.
*/
-//@javax.websocket.server.ServerEndpoint("/websocket/echoAsyncAnnotation")
+//@jakarta.websocket.server.ServerEndpoint("/websocket/echoAsyncAnnotation")
public class EchoAsyncAnnotation {
private static final Future<Void> COMPLETED = new CompletedFuture();
diff --git a/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java b/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
index 3620238..8652861 100644
--- a/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
+++ b/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
@@ -19,11 +19,11 @@ package websocket.echo;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.Session;
public class EchoEndpoint extends Endpoint {
diff --git a/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java b/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
index 7aef821..95f4c1a 100644
--- a/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
-import javax.websocket.OnMessage;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
/**
* The three annotated echo endpoints can be used to test with Autobahn and
diff --git a/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java b/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
index 7a11222..619a879 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java
@@ -21,9 +21,9 @@ import java.util.ArrayDeque;
import java.util.Collection;
import java.util.Deque;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.Session;
public class Snake {
diff --git a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
index c030dbc..43d61c6 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
@@ -22,12 +22,12 @@ import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/websocket/snake")
public class SnakeAnnotation {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org