Merge Upgrade To Tomcat 10 - Meeds-io/MIPs#76 (#497)

Meeds-io · Dec 20, 2023 · 728e82a · 728e82a
2 parents 69d7666 + b4091b5
commit 728e82a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 45 deletions.
diff --git a/commons-comet-service/pom.xml b/commons-comet-service/pom.xml
@@ -39,7 +39,7 @@
       <artifactId>commons-api</artifactId>
     </dependency>
 
-    <!-- New Cometd -->
+    <!-- Cometd -->
     <dependency>
       <groupId>org.cometd.java</groupId>
       <artifactId>cometd-java-api-common</artifactId>

diff --git a/...met-service/src/main/java/org/exoplatform/ws/frameworks/cometd/ServletContextWrapper.java b/...met-service/src/main/java/org/exoplatform/ws/frameworks/cometd/ServletContextWrapper.java
@@ -22,17 +22,17 @@
 
 package org.exoplatform.ws.frameworks.cometd;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.FilterRegistration.Dynamic;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.FilterRegistration.Dynamic;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -87,17 +87,17 @@ public void addListener(Class<? extends EventListener> arg0) {
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+  public jakarta.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
     return delegate.addServlet(arg0, arg1);
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
+  public jakarta.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
     return delegate.addServlet(arg0, arg1);
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+  public jakarta.servlet.ServletRegistration.Dynamic addServlet(String arg0,
                                                               Class<? extends Servlet> arg1) {
     return delegate.addServlet(arg0, arg1);
   }
@@ -250,21 +250,11 @@ public String getServerInfo() {
     return delegate.getServerInfo();
   }
 
-  @Override
-  public Servlet getServlet(String arg0) throws ServletException {
-    return delegate.getServlet(arg0);
-  }
-
   @Override
   public String getServletContextName() {
     return delegate.getServletContextName();
   }
 
-  @Override
-  public Enumeration<String> getServletNames() {
-    return delegate.getServletNames();
-  }
-
   @Override
   public ServletRegistration getServletRegistration(String arg0) {
     return delegate.getServletRegistration(arg0);
@@ -275,11 +265,6 @@ public ServletRegistration getServletRegistration(String arg0) {
     return delegate.getServletRegistrations();
   }
 
-  @Override
-  public Enumeration<Servlet> getServlets() {
-    return delegate.getServlets();
-  }
-
   @Override
   public SessionCookieConfig getSessionCookieConfig() {
     return delegate.getSessionCookieConfig();
@@ -290,11 +275,6 @@ public void log(String arg0) {
     delegate.log(arg0);
   }
 
-  @Override
-  public void log(Exception arg0, String arg1) {
-    delegate.log(arg0, arg1);
-  }
-
   @Override
   public void log(String arg0, Throwable arg1) {
     delegate.log(arg0, arg1);
@@ -334,7 +314,7 @@ public String getVirtualServerName() {
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
+  public jakarta.servlet.ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
     return delegate.addJspFile(servletName, jspFile);
   }
 

diff --git a/...ns-comet-service/src/main/java/org/mortbay/cometd/continuation/EXoContinuationBayeux.java b/...ns-comet-service/src/main/java/org/mortbay/cometd/continuation/EXoContinuationBayeux.java
@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see<http://www.gnu.org/licenses/>.
  */
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
 
 import org.cometd.bayeux.ChannelId;
 import org.cometd.bayeux.Promise;

diff --git a/...t-service/src/main/java/org/mortbay/cometd/continuation/EXoContinuationCometdServlet.java b/...t-service/src/main/java/org/mortbay/cometd/continuation/EXoContinuationCometdServlet.java
@@ -17,12 +17,12 @@
  * along with this program; if not, see<http://www.gnu.org/licenses/>.
  */
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...main/java/org/exoplatform/commons/notification/template/ResourceBundleConfigDeployer.java b/...main/java/org/exoplatform/commons/notification/template/ResourceBundleConfigDeployer.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.commons.utils.IOUtil;

diff --git a/...omponent-upgrade/src/main/java/org/exoplatform/commons/upgrade/UpgradeProductService.java b/...omponent-upgrade/src/main/java/org/exoplatform/commons/upgrade/UpgradeProductService.java
@@ -4,7 +4,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.commons.lang.StringUtils;