From: Mathieu Baudier Date: Thu, 7 Dec 2023 11:22:17 +0000 (+0100) Subject: Adapt to changes in Argeo TP X-Git-Tag: v2.3.19~5 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2ac9f73d1aa2bf44683393fe34d2e248678c274b;p=gpl%2Fargeo-jcr.git 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 aabfbf5..1213298 100644 --- 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 dc0ba94..b6c7ee7 100644 --- 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 ae2b325..3bf642f 100644 --- 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 17d8d2a..3519391 100644 --- 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 09fa760..77195c5 100644 --- 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 8b8d8b7..e4b78e4 100644 --- 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 b8de06b..5df622c 100644 --- 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 036e70a..45565b2 100644 --- 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 97674ab..ac4c125 100644 --- 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 c639255..613134b 100644 --- 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 7200aa9..d1376ae 100644 --- 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 6317882..04fec78 100644 --- 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 53e8033..f78cdfa 100644 --- 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 79e2591..8864367 100644 --- 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 e3ec913..5d31913 100644 --- 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 8ec1621..f2faa7c 100644 --- 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 d941159..a9d0a4e 100644 --- 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 34892b5..bcc9766 100644 --- 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 238ae4d..e1c461e 100644 --- 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 742bc3f..b377d23 100644 --- 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 d1afd22..38da208 100644 --- 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 5b41eae..a353a92 100644 --- 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 d8fb0fe..9363a29 100644 --- 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;