You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by st...@apache.org on 2019/05/06 10:58:52 UTC
svn commit: r1858778 [5/5] - in /geronimo/specs/branches/jakarta: ./
geronimo-jakarta-ejb_spec/src/main/java/jakarta/ejb/
geronimo-jakarta-ejb_spec/src/main/java/jakarta/ejb/embeddable/
geronimo-jakarta-ejb_spec/src/main/java/jakarta/ejb/spi/ geronimo-...
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebListener.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebListener.java Mon May 6 10:58:50 2019
@@ -28,13 +28,13 @@ import java.lang.annotation.Target;
* <br>
*
* The class annotated MUST implement one, (or more), of the following
- * interfaces: {@link javax.servlet.http.HttpSessionAttributeListener},
- * {@link javax.servlet.http.HttpSessionListener},
- * {@link javax.servlet.ServletContextAttributeListener},
- * {@link javax.servlet.ServletContextListener},
- * {@link javax.servlet.ServletRequestAttributeListener},
- * {@link javax.servlet.ServletRequestListener} or
- * {@link javax.servlet.http.HttpSessionIdListener}
+ * interfaces: {@link jakarta.servlet.http.HttpSessionAttributeListener},
+ * {@link jakarta.servlet.http.HttpSessionListener},
+ * {@link jakarta.servlet.ServletContextAttributeListener},
+ * {@link jakarta.servlet.ServletContextListener},
+ * {@link jakarta.servlet.ServletRequestAttributeListener},
+ * {@link jakarta.servlet.ServletRequestListener} or
+ * {@link jakarta.servlet.http.HttpSessionIdListener}
* <br>
*
* E.g. <code>@WebListener</code><br>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebServlet.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebServlet.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebServlet.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/annotation/WebServlet.java Mon May 6 10:58:50 2019
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare the configuration of an
- * {@link javax.servlet.Servlet}. <br>
+ * {@link jakarta.servlet.Servlet}. <br>
*
* If the name attribute is not defined, the fully qualified name of the class
* is used.<br>
@@ -40,7 +40,7 @@ import java.lang.annotation.Target;
* <br>
*
* The class on which this annotation is declared MUST extend
- * {@link javax.servlet.http.HttpServlet}. <br>
+ * {@link jakarta.servlet.http.HttpServlet}. <br>
* <br>
*
* E.g. <code>@WebServlet("/path")}<br>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Cookie.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Cookie.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Cookie.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Cookie.java Mon May 6 10:58:50 2019
@@ -431,7 +431,7 @@ public class Cookie implements Cloneable
class CookieNameValidator {
- private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings";
+ private static final String LSTRING_FILE = "jakarta.servlet.http.LocalStrings";
protected static final ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
protected final BitSet allowed;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServlet.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServlet.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServlet.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServlet.java Mon May 6 10:58:50 2019
@@ -88,7 +88,7 @@ public abstract class HttpServlet extend
private static final String HEADER_LASTMOD = "Last-Modified";
private static final String LSTRING_FILE =
- "javax.servlet.http.LocalStrings";
+ "jakarta.servlet.http.LocalStrings";
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
@@ -123,7 +123,7 @@ public abstract class HttpServlet extend
* before the response body.
*
* <p>Where possible, set the Content-Length header (with the
- * {@link javax.servlet.ServletResponse#setContentLength} method),
+ * {@link jakarta.servlet.ServletResponse#setContentLength} method),
* to allow the servlet container to use a persistent connection
* to return its response to the client, improving performance.
* The content length is automatically set if the entire response fits
@@ -163,7 +163,7 @@ public abstract class HttpServlet extend
* @exception ServletException if the request for the GET
* could not be handled
*
- * @see javax.servlet.ServletResponse#setContentType
+ * @see jakarta.servlet.ServletResponse#setContentType
*/
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException
@@ -269,7 +269,7 @@ public abstract class HttpServlet extend
* response body.
*
* <p>Where possible, set the Content-Length header (with the
- * {@link javax.servlet.ServletResponse#setContentLength} method),
+ * {@link jakarta.servlet.ServletResponse#setContentLength} method),
* to allow the servlet container to use a persistent connection
* to return its response to the client, improving performance.
* The content length is automatically set if the entire response fits
@@ -302,8 +302,8 @@ public abstract class HttpServlet extend
* @exception ServletException if the request for the POST
* could not be handled
*
- * @see javax.servlet.ServletOutputStream
- * @see javax.servlet.ServletResponse#setContentType
+ * @see jakarta.servlet.ServletOutputStream
+ * @see jakarta.servlet.ServletResponse#setContentType
*/
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -423,7 +423,7 @@ public abstract class HttpServlet extend
private static Method[] getAllDeclaredMethods(Class<?> c) {
- if (c.equals(javax.servlet.http.HttpServlet.class)) {
+ if (c.equals(jakarta.servlet.http.HttpServlet.class)) {
return null;
}
@@ -601,7 +601,7 @@ public abstract class HttpServlet extend
* <code>service</code> method and dispatches
* them to the <code>do</code><i>Method</i> methods defined in
* this class. This method is an HTTP-specific version of the
- * {@link javax.servlet.Servlet#service} method. There's no
+ * {@link jakarta.servlet.Servlet#service} method. There's no
* need to override this method.
*
* @param req the {@link HttpServletRequest} object that
@@ -619,7 +619,7 @@ public abstract class HttpServlet extend
* @exception ServletException if the HTTP request
* cannot be handled
*
- * @see javax.servlet.Servlet#service
+ * @see jakarta.servlet.Servlet#service
*/
protected void service(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -723,7 +723,7 @@ public abstract class HttpServlet extend
* @exception ServletException if the HTTP request cannot
* be handled
*
- * @see javax.servlet.Servlet#service
+ * @see jakarta.servlet.Servlet#service
*/
@Override
public void service(ServletRequest req, ServletResponse res)
@@ -843,7 +843,7 @@ class NoBodyResponse extends HttpServlet
class NoBodyOutputStream extends ServletOutputStream {
private static final String LSTRING_FILE =
- "javax.servlet.http.LocalStrings";
+ "jakarta.servlet.http.LocalStrings";
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
@@ -895,7 +895,7 @@ class NoBodyOutputStream extends Servlet
}
@Override
- public void setWriteListener(javax.servlet.WriteListener listener) {
+ public void setWriteListener(jakarta.servlet.WriteListener listener) {
// TODO SERVLET 3.1
}
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletMapping.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletMapping.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletMapping.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletMapping.java Mon May 6 10:58:50 2019
@@ -40,7 +40,7 @@ public interface HttpServletMapping {
/**
* @return The name of the servlet (as specified in web.xml,
* {@link WebServlet#name()},
- * {@link javax.servlet.ServletContext#addServlet(String, Class)} or
+ * {@link jakarta.servlet.ServletContext#addServlet(String, Class)} or
* one of the other <code>addServlet()</code> methods) that the
* request was mapped to.
*/
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequest.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequest.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequest.java Mon May 6 10:58:50 2019
@@ -27,7 +27,7 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
/**
- * Extends the {@link javax.servlet.ServletRequest} interface to provide request
+ * Extends the {@link jakarta.servlet.ServletRequest} interface to provide request
* information for HTTP servlets.
* <p>
* The servlet container creates an <code>HttpServletRequest</code> object and
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java Mon May 6 10:58:50 2019
@@ -30,7 +30,7 @@ import jakarta.servlet.ServletRequestWra
* This class implements the Wrapper or Decorator pattern. Methods default to
* calling through to the wrapped request object.
*
- * @see javax.servlet.http.HttpServletRequest
+ * @see jakarta.servlet.http.HttpServletRequest
* @since v 2.3
*/
public class HttpServletRequestWrapper extends ServletRequestWrapper implements
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponse.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponse.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponse.java Mon May 6 10:58:50 2019
@@ -31,7 +31,7 @@ import jakarta.servlet.ServletResponse;
* The servlet container creates an <code>HttpServletResponse</code> object and
* passes it as an argument to the servlet's service methods (<code>doGet</code>, <code>doPost</code>, etc).
*
- * @see javax.servlet.ServletResponse
+ * @see jakarta.servlet.ServletResponse
*/
public interface HttpServletResponse extends ServletResponse {
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java Mon May 6 10:58:50 2019
@@ -30,7 +30,7 @@ import jakarta.servlet.ServletResponseWr
* default to calling through to the wrapped response object.
*
* @since v 2.3
- * @see javax.servlet.http.HttpServletResponse
+ * @see jakarta.servlet.http.HttpServletResponse
*/
public class HttpServletResponseWrapper extends ServletResponseWrapper
implements HttpServletResponse {
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java Mon May 6 10:58:50 2019
@@ -22,8 +22,8 @@ import java.util.EventListener;
* Implementations of this interface are notified when an {@link HttpSession}'s
* ID changes. To receive notification events, the implementation class must be
* configured in the deployment descriptor for the web application, annotated
- * with {@link javax.servlet.annotation.WebListener} or registered by calling an
- * addListener method on the {@link javax.servlet.ServletContext}.
+ * with {@link jakarta.servlet.annotation.WebListener} or registered by calling an
+ * addListener method on the {@link jakarta.servlet.ServletContext}.
*
* @see HttpSessionEvent
* @see HttpServletRequest#changeSessionId()
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java Mon May 6 10:58:50 2019
@@ -35,7 +35,7 @@ import jakarta.servlet.ServletInputStrea
public class HttpUtils {
private static final String LSTRING_FILE =
- "javax.servlet.http.LocalStrings";
+ "jakarta.servlet.http.LocalStrings";
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java Mon May 6 10:58:50 2019
@@ -87,7 +87,7 @@ public interface Part {
*
* @param fileName The location into which the uploaded part should be
* stored. Relative locations are relative to {@link
- * javax.servlet.MultipartConfigElement#getLocation()}
+ * jakarta.servlet.MultipartConfigElement#getLocation()}
*
* @throws IOException if an I/O occurs while attempting to write the part
*/
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/package.html
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/package.html?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/package.html (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/package.html Mon May 6 10:58:50 2019
@@ -20,7 +20,7 @@
</HEAD>
<BODY BGCOLOR="white">
-The javax.servlet.http package contains a number of classes and interfaces
+The jakarta.servlet.http package contains a number of classes and interfaces
that describe and define the contracts between a servlet class
running under the HTTP protocol and the runtime environment provided
for an instance of such a class by a conforming servlet container.
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml Mon May 6 10:58:50 2019
@@ -67,7 +67,7 @@
<instructions>
<Export-Package>
javax.websocket;version=1.0,
- javax.websocket.server;version=1.0
+ jakarta.websocket.server;version=1.0
</Export-Package>
<Provide-Capability><![CDATA[
osgi.contract;osgi.contract=JavaWebSockets;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpoint.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpoint.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpoint.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpointConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpointConfig.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpointConfig.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ClientEndpointConfig.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.Collections;
import java.util.HashMap;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/CloseReason.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/CloseReason.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/CloseReason.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/CloseReason.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
public class CloseReason {
@@ -227,6 +227,6 @@ public class CloseReason {
*/
@Override
public String toString() {
- return "javax.websocket.CloseReason: " + this.closeCode + " " + this.reasonPhrase;
+ return "jakarta.websocket.CloseReason: " + this.closeCode + " " + this.reasonPhrase;
}
}
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ContainerProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ContainerProvider.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ContainerProvider.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/ContainerProvider.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.ServiceLoader;
@@ -25,7 +25,7 @@ import java.util.ServiceLoader;
* Provider class that allows the developer to get a reference to the implementation of the WebSocketContainer. The
* provider class uses the ServiceLoader to load an implementation of ContainerProvider. Specifically, the fully
* qualified classname of the container implementation of ContainerProvider must be listed in the
- * META-INF/services/javax.websocket.ContainerProvider file in the implementation JAR file.
+ * META-INF/services/jakarta.websocket.ContainerProvider file in the implementation JAR file.
*/
public abstract class ContainerProvider {
@@ -33,7 +33,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
+ * the order listed in the META-INF/services/jakarta.websocket.ContainerProvider file, returning the
* WebSocketContainer implementation from the ContainerProvider implementation that is not null.
*
* @return an implementation provided instance of type WebSocketContainer
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DecodeException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DecodeException.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DecodeException.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DecodeException.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.nio.ByteBuffer;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Decoder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Decoder.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Decoder.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Decoder.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.InputStream;
@@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
* 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 init(javax.websocket.EndpointConfig) and destroy() methods.
+ * calls to the init(jakarta.websocket.EndpointConfig) and destroy() methods.
*
*/
public interface Decoder {
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DeploymentException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DeploymentException.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DeploymentException.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/DeploymentException.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-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
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EncodeException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EncodeException.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EncodeException.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EncodeException.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
/**
* A general exception that occurs when trying to encode a custom object to a string or binary message.
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Encoder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Encoder.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Encoder.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Encoder.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.OutputStream;
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
* 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
- * init(javax.websocket.EndpointConfig) and destroy() methods.
+ * init(jakarta.websocket.EndpointConfig) and destroy() methods.
*/
public interface Encoder {
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Endpoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Endpoint.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Endpoint.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Endpoint.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
/**
* The Web Socket Endpoint represents an object that can handle websocket conversations. Developers may extend this
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EndpointConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EndpointConfig.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EndpointConfig.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/EndpointConfig.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
import java.util.Map;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Extension.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Extension.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Extension.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Extension.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/HandshakeResponse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/HandshakeResponse.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/HandshakeResponse.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/HandshakeResponse.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.util.List;
import java.util.Map;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/MessageHandler.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/MessageHandler.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/MessageHandler.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/MessageHandler.java Mon May 6 10:58:50 2019
@@ -1,4 +1,4 @@
-package javax.websocket;
+package jakarta.websocket;
/**
* Developers implement MessageHandlers in order to receive incoming messages during a web socket conversation. Each web
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnClose.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnClose.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnClose.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnClose.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
* <li>Zero to n String parameters annotated with the PathParam annotation.</li>
* </ul>
* <p/>
- * The parameters may appear in any order. See Endpoint.onClose(javax.websocket.Session, javax.websocket.CloseReason)
+ * The parameters may appear in any order. See Endpoint.onClose(jakarta.websocket.Session, jakarta.websocket.CloseReason)
* for more details on how the session parameter may be used during method calls annotated with this annotation.
*/
@Retention(value = RetentionPolicy.RUNTIME)
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnError.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnError.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnError.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnError.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
/**
* This method level annotation can be used to decorate a Java method that wishes to be called in order to handle
- * errors. See Endpoint.onError(javax.websocket.Session, java.lang.Throwable) for a description of the different
+ * errors. See Endpoint.onError(jakarta.websocket.Session, java.lang.Throwable) for a description of the different
* categories of error.
* <p/>
* The method may only take the following parameters:-
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnMessage.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnMessage.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnMessage.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnMessage.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnOpen.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnOpen.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnOpen.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/OnOpen.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/PongMessage.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/PongMessage.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/PongMessage.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/PongMessage.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.nio.ByteBuffer;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/RemoteEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/RemoteEndpoint.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/RemoteEndpoint.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/RemoteEndpoint.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.io.OutputStream;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendHandler.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendHandler.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendHandler.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendHandler.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
/**
* A simple callback object for asynchronous sending of web socket messages.
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendResult.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendResult.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SendResult.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-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,
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Session.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Session.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Session.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/Session.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.Closeable;
import java.io.IOException;
@@ -37,7 +37,7 @@ import java.util.Set;
* Once the session is closed, it is no longer valid for use by applications. Calling any of its methods (with the
* exception of the close() methods) once the session has been closed will result in an IllegalStateException being
* thrown. Developers should retrieve any information from the session during the
- * Endpoint.onClose(javax.websocket.Session, javax.websocket.CloseReason) method. Following the convention of Closeable
+ * Endpoint.onClose(jakarta.websocket.Session, jakarta.websocket.CloseReason) method. Following the convention of Closeable
* calling the Session close() methods after the Session has been closed has no effect.
* <p/>
* Session objects may be called by multiple threads. Implementations must ensure the integrity of the mutable
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SessionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SessionException.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SessionException.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/SessionException.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
/**
* A SessionException represents a general exception type reporting problems occurring on a websocket session.
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/WebSocketContainer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/WebSocketContainer.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/WebSocketContainer.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/WebSocketContainer.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket;
+package jakarta.websocket;
import java.io.IOException;
import java.net.URI;
@@ -103,7 +103,7 @@ public interface WebSocketContainer {
* method blocks until the connection is established, or throws an error if the connection could not be made. 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 not be available. If the client endpoint
- * uses dependency injection, use connectToServer(java.lang.Class, javax.websocket.ClientEndpointConfig,
+ * uses dependency injection, use connectToServer(java.lang.Class, jakarta.websocket.ClientEndpointConfig,
* java.net.URI) instead.
*
* @param endpointInstance
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/HandshakeRequest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/HandshakeRequest.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/HandshakeRequest.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/HandshakeRequest.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.net.URI;
import java.security.Principal;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/PathParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/PathParam.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/PathParam.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/PathParam.java Mon May 6 10:58:50 2019
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.websocket.server;
+package jakarta.websocket.server;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerApplicationConfig.java Mon May 6 10:58:50 2019
@@ -17,11 +17,11 @@
* under the License.
*/
-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, or JAR file within the WAR file) in order to specify the websocket endpoints within the archive the implementation must deploy. There is a separate method for programmatic endpoints and for annotated endpoints.
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerContainer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerContainer.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerContainer.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerContainer.java Mon May 6 10:58:50 2019
@@ -17,10 +17,10 @@
* 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;
/**
* The ServerContainer is the specialized view of the WebSocketContainer available in server-side deployments. There is
@@ -28,7 +28,7 @@ import javax.websocket.WebSocketContaine
* server endpoints during the initialization phase of the application.
* <p/>
* 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 registration
+ * 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.
* <p/>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpoint.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpoint.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpoint.java Mon May 6 10:58:50 2019
@@ -17,15 +17,15 @@
* 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;
/**
* This class level annotation declares that the class it decorates is a web socket endpoint that will be deployed and
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/src/main/java/jakarta/websocket/server/ServerEndpointConfig.java Mon May 6 10:58:50 2019
@@ -17,18 +17,18 @@
* under the License.
*/
-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.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
@@ -353,7 +353,7 @@ public interface ServerEndpointConfig ex
/**
* Return the ServerEndpointConfig.Configurator this configuration is using. If none was set by calling
- * ServerEndpointConfig.Builder.configurator(javax.websocket.server.ServerEndpointConfig.Configurator) this methods
+ * ServerEndpointConfig.Builder.configurator(jakarta.websocket.server.ServerEndpointConfig.Configurator) this methods
* returns the platform default configurator.
*
* @return the configurator in use.
Modified: geronimo/specs/branches/jakarta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/pom.xml?rev=1858778&r1=1858777&r2=1858778&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/pom.xml (original)
+++ geronimo/specs/branches/jakarta/pom.xml Mon May 6 10:58:50 2019
@@ -55,6 +55,7 @@
<module>geronimo-jakarta-jsp_spec</module>
<module>geronimo-jakarta-websockets_spec</module>
<module>geronimo-jakarta-servlet_spec</module>
+ <module>geronimo-jakarta-jta_spec</module>
</modules>
</profile>
</profiles>