Adapt to changes in Argeo TP

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 66a5ec8c77089a38c1c92375668dd9bffa0d0cbd..889a5b3fa9327fa449d121a1b72c721cec9af8da 100644 (file)
--- 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
@@ -3,7 +3,7 @@ package org.argeo.cms.e4.addons;
 import java.security.AccessController;
 import java.util.Iterator;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java
index 5bc0d6936d7ba1e753b1e7fb61569dca2dd22b5c..d6224a0e984298baf720cdac0691a2d5b13139e9 100644 (file)
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/addons/LocaleAddon.java
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.security.auth.Subject;
 
 import org.argeo.eclipse.ui.specific.UiContext;

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
index 9624c2d7011b82a7df0ee9df95506f588a11d9ff..e7bcbd05eaddc9fc3b87615d0318fefbe960a37e 100644 (file)
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
@@ -8,7 +8,7 @@ import static org.argeo.cms.CmsMsg.repeatNewPassword;
 
 import java.util.Arrays;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java
index ac544b107d2c5ed876f64a1fbc860049805ea499..fa20f7f2bc99abd35f6b91301c5cd4deeb02a82a 100644 (file)
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/OpenPerspective.java
@@ -2,8 +2,8 @@ package org.argeo.cms.e4.handlers;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.MApplication;

diff --git a/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
index b8b2935f9609db896e879fb2819d5f7822b436ee..7e11722d908ff603e828d6252f83600ac0647547 100644 (file)
--- a/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
+++ b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
@@ -6,7 +6,7 @@ import java.security.AccessController;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;

diff --git a/swt/rap/org.argeo.tool.rap.cli/bnd.bnd b/swt/rap/org.argeo.tool.rap.cli/bnd.bnd
index 9d8b55f282f1d6c43060417402beabe2cbff3a55..bc893fe0bcd77bc06f463fd9abd6dc62f5780cc8 100644 (file)
--- a/swt/rap/org.argeo.tool.rap.cli/bnd.bnd
+++ b/swt/rap/org.argeo.tool.rap.cli/bnd.bnd
@@ -1,9 +1,5 @@
 Import-Package: \
 javax.websocket.server,\
-org.eclipse.jetty.util.component;version="[9.4,12)";resolution:=optional,\
-org.eclipse.jetty.http;version="[9.4,12)";resolution:=optional,\
-org.eclipse.jetty.io;version="[9.4,12)";resolution:=optional,\
-org.eclipse.jetty.security;version="[9.4,12)";resolution:=optional,\
-org.eclipse.jetty.server.handler;version="[9.4,12)";resolution:=optional,\
-org.eclipse.jetty.*;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.util.component,\
+org.eclipse.jetty.ee8.nested,\
 *
\ 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 6007feadfc1006b674b32996e080407f7de5e347..6f559e2c420c9b6b70468a81911fb58992f7bb82 100644 (file)
--- 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
@@ -10,10 +10,9 @@ import javax.servlet.ServletException;
 
 import org.argeo.cms.jetty.CmsJettyServer;
 import org.argeo.cms.web.CmsWebApp;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.ee8.servlet.DefaultServlet;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.eclipse.rap.rwt.application.ApplicationRunner;
 import org.eclipse.rap.rwt.engine.RWTServlet;
 
@@ -25,7 +24,8 @@ public class RapJettyServer extends CmsJettyServer {
                // rwt-resources requires a file system
                try {
                        Path tempDir = Files.createTempDirectory("argeo-rwtRunner");
-                       servletContextHandler.setBaseResource(Resource.newResource(tempDir.resolve("www").toString()));
+                       // FIXME we need a base directory
+                       //servletContextHandler.setBaseResource(Resource.newResource(tempDir.resolve("www").toString()));
                } catch (IOException e) {
                        throw new IllegalStateException("Cannot create temporary directory", e);
                }

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 0974a779ede2fe46ea96163e95eae9a690ca07e9..4cd6de13583513495b662897649ab275522384bc 100644 (file)
--- 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
@@ -10,18 +10,17 @@ import javax.servlet.ServletContextEvent;
 import javax.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.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.eclipse.rap.rwt.application.ApplicationRunner;
 import org.eclipse.rap.rwt.application.EntryPoint;
-import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.engine.RWTServlet;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -59,7 +58,8 @@ public class RwtRunner {
                // rwt-resources requires a file system
                try {
                        tempDir = Files.createTempDirectory("argeo-rwtRunner");
-                       context.setBaseResource(Resource.newResource(tempDir.resolve("www").toString()));
+                       // FIXME we need a base directory
+//                     context.setBaseResource(new PathResource(tempDir.resolve("www")));
                } catch (IOException e) {
                        throw new IllegalStateException("Cannot create temporary directory", e);
                }