From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 22 Sep 2024 06:05:23 +0000 (+0200)
Subject: Adapt to changes in Argeo Commons Jetty support.
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=97cf8ba63c7fbdeb80805a62c4414f9280232334;p=gpl%2Fargeo-slc.git

Adapt to changes in Argeo Commons Jetty support.
---

diff --git a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/CmsRapCli.java b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/CmsRapCli.java
index 1ffb02614..a1bcebea8 100644
--- a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/CmsRapCli.java
+++ b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/CmsRapCli.java
@@ -17,7 +17,7 @@ import org.argeo.api.cms.CmsContext;
 import org.argeo.api.cms.CmsState;
 import org.argeo.api.register.Component;
 import org.argeo.api.register.ComponentRegister;
-import org.argeo.cms.jetty.CmsJettyServer;
+import org.argeo.cms.jetty.ee10.CmsJettyServer;
 import org.argeo.cms.runtime.StaticCms;
 import org.argeo.cms.swt.app.CmsUserApp;
 import org.argeo.cms.web.CmsWebApp;
diff --git a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
index f4560c57a..d57524e93 100644
--- a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
+++ b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
@@ -4,11 +4,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletException;
-
-import org.argeo.cms.jetty.CmsJettyServer;
+import org.argeo.cms.jetty.ee10.CmsJettyServer;
 import org.argeo.cms.web.CmsWebApp;
 import org.eclipse.jetty.ee10.servlet.DefaultServlet;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
@@ -16,11 +12,14 @@ import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.rap.rwt.application.ApplicationRunner;
 import org.eclipse.rap.rwt.engine.RWTServlet;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+
 public class RapJettyServer extends CmsJettyServer {
 	private CmsWebApp cmsWebApp;
 
 	@Override
-	protected void addServlets(ServletContextHandler servletContextHandler) throws ServletException {
+	protected void addServlets(ServletContextHandler servletContextHandler) {
 		// rwt-resources requires a file system
 		try {
 			Path tempDir = Files.createTempDirectory("argeo-rwtRunner");