From 90dcca87151de0bdcd4a00e803abdd90fe5323fc Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 27 Nov 2019 08:39:08 -0600 Subject: [PATCH] Converting from javax.* to jakarta.* (#312) * Converting from javax.* to jakarta.* * Updating spec version to 2.0 Signed-off-by: Joakim Erdfelt --- api/client/pom.xml | 2 +- .../websocket/ClientEndpoint.java | 4 ++-- .../websocket/ClientEndpointConfig.java | 2 +- .../websocket/CloseReason.java | 2 +- .../websocket/ContainerProvider.java | 6 +++--- .../websocket/DecodeException.java | 2 +- .../{javax => jakarta}/websocket/Decoder.java | 4 ++-- .../websocket/DefaultClientEndpointConfig.java | 2 +- .../websocket/DeploymentException.java | 2 +- .../websocket/EncodeException.java | 2 +- .../{javax => jakarta}/websocket/Encoder.java | 4 ++-- .../{javax => jakarta}/websocket/Endpoint.java | 10 +++++----- .../websocket/EndpointConfig.java | 2 +- .../websocket/Extension.java | 2 +- .../websocket/HandshakeResponse.java | 2 +- .../websocket/MessageHandler.java | 2 +- .../{javax => jakarta}/websocket/OnClose.java | 4 ++-- .../{javax => jakarta}/websocket/OnError.java | 4 ++-- .../websocket/OnMessage.java | 4 ++-- .../{javax => jakarta}/websocket/OnOpen.java | 4 ++-- .../websocket/PongMessage.java | 2 +- .../websocket/RemoteEndpoint.java | 2 +- .../websocket/SendHandler.java | 2 +- .../websocket/SendResult.java | 2 +- .../{javax => jakarta}/websocket/Session.java | 8 ++++---- .../websocket/SessionException.java | 2 +- .../websocket/WebSocketContainer.java | 8 ++++---- .../websocket/package-info.java | 2 +- api/pom.xml | 18 +++++++++--------- api/server/pom.xml | 2 +- .../server/DefaultServerEndpointConfig.java | 10 +++++----- .../websocket/server/HandshakeRequest.java | 2 +- .../websocket/server/PathParam.java | 2 +- .../server/ServerApplicationConfig.java | 4 ++-- .../websocket/server/ServerContainer.java | 6 +++--- .../websocket/server/ServerEndpoint.java | 6 +++--- .../websocket/server/ServerEndpointConfig.java | 16 ++++++++-------- .../websocket/server/package-info.java | 2 +- pom.xml | 12 ++++++------ spec/pom.xml | 2 +- 40 files changed, 88 insertions(+), 88 deletions(-) rename api/client/src/main/java/{javax => jakarta}/websocket/ClientEndpoint.java (94%) rename api/client/src/main/java/{javax => jakarta}/websocket/ClientEndpointConfig.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/CloseReason.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/ContainerProvider.java (93%) rename api/client/src/main/java/{javax => jakarta}/websocket/DecodeException.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/Decoder.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/DefaultClientEndpointConfig.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/DeploymentException.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/EncodeException.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/Encoder.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/Endpoint.java (91%) rename api/client/src/main/java/{javax => jakarta}/websocket/EndpointConfig.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/Extension.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/HandshakeResponse.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/MessageHandler.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/OnClose.java (91%) rename api/client/src/main/java/{javax => jakarta}/websocket/OnError.java (91%) rename api/client/src/main/java/{javax => jakarta}/websocket/OnMessage.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/OnOpen.java (90%) rename api/client/src/main/java/{javax => jakarta}/websocket/PongMessage.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/RemoteEndpoint.java (99%) rename api/client/src/main/java/{javax => jakarta}/websocket/SendHandler.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/SendResult.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/Session.java (97%) rename api/client/src/main/java/{javax => jakarta}/websocket/SessionException.java (98%) rename api/client/src/main/java/{javax => jakarta}/websocket/WebSocketContainer.java (96%) rename api/client/src/main/java/{javax => jakarta}/websocket/package-info.java (96%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/DefaultServerEndpointConfig.java (96%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/HandshakeRequest.java (99%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/PathParam.java (98%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/ServerApplicationConfig.java (97%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/ServerContainer.java (93%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/ServerEndpoint.java (97%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/ServerEndpointConfig.java (97%) rename api/server/src/main/java/{javax => jakarta}/websocket/server/package-info.java (96%) diff --git a/api/client/pom.xml b/api/client/pom.xml index d9d1f9f..456b2fb 100644 --- a/api/client/pom.xml +++ b/api/client/pom.xml @@ -23,7 +23,7 @@ jakarta.websocket jakarta.websocket-all - 1.1.2-SNAPSHOT + 2.0.0-SNAPSHOT jakarta.websocket-client-api diff --git a/api/client/src/main/java/javax/websocket/ClientEndpoint.java b/api/client/src/main/java/jakarta/websocket/ClientEndpoint.java similarity index 94% rename from api/client/src/main/java/javax/websocket/ClientEndpoint.java rename to api/client/src/main/java/jakarta/websocket/ClientEndpoint.java index 9dee47e..68414d8 100644 --- a/api/client/src/main/java/javax/websocket/ClientEndpoint.java +++ b/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. *

* For example: diff --git a/api/client/src/main/java/javax/websocket/ClientEndpointConfig.java b/api/client/src/main/java/jakarta/websocket/ClientEndpointConfig.java similarity index 99% rename from api/client/src/main/java/javax/websocket/ClientEndpointConfig.java rename to api/client/src/main/java/jakarta/websocket/ClientEndpointConfig.java index 842a8a9..2cffaa1 100644 --- a/api/client/src/main/java/javax/websocket/ClientEndpointConfig.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/CloseReason.java b/api/client/src/main/java/jakarta/websocket/CloseReason.java similarity index 99% rename from api/client/src/main/java/javax/websocket/CloseReason.java rename to api/client/src/main/java/jakarta/websocket/CloseReason.java index 54aff65..2d93583 100644 --- a/api/client/src/main/java/javax/websocket/CloseReason.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/ContainerProvider.java b/api/client/src/main/java/jakarta/websocket/ContainerProvider.java similarity index 93% rename from api/client/src/main/java/javax/websocket/ContainerProvider.java rename to api/client/src/main/java/jakarta/websocket/ContainerProvider.java index 4e700d5..d612ca7 100644 --- a/api/client/src/main/java/javax/websocket/ContainerProvider.java +++ b/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 * ServiceLoader 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 diff --git a/api/client/src/main/java/javax/websocket/DecodeException.java b/api/client/src/main/java/jakarta/websocket/DecodeException.java similarity index 99% rename from api/client/src/main/java/javax/websocket/DecodeException.java rename to api/client/src/main/java/jakarta/websocket/DecodeException.java index ec533a5..c47700e 100644 --- a/api/client/src/main/java/javax/websocket/DecodeException.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/Decoder.java b/api/client/src/main/java/jakarta/websocket/Decoder.java similarity index 97% rename from api/client/src/main/java/javax/websocket/Decoder.java rename to api/client/src/main/java/jakarta/websocket/Decoder.java index d6ecb09..452832d 100644 --- a/api/client/src/main/java/javax/websocket/Decoder.java +++ b/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 */ diff --git a/api/client/src/main/java/javax/websocket/DefaultClientEndpointConfig.java b/api/client/src/main/java/jakarta/websocket/DefaultClientEndpointConfig.java similarity index 99% rename from api/client/src/main/java/javax/websocket/DefaultClientEndpointConfig.java rename to api/client/src/main/java/jakarta/websocket/DefaultClientEndpointConfig.java index fe6d051..4b6e5ab 100644 --- a/api/client/src/main/java/javax/websocket/DefaultClientEndpointConfig.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/DeploymentException.java b/api/client/src/main/java/jakarta/websocket/DeploymentException.java similarity index 98% rename from api/client/src/main/java/javax/websocket/DeploymentException.java rename to api/client/src/main/java/jakarta/websocket/DeploymentException.java index e2aede1..62f98d7 100644 --- a/api/client/src/main/java/javax/websocket/DeploymentException.java +++ b/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 diff --git a/api/client/src/main/java/javax/websocket/EncodeException.java b/api/client/src/main/java/jakarta/websocket/EncodeException.java similarity index 98% rename from api/client/src/main/java/javax/websocket/EncodeException.java rename to api/client/src/main/java/jakarta/websocket/EncodeException.java index 097c257..1a3cdfe 100644 --- a/api/client/src/main/java/javax/websocket/EncodeException.java +++ b/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. diff --git a/api/client/src/main/java/javax/websocket/Encoder.java b/api/client/src/main/java/jakarta/websocket/Encoder.java similarity index 97% rename from api/client/src/main/java/javax/websocket/Encoder.java rename to api/client/src/main/java/jakarta/websocket/Encoder.java index bdee862..8a5822c 100644 --- a/api/client/src/main/java/javax/websocket/Encoder.java +++ b/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 */ diff --git a/api/client/src/main/java/javax/websocket/Endpoint.java b/api/client/src/main/java/jakarta/websocket/Endpoint.java similarity index 91% rename from api/client/src/main/java/javax/websocket/Endpoint.java rename to api/client/src/main/java/jakarta/websocket/Endpoint.java index 8d0cb23..e215f2e 100644 --- a/api/client/src/main/java/javax/websocket/Endpoint.java +++ b/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 @@ * *

* 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. * *

- * 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. * diff --git a/api/client/src/main/java/javax/websocket/EndpointConfig.java b/api/client/src/main/java/jakarta/websocket/EndpointConfig.java similarity index 98% rename from api/client/src/main/java/javax/websocket/EndpointConfig.java rename to api/client/src/main/java/jakarta/websocket/EndpointConfig.java index 71f7de3..43b1b88 100644 --- a/api/client/src/main/java/javax/websocket/EndpointConfig.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/Extension.java b/api/client/src/main/java/jakarta/websocket/Extension.java similarity index 98% rename from api/client/src/main/java/javax/websocket/Extension.java rename to api/client/src/main/java/jakarta/websocket/Extension.java index a215935..779b0f8 100644 --- a/api/client/src/main/java/javax/websocket/Extension.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/HandshakeResponse.java b/api/client/src/main/java/jakarta/websocket/HandshakeResponse.java similarity index 97% rename from api/client/src/main/java/javax/websocket/HandshakeResponse.java rename to api/client/src/main/java/jakarta/websocket/HandshakeResponse.java index f7c1cf8..ba55221 100644 --- a/api/client/src/main/java/javax/websocket/HandshakeResponse.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/MessageHandler.java b/api/client/src/main/java/jakarta/websocket/MessageHandler.java similarity index 99% rename from api/client/src/main/java/javax/websocket/MessageHandler.java rename to api/client/src/main/java/jakarta/websocket/MessageHandler.java index d626821..d4a6d52 100644 --- a/api/client/src/main/java/javax/websocket/MessageHandler.java +++ b/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 diff --git a/api/client/src/main/java/javax/websocket/OnClose.java b/api/client/src/main/java/jakarta/websocket/OnClose.java similarity index 91% rename from api/client/src/main/java/javax/websocket/OnClose.java rename to api/client/src/main/java/jakarta/websocket/OnClose.java index baabd47..fdf2313 100644 --- a/api/client/src/main/java/javax/websocket/OnClose.java +++ b/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 @@ *

* *

diff --git a/api/client/src/main/java/javax/websocket/OnError.java b/api/client/src/main/java/jakarta/websocket/OnError.java similarity index 91% rename from api/client/src/main/java/javax/websocket/OnError.java rename to api/client/src/main/java/jakarta/websocket/OnError.java index c2c2768..b1b51d2 100644 --- a/api/client/src/main/java/javax/websocket/OnError.java +++ b/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 @@ *

* *

diff --git a/api/client/src/main/java/javax/websocket/OnMessage.java b/api/client/src/main/java/jakarta/websocket/OnMessage.java similarity index 98% rename from api/client/src/main/java/javax/websocket/OnMessage.java rename to api/client/src/main/java/jakarta/websocket/OnMessage.java index bfbdb33..1ca3baf 100644 --- a/api/client/src/main/java/javax/websocket/OnMessage.java +++ b/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 @@ * * * - *

  • and Zero to n String or Java primitive parameters annotated with the {@code javax.websocket.server.PathParam} + *
  • and Zero to n String or Java primitive parameters annotated with the {@code jakarta.websocket.server.PathParam} * annotation for server endpoints.
    • *
  • and an optional {@link Session} parameter
    • * diff --git a/api/client/src/main/java/javax/websocket/OnOpen.java b/api/client/src/main/java/jakarta/websocket/OnOpen.java similarity index 90% rename from api/client/src/main/java/javax/websocket/OnOpen.java rename to api/client/src/main/java/jakarta/websocket/OnOpen.java index bbd2e20..3cbc4d3 100644 --- a/api/client/src/main/java/javax/websocket/OnOpen.java +++ b/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 @@ * * *

    diff --git a/api/client/src/main/java/javax/websocket/PongMessage.java b/api/client/src/main/java/jakarta/websocket/PongMessage.java similarity index 97% rename from api/client/src/main/java/javax/websocket/PongMessage.java rename to api/client/src/main/java/jakarta/websocket/PongMessage.java index aa5449e..589cafc 100644 --- a/api/client/src/main/java/javax/websocket/PongMessage.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/RemoteEndpoint.java b/api/client/src/main/java/jakarta/websocket/RemoteEndpoint.java similarity index 99% rename from api/client/src/main/java/javax/websocket/RemoteEndpoint.java rename to api/client/src/main/java/jakarta/websocket/RemoteEndpoint.java index e0403bc..794f67c 100644 --- a/api/client/src/main/java/javax/websocket/RemoteEndpoint.java +++ b/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; diff --git a/api/client/src/main/java/javax/websocket/SendHandler.java b/api/client/src/main/java/jakarta/websocket/SendHandler.java similarity index 97% rename from api/client/src/main/java/javax/websocket/SendHandler.java rename to api/client/src/main/java/jakarta/websocket/SendHandler.java index 3c39186..e9edee5 100644 --- a/api/client/src/main/java/javax/websocket/SendHandler.java +++ b/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. diff --git a/api/client/src/main/java/javax/websocket/SendResult.java b/api/client/src/main/java/jakarta/websocket/SendResult.java similarity index 98% rename from api/client/src/main/java/javax/websocket/SendResult.java rename to api/client/src/main/java/jakarta/websocket/SendResult.java index c2adc12..f4a83ba 100644 --- a/api/client/src/main/java/javax/websocket/SendResult.java +++ b/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, diff --git a/api/client/src/main/java/javax/websocket/Session.java b/api/client/src/main/java/jakarta/websocket/Session.java similarity index 97% rename from api/client/src/main/java/javax/websocket/Session.java rename to api/client/src/main/java/jakarta/websocket/Session.java index 9b29342..b28dddc 100644 --- a/api/client/src/main/java/javax/websocket/Session.java +++ b/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. *

    * 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 diff --git a/api/client/src/main/java/javax/websocket/SessionException.java b/api/client/src/main/java/jakarta/websocket/SessionException.java similarity index 98% rename from api/client/src/main/java/javax/websocket/SessionException.java rename to api/client/src/main/java/jakarta/websocket/SessionException.java index 88ad5f7..4bcad77 100644 --- a/api/client/src/main/java/javax/websocket/SessionException.java +++ b/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. diff --git a/api/client/src/main/java/javax/websocket/WebSocketContainer.java b/api/client/src/main/java/jakarta/websocket/WebSocketContainer.java similarity index 96% rename from api/client/src/main/java/javax/websocket/WebSocketContainer.java rename to api/client/src/main/java/jakarta/websocket/WebSocketContainer.java index c736a6d..c4ea5dd 100644 --- a/api/client/src/main/java/javax/websocket/WebSocketContainer.java +++ b/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}. diff --git a/api/client/src/main/java/javax/websocket/package-info.java b/api/client/src/main/java/jakarta/websocket/package-info.java similarity index 96% rename from api/client/src/main/java/javax/websocket/package-info.java rename to api/client/src/main/java/jakarta/websocket/package-info.java index 75892db..d44d286 100644 --- a/api/client/src/main/java/javax/websocket/package-info.java +++ b/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; diff --git a/api/pom.xml b/api/pom.xml index 3cf9c12..f300c18 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -34,7 +34,7 @@ Make sure to change build_number property accordingly for non-final builds --> - 1.1.2-SNAPSHOT + 2.0.0-SNAPSHOT Jakarta WebSocket - API Parent Jakarta WebSocket - API Parent https://projects.eclipse.org/projects/ee4j.websocket @@ -104,12 +104,12 @@ - javax.websocket - 1.1 + jakarta.websocket + 2.0 - 1.1 - 1.1.2 - javax.websocket.* + 2.0 + 2.0.0 + jakarta.websocket.* @@ -126,7 +126,7 @@ org.glassfish.copyright glassfish-copyright-maven-plugin - 1.46 + 2.3 etc/config/copyright-exclude @@ -177,7 +177,7 @@ Jakarta WebSocket Packages - javax.websocket* + jakarta.websocket* @@ -210,7 +210,7 @@ org.glassfish.build spec-version-maven-plugin - 1.5 + 2.0 jakarta diff --git a/api/server/pom.xml b/api/server/pom.xml index 1773f86..37136e2 100644 --- a/api/server/pom.xml +++ b/api/server/pom.xml @@ -23,7 +23,7 @@ jakarta.websocket jakarta.websocket-all - 1.1.2-SNAPSHOT + 2.0.0-SNAPSHOT jakarta.websocket-api diff --git a/api/server/src/main/java/javax/websocket/server/DefaultServerEndpointConfig.java b/api/server/src/main/java/jakarta/websocket/server/DefaultServerEndpointConfig.java similarity index 96% rename from api/server/src/main/java/javax/websocket/server/DefaultServerEndpointConfig.java rename to api/server/src/main/java/jakarta/websocket/server/DefaultServerEndpointConfig.java index 129f6a3..0fca0b0 100644 --- a/api/server/src/main/java/javax/websocket/server/DefaultServerEndpointConfig.java +++ b/api/server/src/main/java/jakarta/websocket/server/DefaultServerEndpointConfig.java @@ -15,16 +15,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.websocket.Decoder; -import javax.websocket.Encoder; -import javax.websocket.Endpoint; -import javax.websocket.Extension; +import jakarta.websocket.Decoder; +import jakarta.websocket.Encoder; +import jakarta.websocket.Endpoint; +import jakarta.websocket.Extension; /** * The DefaultServerEndpointConfig is a concrete class that embodies all the configuration parameters for an endpoint diff --git a/api/server/src/main/java/javax/websocket/server/HandshakeRequest.java b/api/server/src/main/java/jakarta/websocket/server/HandshakeRequest.java similarity index 99% rename from api/server/src/main/java/javax/websocket/server/HandshakeRequest.java rename to api/server/src/main/java/jakarta/websocket/server/HandshakeRequest.java index e81254b..2a1861a 100644 --- a/api/server/src/main/java/javax/websocket/server/HandshakeRequest.java +++ b/api/server/src/main/java/jakarta/websocket/server/HandshakeRequest.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; import java.net.URI; import java.security.Principal; diff --git a/api/server/src/main/java/javax/websocket/server/PathParam.java b/api/server/src/main/java/jakarta/websocket/server/PathParam.java similarity index 98% rename from api/server/src/main/java/javax/websocket/server/PathParam.java rename to api/server/src/main/java/jakarta/websocket/server/PathParam.java index 92ee382..31b2819 100644 --- a/api/server/src/main/java/javax/websocket/server/PathParam.java +++ b/api/server/src/main/java/jakarta/websocket/server/PathParam.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/server/src/main/java/javax/websocket/server/ServerApplicationConfig.java b/api/server/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java similarity index 97% rename from api/server/src/main/java/javax/websocket/server/ServerApplicationConfig.java rename to api/server/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java index 9d9b3c3..0cacb9d 100644 --- a/api/server/src/main/java/javax/websocket/server/ServerApplicationConfig.java +++ b/api/server/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java @@ -15,10 +15,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; import java.util.Set; -import javax.websocket.Endpoint; +import jakarta.websocket.Endpoint; /** * Developers include implementations of ServerApplicationConfig in an archive containing websocket endpoints (WAR file, diff --git a/api/server/src/main/java/javax/websocket/server/ServerContainer.java b/api/server/src/main/java/jakarta/websocket/server/ServerContainer.java similarity index 93% rename from api/server/src/main/java/javax/websocket/server/ServerContainer.java rename to api/server/src/main/java/jakarta/websocket/server/ServerContainer.java index a1e1789..73db231 100644 --- a/api/server/src/main/java/javax/websocket/server/ServerContainer.java +++ b/api/server/src/main/java/jakarta/websocket/server/ServerContainer.java @@ -15,9 +15,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; -import javax.websocket.*; +import jakarta.websocket.*; /** * The ServerContainer is the specialized view of the WebSocketContainer available in server-side deployments. There is @@ -25,7 +25,7 @@ * server endpoints during the initialization phase of the application. *

    * For websocket enabled web containers, developers may obtain a reference to the ServerContainer instance by retrieving - * it as an attribute named javax.websocket.server.ServerContainer on the ServletContext. This way, the + * it as an attribute named jakarta.websocket.server.ServerContainer on the ServletContext. This way, the * registration methods held on this interface may be called to register server endpoints from a ServletContextListener * during the deployment of the WAR file containing the endpoint. *

    diff --git a/api/server/src/main/java/javax/websocket/server/ServerEndpoint.java b/api/server/src/main/java/jakarta/websocket/server/ServerEndpoint.java similarity index 97% rename from api/server/src/main/java/javax/websocket/server/ServerEndpoint.java rename to api/server/src/main/java/jakarta/websocket/server/ServerEndpoint.java index e84fcad..d14cbed 100644 --- a/api/server/src/main/java/javax/websocket/server/ServerEndpoint.java +++ b/api/server/src/main/java/jakarta/websocket/server/ServerEndpoint.java @@ -15,14 +15,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -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; /** * This class level annotation declares that the class it decorates is a web socket endpoint that will be deployed and diff --git a/api/server/src/main/java/javax/websocket/server/ServerEndpointConfig.java b/api/server/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java similarity index 97% rename from api/server/src/main/java/javax/websocket/server/ServerEndpointConfig.java rename to api/server/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java index ddfbaf9..ce14a8d 100644 --- a/api/server/src/main/java/javax/websocket/server/ServerEndpointConfig.java +++ b/api/server/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java @@ -15,17 +15,17 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package javax.websocket.server; +package jakarta.websocket.server; import java.util.ArrayList; import java.util.Collections; 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; /** * The ServerEndpointConfig is a special kind of endpoint configuration object that contains web socket configuration @@ -71,7 +71,7 @@ public interface ServerEndpointConfig extends EndpointConfig { /** * Return the {@link ServerEndpointConfig.Configurator} this configuration is using. If none was set by calling - * {@link ServerEndpointConfig.Builder#configurator(javax.websocket.server.ServerEndpointConfig.Configurator) } this + * {@link ServerEndpointConfig.Builder#configurator(jakarta.websocket.server.ServerEndpointConfig.Configurator) } this * methods returns the platform default configurator. * * @return the configurator in use. @@ -90,7 +90,7 @@ public class Configurator { static ServerEndpointConfig.Configurator fetchContainerDefaultConfigurator() { for (ServerEndpointConfig.Configurator impl : ServiceLoader - .load(javax.websocket.server.ServerEndpointConfig.Configurator.class)) { + .load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class)) { return impl; } throw new RuntimeException("Cannot load platform configurator"); diff --git a/api/server/src/main/java/javax/websocket/server/package-info.java b/api/server/src/main/java/jakarta/websocket/server/package-info.java similarity index 96% rename from api/server/src/main/java/javax/websocket/server/package-info.java rename to api/server/src/main/java/jakarta/websocket/server/package-info.java index f76e8c8..253b028 100644 --- a/api/server/src/main/java/javax/websocket/server/package-info.java +++ b/api/server/src/main/java/jakarta/websocket/server/package-info.java @@ -18,4 +18,4 @@ /** * This package contains all the Jakarta WebSocket APIs used only by server side applications. */ -package javax.websocket.server; +package jakarta.websocket.server; diff --git a/pom.xml b/pom.xml index 3642f77..5bf398d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.ee4j.websocket websocket-parent pom - 1.1.2-SNAPSHOT + 2.0.0-SNAPSHOT Jakarta WebSocket Jakarta WebSocket https://projects.eclipse.org/projects/ee4j.websocket @@ -33,12 +33,12 @@ - javax.websocket - 1.1 + jakarta.websocket + 2.0 - 1.1 - 1.1.2 - javax.websocket.* + 2.0 + 2.0.0 + jakarta.websocket.* diff --git a/spec/pom.xml b/spec/pom.xml index 7c78ca8..a0b95c8 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -20,7 +20,7 @@ org.eclipse.ee4j.websocket websocket-parent - 1.1.2-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 websocket-spec