move servlet to jakarta api

Signed-off-by: olivier lamy <olamy@apache.org>

.gitignore

@@ -17,3 +17,4 @@ target/
 /user_guides/jakartaee/src/main/jbake/content/title.inc
 /user_guides/jakartaee/src/main/jbake/content/attributes.conf
 /nbproject
+*.iml

install/jakartaee/bin/xml/impl/glassfish/smoke.xml

@@ -57,9 +57,9 @@
     com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue,
     com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean,
     com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport,
-    com/sun/ts/tests/servlet/api/javax_servlet/servletcontext,
-    com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletrequest,
-    com/sun/ts/tests/servlet/api/javax_servlet/servletresponse,
+    com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext,
+    com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest,
+    com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse,
     com/sun/ts/tests/jaxrpc/ee/w2j/rpc/encoded/marshalltest,
     com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest,
     com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceProviderTest,

install/jakartaee/bin/xml/smoke.xml

@@ -74,9 +74,9 @@
     com/sun/ts/tests/concurrency/api/ManagedScheduledExecutorService,
     com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean,
     com/sun/ts/tests/jsp/api/javax_servlet/jsp/tagext/bodytagsupport,
-    com/sun/ts/tests/servlet/api/javax_servlet/servletcontext,
-    com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletrequest,
-    com/sun/ts/tests/servlet/api/javax_servlet/servletresponse,
+    com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext,
+    com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest,
+    com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse,
     com/sun/ts/tests/jaxrs/api/client/clientresponsecontext,
     com/sun/ts/tests/jaxrpc/ee/w2j/rpc/encoded/marshalltest,
     com/sun/ts/tests/webservices12/ejb/annotations/WSEjbSOAPHandlersTest,

release/tools/build.xml

@@ -839,9 +839,9 @@
             concurrency/api/ManagedScheduledExecutorService,
             jsp/spec/core_syntax/actions/usebean,
             jsp/api/javax_servlet/jsp/tagext/bodytagsupport,
-            servlet/api/javax_servlet_http/httpservletrequest,
-            servlet/api/javax_servlet/servletcontext,
-            servlet/api/javax_servlet/servletresponse,
+            servlet/api/jakarta_servlet_http/httpservletrequest,
+            servlet/api/jakarta_servlet/servletcontext,
+            servlet/api/jakarta_servlet/servletresponse,
             servlet/api/common,
             jsp/api/jakarta_el/elresolver,
             jsp/spec/el/language,

src/com/sun/ts/lib/harness/keyword.properties

@@ -231,16 +231,16 @@ com/sun/ts/tests/signaturetest/websocket = signaturetest websocket
 com/sun/ts/tests/signaturetest/securityapi = signaturetest securityapi
 com/sun/ts/tests/signaturetest/wsmd = signaturetest wsmd
 com/sun/ts/tests/xa = xa javaee xa_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/asynccontext = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/asyncevent = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/dispatchertype = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/registration = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/servletcontext30 = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/servletrequest30 = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet/servletrequestwrapper30 = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletrequest30 = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletresponse30 = servlet30 javaee javaee_web_profile
-com/sun/ts/tests/servlet/api/javax_servlet_http/sessioncookieconfig = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/asyncevent = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchertype = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/registration = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext30 = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30 = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30 = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/httpservletrequest30 = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/httpservletresponse30 = servlet30 javaee javaee_web_profile
+com/sun/ts/tests/servlet/api/jakarta_servlet/sessioncookieconfig = servlet30 javaee javaee_web_profile
 com/sun/ts/tests/servlet/spec/annotationservlet = servlet30 javaee javaee_web_profile
 com/sun/ts/tests/servlet/spec/aordering = servlet30 javaee javaee_web_profile
 com/sun/ts/tests/servlet/spec/async = servlet30 javaee javaee_web_profile

src/com/sun/ts/tests/servlet/api/common/request/HttpRequestClient.java

@@ -176,7 +176,7 @@ public void getPathTranslatedTest() throws Fault {
     TEST_PROPS.setProperty(TEST_NAME, testName);
     TEST_PROPS.setProperty(REQUEST,
         "GET " + getContextRoot() + "/" + getServletName()
-            + "/javax_servlet?testname=" + testName + " HTTP/1.1");
+            + "/jakarta_servlet?testname=" + testName + " HTTP/1.1");
     invoke();
   }
 

src/com/sun/ts/tests/servlet/api/common/request/HttpRequestTestServlet.java

@@ -24,13 +24,13 @@
 
 package com.sun.ts.tests.servlet.api.common.request;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;

src/com/sun/ts/tests/servlet/api/common/request/RequestTestServlet.java

@@ -24,11 +24,11 @@
 
 package com.sun.ts.tests.servlet.api.common.request;
 
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;

src/com/sun/ts/tests/servlet/api/common/request/RequestTests.java

@@ -28,8 +28,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 public class RequestTests {
 
@@ -39,7 +39,7 @@ public class RequestTests {
 
   static HttpSession savedSession = null;
 
-  // ------------------------ javax_servlet.RequestRequest
+  // ------------------------ jakarta_servlet.RequestRequest
   // -------------------------------
   public static void requestWrapperConstructorTest(PrintWriter pw,
       ServletRequest request, ServletResponse response)
@@ -1449,10 +1449,10 @@ public static void getLocalPortTest(PrintWriter pw, ServletRequest request,
 
     ServletTestUtil.printResult(pw, passed);
   }
-  // --------------- END javax_servlet.ServletRequest
+  // --------------- END jakarta_servlet.ServletRequest
   // ----------------------------
 
-  // --------------- javax_servlet_http.HttpServletRequest
+  // --------------- jakarta_servlet_http.HttpServletRequest
   // -----------------------
   public static void httpRequestWrapperConstructorIllegalArgumentExceptionTest(
       PrintWriter pw, HttpServletRequest request, HttpServletResponse response)
@@ -2664,6 +2664,6 @@ public static void changeSessionIDTest1(PrintWriter pw,
         + request.getSession(false).getAttribute(attrName_NEW));
     ServletTestUtil.printResult(pw, pass);
   }
-  // --------------- END javax_servlet_http.HttpServletRequest
+  // --------------- END jakarta_servlet_http.HttpServletRequest
   // -------------------
 }

src/com/sun/ts/tests/servlet/api/common/response/HttpResponseTestServlet.java

@@ -24,13 +24,13 @@
 
 package com.sun.ts.tests.servlet.api.common.response;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

src/com/sun/ts/tests/servlet/api/common/response/ResponseTestServlet.java

@@ -24,11 +24,11 @@
 
 package com.sun.ts.tests.servlet.api.common.response;
 
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

src/com/sun/ts/tests/servlet/api/common/response/ResponseTests.java

@@ -27,11 +27,11 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Locale;
-import javax.servlet.*;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.*;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 public class ResponseTests {
 

src/com/sun/ts/tests/servlet/api/common/sharedfiles/HSessionAttributeListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
 
 public final class HSessionAttributeListener
     implements HttpSessionAttributeListener {

src/com/sun/ts/tests/servlet/api/common/sharedfiles/HSessionListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 
 public final class HSessionListener implements HttpSessionListener {
 

src/com/sun/ts/tests/servlet/api/common/sharedfiles/SCAttributeListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
+import jakarta.servlet.ServletContextAttributeEvent;
+import jakarta.servlet.ServletContextAttributeListener;
 
 public final class SCAttributeListener
     implements ServletContextAttributeListener {

src/com/sun/ts/tests/servlet/api/common/sharedfiles/SCListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 public final class SCListener implements ServletContextListener {
 

src/com/sun/ts/tests/servlet/api/common/sharedfiles/SRAttributeListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.ServletRequestAttributeEvent;
-import javax.servlet.ServletRequestAttributeListener;
+import jakarta.servlet.ServletRequestAttributeEvent;
+import jakarta.servlet.ServletRequestAttributeListener;
 
 public final class SRAttributeListener
     implements ServletRequestAttributeListener {

src/com/sun/ts/tests/servlet/api/common/sharedfiles/SRListener.java

@@ -20,8 +20,8 @@
 package com.sun.ts.tests.servlet.api.common.sharedfiles;
 
 import com.sun.ts.tests.servlet.common.util.StaticLog;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
 
 public final class SRListener implements ServletRequestListener {
 

src/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/ACListener.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext;
+
+import java.io.IOException;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+
+public final class ACListener implements AsyncListener {
+
+  public ACListener() throws IOException {
+  }
+
+  public void onError(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onError method of ACListener");
+  }
+
+  public void onStartAsync(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onStartAsync method of ACListener");
+  }
+
+  public void onComplete(AsyncEvent event) throws IOException {
+    // bug 19258007: illegal to call getResponse() in here
+    // event.getAsyncContext().getResponse().getWriter().println("in onComplete
+    // method of ACListener");
+  }
+
+  public void onTimeout(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onTimeout method of ACListener");
+  }
+}

src/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/ACListener1.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext;
+
+import java.io.IOException;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+
+public final class ACListener1 implements AsyncListener {
+
+  public ACListener1() throws IOException {
+  }
+
+  public void onError(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onError method of ACListener1");
+  }
+
+  public void onStartAsync(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onStartAsync method of ACListener1");
+  }
+
+  public void onComplete(AsyncEvent event) throws IOException {
+    throw new IOException("in onComplete method of ACListener1");
+  }
+
+  public void onTimeout(AsyncEvent event) throws IOException {
+    event.getAsyncContext().getResponse().getWriter()
+        .println("in onTimeout method of ACListener1");
+  }
+}