Converting from javax.* to jakarta.*

api/client/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.websocket</groupId>
         <artifactId>jakarta.websocket-all</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.websocket-client-api</artifactId>

api/client/src/main/java/javax/websocket/ClientEndpoint.java → api/client/src/main/java/jakarta/websocket/ClientEndpoint.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -24,7 +24,7 @@
 
 /**
  * The ClientEndpoint annotation a class level annotation is used to denote that a POJO is a web socket client and can
- * be deployed as such. Similar to {@code javax.websocket.server.ServerEndpoint}, POJOs that are annotated with this
+ * be deployed as such. Similar to {@code jakarta.websocket.server.ServerEndpoint}, POJOs that are annotated with this
  * annotation can have methods that, using the web socket method level annotations, are web socket lifecycle methods.
  * <p>
  * For example:

api/client/src/main/java/javax/websocket/ClientEndpointConfig.java → api/client/src/main/java/jakarta/websocket/ClientEndpointConfig.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.ArrayList;
 import java.util.Collections;

api/client/src/main/java/javax/websocket/CloseReason.java → api/client/src/main/java/jakarta/websocket/CloseReason.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.UnsupportedEncodingException;
 

api/client/src/main/java/javax/websocket/ContainerProvider.java → api/client/src/main/java/jakarta/websocket/ContainerProvider.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.Iterator;
 import java.util.ServiceLoader;
@@ -25,7 +25,7 @@
  * provider class uses the
  * <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html">ServiceLoader</a> to load an
  * implementation of ContainerProvider. Specifically, the fully qualified class name of the container implementation of
- * ContainerProvider must be listed in the "META-INF/services/javax.websocket.ContainerProvider" file in the
+ * ContainerProvider must be listed in the "META-INF/services/jakarta.websocket.ContainerProvider" file in the
  * implementation JAR file.
  *
  * @author dannycoward
@@ -34,7 +34,7 @@ public abstract class ContainerProvider {
 
     /**
      * Obtain a new instance of a WebSocketContainer. The method looks for the ContainerProvider implementation class in
-     * the order listed in the "META-INF/services/javax.websocket.ContainerProvider" file, returning the first
+     * the order listed in the "META-INF/services/jakarta.websocket.ContainerProvider" file, returning the first
      * WebSocketContainer implementation from the ContainerProvider implementation that is not {@code null}.
      *
      * @return an implementation provided instance of type WebSocketContainer

api/client/src/main/java/javax/websocket/DecodeException.java → api/client/src/main/java/jakarta/websocket/DecodeException.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.nio.ByteBuffer;
 

api/client/src/main/java/javax/websocket/Decoder.java → api/client/src/main/java/jakarta/websocket/Decoder.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +26,7 @@
  * The Decoder interface holds member interfaces that define how a developer can provide the web socket container a way
  * web socket messages into developer defined custom objects. The websocket implementation creates a new instance of the
  * decoder per endpoint instance per connection. The lifecycle of the Decoder instance is governed by the container
- * calls to the {@link Decoder#init(javax.websocket.EndpointConfig)} and {@link Decoder#destroy() } methods.
+ * calls to the {@link Decoder#init(jakarta.websocket.EndpointConfig)} and {@link Decoder#destroy() } methods.
  *
  * @author dannycoward
  */

api/client/src/main/java/javax/websocket/DefaultClientEndpointConfig.java → api/client/src/main/java/jakarta/websocket/DefaultClientEndpointConfig.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.Collections;
 import java.util.HashMap;

api/client/src/main/java/javax/websocket/DeploymentException.java → api/client/src/main/java/jakarta/websocket/DeploymentException.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * Checked exception indicating some kind of failure either to publish an endpoint on its server, or a failure to

api/client/src/main/java/javax/websocket/EncodeException.java → api/client/src/main/java/jakarta/websocket/EncodeException.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * A general exception that occurs when trying to encode a custom object to a string or binary message.

api/client/src/main/java/javax/websocket/Encoder.java → api/client/src/main/java/jakarta/websocket/Encoder.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -28,7 +28,7 @@
  * text, binary data, character stream and write to an output stream. The websocket implementation creates a new
  * instance of the encoder per endpoint instance per connection. This means that each encoder instance has at most one
  * calling thread at a time. The lifecycle of the Encoder instance is governed by the container calls to the
- * {@link Encoder#init(javax.websocket.EndpointConfig)} and {@link Encoder#destroy() } methods.
+ * {@link Encoder#init(jakarta.websocket.EndpointConfig)} and {@link Encoder#destroy() } methods.
  *
  * @author dannycoward
  */

api/client/src/main/java/javax/websocket/Endpoint.java → api/client/src/main/java/jakarta/websocket/Endpoint.java

@@ -15,13 +15,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * The Web Socket Endpoint represents an object that can handle websocket conversations. Developers may extend this
  * class in order to implement a programmatic websocket endpoint. The Endpoint class holds lifecycle methods that may be
  * overridden to intercept websocket open, error and close events. By implementing the
- * {@link Endpoint#onOpen(javax.websocket.Session, javax.websocket.EndpointConfig) onOpen} method, the programmatic
+ * {@link Endpoint#onOpen(jakarta.websocket.Session, jakarta.websocket.EndpointConfig) onOpen} method, the programmatic
  * endpoint gains access to the {@link Session} object, to which the developer may add {@link MessageHandler}
  * implementations in order to intercept incoming websocket messages. Each instance of a websocket endpoint is
  * guaranteed not to be called by more than one thread at a time per active connection.
@@ -31,14 +31,14 @@
  *
  * <p>
  * When deployed as a server endpoint, the implementation uses the
- * {@code javax.websocket.server.ServerEndpointConfig.Configurator#getEndpointInstance} method to obtain the endpoint
+ * {@code jakarta.websocket.server.ServerEndpointConfig.Configurator#getEndpointInstance} method to obtain the endpoint
  * instance it will use for each new client connection. If the developer uses the default
- * {@code javax.websocket.server.ServerEndpointConfig.Configurator}, there will be precisely one endpoint instance per
+ * {@code jakarta.websocket.server.ServerEndpointConfig.Configurator}, there will be precisely one endpoint instance per
  * active client connection. Consequently, in this typical case, when implementing/overriding the methods of Endpoint,
  * the developer is guaranteed that there will be at most one thread calling each endpoint instance at a time.
  *
  * <p>
- * If the developer provides a custom {@code javax.websocket.server.ServerEndpointConfig.Configurator} which overrides
+ * If the developer provides a custom {@code jakarta.websocket.server.ServerEndpointConfig.Configurator} which overrides
  * the default policy for endpoint instance creation, for example, using a single Endpoint instance for multiple client
  * connections, the developer may need to write code that can execute concurrently.
  *

api/client/src/main/java/javax/websocket/EndpointConfig.java → api/client/src/main/java/jakarta/websocket/EndpointConfig.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.List;
 import java.util.Map;

api/client/src/main/java/javax/websocket/Extension.java → api/client/src/main/java/jakarta/websocket/Extension.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.List;
 

api/client/src/main/java/javax/websocket/HandshakeResponse.java → api/client/src/main/java/jakarta/websocket/HandshakeResponse.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.util.List;
 import java.util.Map;

api/client/src/main/java/javax/websocket/MessageHandler.java → api/client/src/main/java/jakarta/websocket/MessageHandler.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * Developers implement MessageHandlers in order to receive incoming messages during a web socket conversation. Each web

api/client/src/main/java/javax/websocket/OnClose.java → api/client/src/main/java/jakarta/websocket/OnClose.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@
  * <ul>
  * <li>optional {@link Session} parameter</li>
  * <li>optional {@link CloseReason} parameter</li>
- * <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation.</li>
+ * <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation.</li>
  * </ul>
  *
  * <p>

api/client/src/main/java/javax/websocket/OnError.java → api/client/src/main/java/jakarta/websocket/OnError.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@
  * <ul>
  * <li>optional {@link Session} parameter</li>
  * <li>a {@link java.lang.Throwable} parameter</li>
- * <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation</li>
+ * <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation</li>
  * </ul>
  *
  * <p>

api/client/src/main/java/javax/websocket/OnMessage.java → api/client/src/main/java/jakarta/websocket/OnMessage.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -58,7 +58,7 @@
  * </li>
  * </ul>
  * </li>
- * <li>and Zero to n String or Java primitive parameters annotated with the {@code javax.websocket.server.PathParam}
+ * <li>and Zero to n String or Java primitive parameters annotated with the {@code jakarta.websocket.server.PathParam}
  * annotation for server endpoints.</li>
  * <li>and an optional {@link Session} parameter</li>
  * </ol>

api/client/src/main/java/javax/websocket/OnOpen.java → api/client/src/main/java/jakarta/websocket/OnOpen.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@
  * <ul>
  * <li>optional {@link Session} parameter</li>
  * <li>optional {@link EndpointConfig} parameter</li>
- * <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation.</li>
+ * <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation.</li>
  * </ul>
  *
  * <p>

api/client/src/main/java/javax/websocket/PongMessage.java → api/client/src/main/java/jakarta/websocket/PongMessage.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.nio.ByteBuffer;
 

api/client/src/main/java/javax/websocket/RemoteEndpoint.java → api/client/src/main/java/jakarta/websocket/RemoteEndpoint.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.IOException;
 import java.io.OutputStream;

api/client/src/main/java/javax/websocket/SendHandler.java → api/client/src/main/java/jakarta/websocket/SendHandler.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * A simple callback object for asynchronous sending of web socket messages.

api/client/src/main/java/javax/websocket/SendResult.java → api/client/src/main/java/jakarta/websocket/SendResult.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * The result of asynchronously sending a web socket message. A SendResult is either ok indicating there was no problem,

api/client/src/main/java/javax/websocket/Session.java → api/client/src/main/java/jakarta/websocket/Session.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -61,10 +61,10 @@ public interface Session extends Closeable {
      * Adding more than one of any one type will result in a runtime exception.
      * <p>
      * This method is not safe to use unless you are providing an anonymous class derived directly from
-     * {@link javax.websocket.MessageHandler.Whole} or {@link javax.websocket.MessageHandler.Partial}. In all other
+     * {@link jakarta.websocket.MessageHandler.Whole} or {@link jakarta.websocket.MessageHandler.Partial}. In all other
      * cases (Lambda Expressions, more complex inheritance or generic type arrangements), one of the following methods
-     * have to be used: {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Whole)} or
-     * {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Partial)}.
+     * have to be used: {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Whole)} or
+     * {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Partial)}.
      *
      * @param handler the MessageHandler to be added.
      * @throws IllegalStateException if there is already a MessageHandler registered for the same native websocket

api/client/src/main/java/javax/websocket/SessionException.java → api/client/src/main/java/jakarta/websocket/SessionException.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 /**
  * A SessionException represents a general exception type reporting problems occurring on a websocket session.

api/client/src/main/java/javax/websocket/WebSocketContainer.java → api/client/src/main/java/jakarta/websocket/WebSocketContainer.java

@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.websocket;
+package jakarta.websocket;
 
 import java.io.*;
 import java.net.URI;
@@ -58,7 +58,7 @@ public interface WebSocketContainer {
 
     /**
      * Connect the supplied annotated endpoint instance to its server. The supplied object must be a class decorated
-     * with the class level {@code javax.websocket.server.ServerEndpoint} annotation. This method blocks until the
+     * with the class level {@code jakarta.websocket.server.ServerEndpoint} annotation. This method blocks until the
      * connection is established, or throws an error if either the connection could not be made or there was a problem
      * with the supplied endpoint class. If the developer uses this method to deploy the client endpoint, services like
      * dependency injection that are supported, for example, when the implementation is part of the Java EE platform may
@@ -77,7 +77,7 @@ public interface WebSocketContainer {
 
     /**
      * Connect the supplied annotated endpoint to its server. The supplied object must be a class decorated with the
-     * class level {@code javax.websocket.server.ServerEndpoint} annotation. This method blocks until the connection is
+     * class level {@code jakarta.websocket.server.ServerEndpoint} annotation. This method blocks until the connection is
      * established, or throws an error if either the connection could not be made or there was a problem with the
      * supplied endpoint class.
      *
@@ -97,7 +97,7 @@ public interface WebSocketContainer {
      * developer uses this method to deploy the client endpoint, services like dependency injection that are supported,
      * for example, when the implementation is part of the Java EE platform may not be available. If the client endpoint
      * uses dependency injection, use
-     * {@link WebSocketContainer#connectToServer(java.lang.Class, javax.websocket.ClientEndpointConfig, java.net.URI) }
+     * {@link WebSocketContainer#connectToServer(java.lang.Class, jakarta.websocket.ClientEndpointConfig, java.net.URI) }
      * instead.
      *
      * @param endpointInstance the programmatic client endpoint instance {@link Endpoint}.

api/client/src/main/java/javax/websocket/package-info.java → api/client/src/main/java/jakarta/websocket/package-info.java

@@ -18,4 +18,4 @@
 /**
  * This package contains all the Jakartq WebSocket APIs common to both the client and server side.
  */
-package javax.websocket;
+package jakarta.websocket;