Adapt to changes in Argeo TP

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
index aabfbf5dd8e863136dc74d46482976ec7ddacc8f..12132982f921def01c6563bab383ff87e1f6dc72 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/files/NodeFsBrowserView.java
@@ -6,8 +6,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.spi.FileSystemProvider;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 
 import org.argeo.eclipse.ui.fs.SimpleFsBrowser;
 import org.eclipse.swt.SWT;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
index dc0ba94a43d416f4296892f02397a0d0d3ca82a6..b6c7ee76841f291a4053fe2efd55f04106b5ef7d 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
@@ -2,9 +2,9 @@ package org.argeo.cms.e4.jcr;
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;
 import javax.jcr.Repository;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java
index ae2b325f500667394b48ce3bf9730a48ca97a6d5..3bf642f40979dcfd5dd91cac53c536dbc29bbcfd 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/JcrNodeEditor.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.jcr;
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.jcr.Node;
 
 import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/SimplePart.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/SimplePart.java
index 17d8d2a2360c25920a9fda6174a3541c5aef0cf5..351939161df3148a1def51db4311493be453bcdb 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/SimplePart.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/SimplePart.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.e4.jcr;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java
index 09fa760cd29a0aedf63af482d84acebe4550e49b..77195c534ca2517dbca5fdf6ffad3b27a8083ef5 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddFolderNode.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.jcr.handlers;
 
 import java.util.List;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
index 8b8d8b72cf5cde89e695cbcd80559d07bc6ac1a6..e4b78e4030f987afb98ad0539d58bb3cdad7e05e 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
@@ -3,8 +3,8 @@ package org.argeo.cms.e4.jcr.handlers;
 import java.net.URI;
 import java.util.Hashtable;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java
index b8de06b463dbf4b6b3229395ed76909efca6d9ff..5df622c66a745148f898920d447f5c58b177df19 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/DeleteNodes.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.jcr.handlers;
 
 import java.util.List;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java
index 036e70ac1df752b7a6691e1ec06abdc4f7df26f6..45565b2ada1ee722c4b55e23e16e3bab93f501c6 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/Refresh.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.jcr.handlers;
 
 import java.util.List;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.argeo.cms.e4.jcr.JcrBrowserView;
 import org.argeo.cms.ui.jcr.JcrBrowserUtils;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java
index 97674abc250573c89273b27fe561129b19ab84ec..ac4c1254b3977d542411606a11810b44e33e9476 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/jcr/handlers/RenameNode.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.jcr.handlers;
 
 import java.util.List;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java
index c639255b6afc11a21f0f26f8d8da91f810804eef..613134b65fbb32d5f5ba49ba122a1cbdc6624f4e 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/BundlesView.java
@@ -3,7 +3,7 @@
 
 package org.argeo.cms.e4.monitoring;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.argeo.eclipse.ui.ColumnViewerComparator;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
index 7200aa9bf71bb81bc54734146b2f8a57fc500764..d1376ae51722ac675ed3d707eabbb8465aa31e0a 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.argeo.api.cms.CmsSession;
 import org.argeo.cms.RoleNameUtils;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java
index 6317882c44fe5b09017aedbcf00ee6feeae842f9..04fec78c38f9cdc518acf553485cad2b869f41f9 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/ModulesView.java
@@ -3,7 +3,7 @@ package org.argeo.cms.e4.monitoring;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.argeo.cms.ux.widgets.TreeParent;
 import org.eclipse.e4.ui.di.Focus;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java
index 53e8033fec4b7827b1e98593cfe376fa1111b17c..f78cdfac3a57c8e5fe9d61faefb46a4c7f4d59a9 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/OsgiConfigurationsView.java
@@ -7,7 +7,7 @@ import java.util.Comparator;
 import java.util.Dictionary;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.argeo.cms.swt.CmsException;
 import org.argeo.cms.util.LangUtils;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
index 79e2591ac5570da159d3eceeae35c1a79e201230..886436779156dbc2db81531167132d0a612e1d27 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
@@ -2,7 +2,7 @@ package org.argeo.cms.e4.parts;
 
 import java.time.ZonedDateTime;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.argeo.api.cms.CmsSession;
 import org.argeo.cms.CurrentUser;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java
index e3ec91350f171c5448ac33bfce36258dee63c711..5d319138c765aa96da8faf197d973387ef1b4be0 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java
@@ -3,9 +3,9 @@ package org.argeo.cms.e4.users;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
 
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.cms.auth.UserAdminUtils;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
index 8ec16213125983f0d66da827ba296e58be0d91cb..f2faa7cc91775e9e0e8403d0fee795a7c7223898 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java
index d9411591f5f6af7f562ace073255b82c3b319c84..a9d0a4e3a427445dff4a84ddcdf9c582c29b95d5 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java
@@ -3,9 +3,9 @@ package org.argeo.cms.e4.users;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
 
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.ldap.LdapObj;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java
index 34892b5a2acdd8ba07bfe07e55cedc157ce71338..bcc976675cd30d14d090fca906afae6243b0d1dd 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.cms.CmsConstants;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java
index 238ae4d1e2c3705dc7cc4fafbe71c32de5a070b1..e1c461ec93098a187f6555beae95c85ec8a47126 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java
@@ -3,9 +3,9 @@ package org.argeo.cms.e4.users;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
 
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.acr.ldap.LdapObj;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java
index 742bc3f5feb63196713d6effea7fe00517e6c48e..b377d23c83fa03f781dc2c49a7975f41679fb405 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteGroups.java
@@ -2,8 +2,8 @@ package org.argeo.cms.e4.users.handlers;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.GroupsView;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java
index d1afd22102049ededf8f38b15355b718a6b7e3f1..38da208a71359f0a056e474865a770d21513078c 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/DeleteUsers.java
@@ -2,8 +2,8 @@ package org.argeo.cms.e4.users.handlers;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.UserAdminWrapper;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java
index 5b41eaeb30b02fc26b2371fe2a629b343f775dac..a353a9256d57fd54e19cd4371ec4e214f2432433 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java
@@ -3,7 +3,7 @@ package org.argeo.cms.e4.users.handlers;
 import java.util.Dictionary;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.cms.e4.users.UserAdminWrapper;

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java
index d8fb0fe8863ff7fd66606915ad1be2d7c9b3a87b..9363a29cd2517922845b4643136aab770855c7a2 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java
@@ -4,7 +4,7 @@ import java.util.Dictionary;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;