feat: Upgrade To Tomcat 10 - Meeds-io/MIPs#76

exo.jcr.component.core/pom.xml

@@ -274,6 +274,21 @@
          <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v8</artifactId>
       </dependency>
       <!-- TCK binaries and deps for repo stub, some eXo API test -->
+      <dependency>
+         <groupId>org.apache.jackrabbit</groupId>
+         <artifactId>jackrabbit-jcr-tests</artifactId>
+         <scope>test</scope>
+         <exclusions>
+            <exclusion>
+               <groupId>org.slf4j</groupId>
+               <artifactId>slf4j-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>junit</groupId>
+               <artifactId>junit</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
       <dependency>
          <groupId>org.apache.jackrabbit</groupId>
          <artifactId>jackrabbit-jcr-tests</artifactId>

exo.jcr.component.core/src/main/java/org/exoplatform/services/ext/action/InvocationContext.java

@@ -20,7 +20,6 @@
 
 import org.apache.commons.chain.Context;
 import org.exoplatform.container.ExoContainer;
-import org.exoplatform.services.jcr.impl.core.ItemImpl;
 
 import java.util.HashMap;
 
@@ -35,9 +34,11 @@
  * @version $Id: InvocationContext.java 11907 2008-03-13 15:36:21Z ksm $
  * @LevelAPI Provisional
  */
-public class InvocationContext extends HashMap implements Context
-{
-   /**
+public class InvocationContext extends HashMap<String, Object> implements Context {
+
+  private static final long serialVersionUID = 8562120359133701200L;
+
+  /**
     * Exo container.
     */
    public static final String EXO_CONTAINER = "exocontainer".intern();
@@ -57,21 +58,6 @@ public class InvocationContext extends HashMap implements Context
     */
    public static final String EVENT = "event".intern();
 
-   public Object put(String key, ItemImpl item)
-   {
-      return super.put(key, item);
-   }
-
-   public Object put(String key, ExoContainer container)
-   {
-      return super.put(key, container);
-   }
-
-   public Object put(String key, int eventType)
-   {
-      return super.put(key, eventType);
-   }
-
    public boolean getBoolean(final String name)
    {
       if (!containsKey(name))

exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java

@@ -18,7 +18,6 @@
  */
 package org.exoplatform.services.jcr.impl.core.query.ispn;
 
-import org.apache.regexp.RE;
 import org.exoplatform.container.configuration.ConfigurationManager;
 import org.exoplatform.services.jcr.config.QueryHandlerEntry;
 import org.exoplatform.services.jcr.config.RepositoryConfigurationException;

exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/GroovyScript2RestLoader.java

@@ -18,37 +18,6 @@
  */
 package org.exoplatform.services.jcr.ext.script.groovy;
 
-import org.apache.commons.fileupload.FileItem;
-import org.codehaus.groovy.control.CompilationFailedException;
-import org.exoplatform.commons.utils.SecurityHelper;
-import org.exoplatform.container.component.ComponentPlugin;
-import org.exoplatform.container.configuration.ConfigurationManager;
-import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.container.xml.ObjectParameter;
-import org.exoplatform.services.jcr.RepositoryService;
-import org.exoplatform.services.jcr.core.ManageableRepository;
-import org.exoplatform.services.jcr.ext.app.SessionProviderService;
-import org.exoplatform.services.jcr.ext.common.SessionProvider;
-import org.exoplatform.services.jcr.ext.registry.RegistryEntry;
-import org.exoplatform.services.jcr.ext.registry.RegistryService;
-import org.exoplatform.services.jcr.ext.resource.UnifiedNodeReference;
-import org.exoplatform.services.jcr.impl.core.query.lucene.IndexOfflineRepositoryException;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.rest.ext.groovy.GroovyClassLoaderProvider;
-import org.exoplatform.services.rest.ext.groovy.GroovyJaxrsPublisher;
-import org.exoplatform.services.rest.ext.groovy.MalformedScriptException;
-import org.exoplatform.services.rest.ext.groovy.ResourceId;
-import org.exoplatform.services.rest.ext.groovy.SourceFile;
-import org.exoplatform.services.rest.ext.groovy.SourceFolder;
-import org.exoplatform.services.rest.impl.ResourceBinder;
-import org.exoplatform.services.rest.impl.ResourcePublicationException;
-import org.exoplatform.services.script.groovy.GroovyScriptInstantiator;
-import org.picocontainer.Startable;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -90,6 +59,38 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.fileupload2.core.FileItem;
+import org.codehaus.groovy.control.CompilationFailedException;
+import org.picocontainer.Startable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+import org.exoplatform.commons.utils.SecurityHelper;
+import org.exoplatform.container.component.ComponentPlugin;
+import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ObjectParameter;
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.ext.app.SessionProviderService;
+import org.exoplatform.services.jcr.ext.common.SessionProvider;
+import org.exoplatform.services.jcr.ext.registry.RegistryEntry;
+import org.exoplatform.services.jcr.ext.registry.RegistryService;
+import org.exoplatform.services.jcr.ext.resource.UnifiedNodeReference;
+import org.exoplatform.services.jcr.impl.core.query.lucene.IndexOfflineRepositoryException;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.rest.ext.groovy.GroovyClassLoaderProvider;
+import org.exoplatform.services.rest.ext.groovy.GroovyJaxrsPublisher;
+import org.exoplatform.services.rest.ext.groovy.MalformedScriptException;
+import org.exoplatform.services.rest.ext.groovy.ResourceId;
+import org.exoplatform.services.rest.ext.groovy.SourceFile;
+import org.exoplatform.services.rest.ext.groovy.SourceFolder;
+import org.exoplatform.services.rest.impl.ResourceBinder;
+import org.exoplatform.services.rest.impl.ResourcePublicationException;
+import org.exoplatform.services.script.groovy.GroovyScriptInstantiator;
+
 /**
  * GroovyScript2RestLoader allows to save a Groovy script in JCR.
  *

exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/BaseStandaloneTest.java

@@ -18,7 +18,15 @@
  */
 package org.exoplatform.services.jcr.webdav;
 
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Workspace;
+import javax.ws.rs.core.MultivaluedMap;
+
 import org.exoplatform.container.StandaloneContainer;
 import org.exoplatform.services.jcr.RepositoryService;
 import org.exoplatform.services.jcr.core.CredentialsImpl;
@@ -30,19 +38,21 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.ContainerResponseWriter;
-import org.exoplatform.services.rest.impl.*;
+import org.exoplatform.services.rest.impl.ApplicationContextImpl;
+import org.exoplatform.services.rest.impl.ContainerRequest;
+import org.exoplatform.services.rest.impl.ContainerResponse;
+import org.exoplatform.services.rest.impl.EnvironmentContext;
+import org.exoplatform.services.rest.impl.InputHeadersMap;
+import org.exoplatform.services.rest.impl.MultivaluedMapImpl;
+import org.exoplatform.services.rest.impl.ProviderBinder;
+import org.exoplatform.services.rest.impl.RequestHandlerImpl;
+import org.exoplatform.services.rest.impl.ResourceBinder;
 import org.exoplatform.services.rest.tools.DummyContainerResponseWriter;
 import org.exoplatform.services.security.ConversationState;
 import org.exoplatform.services.security.Identity;
 
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.Workspace;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MultivaluedMap;
-import java.io.ByteArrayInputStream;
-import java.net.URI;
+import jakarta.servlet.http.HttpServletRequest;
+import junit.framework.TestCase;
 
 /**
  * Created by The eXo Platform SAS.

exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/MockHttpServletRequest.java

@@ -29,10 +29,25 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
 import javax.ws.rs.core.MultivaluedMap;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
+
 /**
  * Created by The eXo Platform SAS.
  * 
@@ -401,6 +416,24 @@ public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IO
     // Nothing to do
     return null;
   }
+
+  @Override
+  public String getRequestId() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public String getProtocolRequestId() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public ServletConnection getServletConnection() {
+    // TODO Auto-generated method stub
+    return null;
+  }
 }
 
 class EnumerationImpl<T> implements Enumeration<T>

exo.jcr.ext.services/src/main/java/org/exoplatform/services/jcr/ext/index/persistent/impl/JCRIndexingServiceImpl.java

@@ -16,15 +16,24 @@
  */
 package org.exoplatform.services.jcr.ext.index.persistent.impl;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 import javax.jcr.RepositoryException;
-import javax.servlet.ServletContext;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -33,23 +42,35 @@
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.persistence.impl.EntityManagerService;
 import org.exoplatform.commons.utils.IOUtil;
-import org.exoplatform.container.*;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.RootContainer;
 import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
 import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.jcr.RepositoryService;
-import org.exoplatform.services.jcr.config.*;
+import org.exoplatform.services.jcr.config.QueryHandlerEntry;
+import org.exoplatform.services.jcr.config.QueryHandlerParams;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
 import org.exoplatform.services.jcr.core.ManageableRepository;
 import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
 import org.exoplatform.services.jcr.ext.index.persistent.JCRIndexingOperationType;
-import org.exoplatform.services.jcr.ext.index.persistent.api.*;
+import org.exoplatform.services.jcr.ext.index.persistent.api.JCRIndexingQueueDAO;
+import org.exoplatform.services.jcr.ext.index.persistent.api.JCRIndexingService;
+import org.exoplatform.services.jcr.ext.index.persistent.api.TransientQueueEntrySet;
 import org.exoplatform.services.jcr.ext.index.persistent.entity.JCRIndexQueueEntity;
-import org.exoplatform.services.jcr.impl.core.query.*;
+import org.exoplatform.services.jcr.impl.core.query.ChangesFilterListsWrapper;
+import org.exoplatform.services.jcr.impl.core.query.IndexRecovery;
+import org.exoplatform.services.jcr.impl.core.query.QueryHandler;
+import org.exoplatform.services.jcr.impl.core.query.SearchManager;
 import org.exoplatform.services.jcr.impl.core.query.lucene.ChangesHolder;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rpc.RPCService;
 
+import jakarta.servlet.ServletContext;
+
 public class JCRIndexingServiceImpl implements JCRIndexingService, Startable {
 
   public static final String                                  LAST_OPERATION_FILE_NAME              = "lastOperationID";

exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/DisplayResourceCommand.java

@@ -18,22 +18,24 @@
  */
 package org.exoplatform.frameworks.jcr.command.web;
 
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.exoplatform.commons.utils.MimeTypeResolver;
-import org.exoplatform.frameworks.jcr.command.DefaultKeys;
-import org.exoplatform.frameworks.jcr.command.JCRCommandHelper;
-
 import java.io.InputStream;
 import java.io.PrintWriter;
 
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+
+import org.exoplatform.commons.utils.MimeTypeResolver;
+import org.exoplatform.frameworks.jcr.command.DefaultKeys;
+import org.exoplatform.frameworks.jcr.command.JCRCommandHelper;
+
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Created by The eXo Platform SAS .<br> the command to output nt:resource to Servlet Response gets
@@ -72,7 +74,7 @@ public boolean execute(Context context) throws Exception
       // or included?
       if (servletPath == null)
       {
-         servletPath = (String)request.getAttribute("javax.servlet.include.path_info");
+         servletPath = (String)request.getAttribute("jakarta.servlet.include.path_info");
          if (servletPath != null)
             doClose = false;
       }