From: Mathieu Baudier Date: Mon, 16 Sep 2024 11:02:41 +0000 (+0200) Subject: Adapt to changes in Argeo Third Party X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=650b03854aa8ce7b1e8e04829c79844a54c427f4;p=gpl%2Fargeo-slc.git Adapt to changes in Argeo Third Party --- diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsExceptionsChain.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsExceptionsChain.java index 672722946..f7d17aa3c 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsExceptionsChain.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsExceptionsChain.java @@ -3,7 +3,7 @@ package org.argeo.cms.integration; import java.io.IOException; import java.io.Writer; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsLog; import org.argeo.cms.util.ExceptionsChain; diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLoginServlet.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLoginServlet.java index 29a3137bb..710fba836 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLoginServlet.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLoginServlet.java @@ -11,10 +11,10 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsSessionId; diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java index d18637d3f..1efd8a645 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsLogoutServlet.java @@ -8,10 +8,10 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsSessionId; diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java index 09f17ae02..c5e9d24fe 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsPrivateServletContext.java @@ -6,8 +6,8 @@ import java.util.Map; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsAuth; import org.argeo.cms.auth.RemoteAuthCallbackHandler; @@ -32,7 +32,8 @@ public class CmsPrivateServletContext extends ServletContextHelper { * Add the {@link AccessControlContext} as a request attribute, or redirect to * the login page. */ - @Override + // FIXME handle security + // @Override public boolean handleSecurity(final HttpServletRequest req, HttpServletResponse resp) throws IOException { LoginContext lc = null; ServletHttpRequest request = new ServletHttpRequest(req); diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsTokenServlet.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsTokenServlet.java index c355ecd8d..1a0242d34 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsTokenServlet.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/CmsTokenServlet.java @@ -10,10 +10,10 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.argeo.api.acr.ldap.NamingUtils; import org.argeo.api.cms.CmsAuth; diff --git a/org.argeo.slc.cms/src/org/argeo/cms/integration/TestEndpoint.java b/org.argeo.slc.cms/src/org/argeo/cms/integration/TestEndpoint.java index a09d83e13..0fe1f46cb 100644 --- a/org.argeo.slc.cms/src/org/argeo/cms/integration/TestEndpoint.java +++ b/org.argeo.slc.cms/src/org/argeo/cms/integration/TestEndpoint.java @@ -5,16 +5,16 @@ import java.util.List; import java.util.Map; import javax.security.auth.Subject; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.argeo.api.acr.ldap.NamingUtils; import org.argeo.api.cms.CmsLog; diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java index 889a5b3fa..95608196c 100644 --- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java +++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/AuthAddon.java @@ -5,7 +5,7 @@ import java.util.Iterator; import jakarta.annotation.PostConstruct; import javax.security.auth.Subject; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.argeo.api.cms.CmsLog; import org.argeo.cms.CurrentUser; diff --git a/swt/rap/org.argeo.tool.rap.cli/bnd.bnd b/swt/rap/org.argeo.tool.rap.cli/bnd.bnd index 246564bb1..c00fcd15e 100644 --- a/swt/rap/org.argeo.tool.rap.cli/bnd.bnd +++ b/swt/rap/org.argeo.tool.rap.cli/bnd.bnd @@ -1,7 +1,6 @@ Import-Package: \ javax.websocket.server,\ org.eclipse.jetty.util.component,\ -org.eclipse.jetty.ee8.nested,\ org.eclipse.jetty.session,\ -org.eclipse.jetty.ee8.security,\ +org.eclipse.jetty.server.handler,\ * \ No newline at end of file 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 6f559e2c4..f4560c57a 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,15 +4,15 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; import org.argeo.cms.jetty.CmsJettyServer; import org.argeo.cms.web.CmsWebApp; -import org.eclipse.jetty.ee8.servlet.DefaultServlet; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.rap.rwt.application.ApplicationRunner; import org.eclipse.rap.rwt.engine.RWTServlet; diff --git a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RwtRunner.java b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RwtRunner.java index 0e20b810a..ffd7a6a89 100644 --- a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RwtRunner.java +++ b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RwtRunner.java @@ -7,13 +7,13 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Objects; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.argeo.minidesktop.MiniDesktopManager; -import org.eclipse.jetty.ee8.servlet.DefaultServlet; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector;